Merge ~cjwatson/launchpad:zcml-namespaces-url into launchpad:master
- Git
- lp:~cjwatson/launchpad
- zcml-namespaces-url
- Merge into master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 9c5bbab44a977395cb2bd851cb53210157fa1c75 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:zcml-namespaces-url |
Merge into: | launchpad:master |
Diff against target: |
1942 lines (+233/-221) 28 files modified
doc/explanation/framework.rst (+4/-4) lib/lp/answers/browser/configure.zcml (+6/-5) lib/lp/blueprints/browser/configure.zcml (+9/-8) lib/lp/bugs/browser/configure.zcml (+23/-22) lib/lp/buildmaster/browser/configure.zcml (+5/-4) lib/lp/charms/browser/configure.zcml (+7/-6) lib/lp/code/browser/configure.zcml (+23/-22) lib/lp/oci/browser/configure.zcml (+6/-5) lib/lp/registry/browser/configure.zcml (+54/-53) lib/lp/services/auth/configure.zcml (+1/-1) lib/lp/services/features/browser/configure.zcml (+2/-1) lib/lp/services/identity/configure.zcml (+1/-1) lib/lp/services/messages/browser/configure.zcml (+2/-2) lib/lp/services/statistics/browser/configure.zcml (+3/-2) lib/lp/services/temporaryblobstorage/configure.zcml (+2/-2) lib/lp/services/verification/browser/configure.zcml (+3/-3) lib/lp/services/webapp/doc/canonical_url.rst (+16/-16) lib/lp/services/webapp/doc/zcmldirectives.rst (+1/-1) lib/lp/services/webapp/meta.zcml (+1/-1) lib/lp/services/webapp/metazcml.py (+1/-1) lib/lp/services/webhooks/configure.zcml (+2/-2) lib/lp/services/worlddata/browser/configure.zcml (+3/-2) lib/lp/snappy/browser/configure.zcml (+10/-10) lib/lp/soyuz/browser/configure.zcml (+27/-27) lib/lp/soyuz/model/archive.py (+1/-1) lib/lp/soyuz/model/archivepermission.py (+1/-1) lib/lp/testopenid/browser/configure.zcml (+2/-1) lib/lp/translations/browser/configure.zcml (+17/-17) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+436869@code.launchpad.net |
Commit message
Move ZCML url directive to lp namespace
Description of the change
As with commit 57196c1d6a220f0
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/doc/explanation/framework.rst b/doc/explanation/framework.rst |
2 | index ef3342a..78e3cdf 100644 |
3 | --- a/doc/explanation/framework.rst |
4 | +++ b/doc/explanation/framework.rst |
5 | @@ -51,10 +51,10 @@ Many of the details here are handled by custom code in |
6 | provides many application-specific hooks, and |
7 | ``lp.services.webapp.publishing`` which defines much of Launchpad's |
8 | traversal framework. The URL structure is defined in various |
9 | -``configure.zcml`` files: ``browser:url`` tags are used to build up the |
10 | -canonical URL for an object, and ``browser:navigation`` tags register |
11 | -classes called as part of traversal to resolve the next step from each |
12 | -intermediate object in the URL (starting at |
13 | +``configure.zcml`` files: ``lp:url`` tags are used to build up the canonical |
14 | +URL for an object, and ``browser:navigation`` tags register classes called |
15 | +as part of traversal to resolve the next step from each intermediate object |
16 | +in the URL (starting at |
17 | ``lp.app.browser.launchpad.LaunchpadRootNavigation``). |
18 | |
19 | Page templating |
20 | diff --git a/lib/lp/answers/browser/configure.zcml b/lib/lp/answers/browser/configure.zcml |
21 | index 87a6b76..abd9c42 100644 |
22 | --- a/lib/lp/answers/browser/configure.zcml |
23 | +++ b/lib/lp/answers/browser/configure.zcml |
24 | @@ -6,6 +6,7 @@ |
25 | xmlns="http://namespaces.zope.org/zope" |
26 | xmlns:browser="http://namespaces.zope.org/browser" |
27 | xmlns:i18n="http://namespaces.zope.org/i18n" |
28 | + xmlns:lp="http://namespaces.canonical.com/lp" |
29 | i18n_domain="launchpad"> |
30 | <facet facet="answers"> |
31 | |
32 | @@ -130,14 +131,14 @@ |
33 | name="+index" |
34 | /> |
35 | |
36 | - <browser:url |
37 | + <lp:url |
38 | for="lp.answers.interfaces.question.IQuestion" |
39 | path_expression="string:+question/${id}" |
40 | attribute_to_parent="target" |
41 | rootsite="answers" |
42 | /> |
43 | |
44 | - <browser:url |
45 | + <lp:url |
46 | for="lp.answers.interfaces.questionsubscription.IQuestionSubscription" |
47 | path_expression="string:subscriptions/${person}" |
48 | attribute_to_parent="question" |
49 | @@ -258,7 +259,7 @@ |
50 | template="../../app/templates/generic-edit.pt" |
51 | /> |
52 | |
53 | - <browser:url |
54 | + <lp:url |
55 | for="lp.answers.interfaces.question.IQuestionMessage" |
56 | path_expression="string:messages/${display_index}" |
57 | attribute_to_parent="question" |
58 | @@ -287,7 +288,7 @@ |
59 | classes="QuestionMessageNavigation" |
60 | /> |
61 | |
62 | - <browser:url |
63 | + <lp:url |
64 | for="lp.answers.interfaces.questioncollection.IQuestionSet" |
65 | path_expression="string:questions" |
66 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
67 | @@ -342,7 +343,7 @@ |
68 | template="../../app/templates/generic-edit.pt" |
69 | /> |
70 | |
71 | - <browser:url |
72 | + <lp:url |
73 | for="lp.answers.interfaces.faq.IFAQ" |
74 | path_expression="string:+faq/${id}" |
75 | attribute_to_parent="target" |
76 | diff --git a/lib/lp/blueprints/browser/configure.zcml b/lib/lp/blueprints/browser/configure.zcml |
77 | index aa5533b..2393698 100644 |
78 | --- a/lib/lp/blueprints/browser/configure.zcml |
79 | +++ b/lib/lp/blueprints/browser/configure.zcml |
80 | @@ -6,6 +6,7 @@ |
81 | xmlns="http://namespaces.zope.org/zope" |
82 | xmlns:browser="http://namespaces.zope.org/browser" |
83 | xmlns:i18n="http://namespaces.zope.org/i18n" |
84 | + xmlns:lp="http://namespaces.canonical.com/lp" |
85 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
86 | i18n_domain="launchpad"> |
87 | |
88 | @@ -20,7 +21,7 @@ |
89 | for="lp.blueprints.interfaces.sprint.ISprint" |
90 | name="+specs" |
91 | layer="lp.blueprints.publisher.BlueprintsLayer"/> |
92 | - <browser:url |
93 | + <lp:url |
94 | for="lp.blueprints.interfaces.sprint.ISprint" |
95 | path_expression="name" |
96 | parent_utility="lp.blueprints.interfaces.sprint.ISprintSet"/> |
97 | @@ -135,7 +136,7 @@ |
98 | name="+sprints" |
99 | template="../templates/hassprints-sprints.pt"/> |
100 | </browser:pages> |
101 | - <browser:url |
102 | + <lp:url |
103 | for="lp.blueprints.interfaces.sprint.ISprintSet" |
104 | path_expression="string:sprints" |
105 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
106 | @@ -182,7 +183,7 @@ |
107 | <browser:defaultView |
108 | for="lp.blueprints.interfaces.sprintspecification.ISprintSpecification" |
109 | name="+decide"/> |
110 | - <browser:url |
111 | + <lp:url |
112 | for="lp.blueprints.interfaces.sprintspecification.ISprintSpecification" |
113 | path_expression="string:${sprint/name}" |
114 | attribute_to_parent="specification"/> |
115 | @@ -199,7 +200,7 @@ |
116 | for="lp.blueprints.interfaces.sprintspecification.ISprintSpecification" |
117 | permission="zope.Public" |
118 | template="../templates/sprintspecification-icon-status.pt"/> |
119 | - <browser:url |
120 | + <lp:url |
121 | for="lp.blueprints.interfaces.specificationsubscription.ISpecificationSubscription" |
122 | path_expression="string:+subscription/${person/name}" |
123 | attribute_to_parent="specification"/> |
124 | @@ -216,13 +217,13 @@ |
125 | <browser:defaultView |
126 | for="lp.blueprints.interfaces.sprintattendance.ISprintAttendance" |
127 | name="+edit"/> |
128 | - <browser:url |
129 | + <lp:url |
130 | for="lp.blueprints.interfaces.sprintattendance.ISprintAttendance" |
131 | path_expression="string:${attendee/name}" |
132 | attribute_to_parent="sprint"/> |
133 | <facet |
134 | facet="specifications"> |
135 | - <browser:url |
136 | + <lp:url |
137 | for="lp.blueprints.interfaces.specificationbranch.ISpecificationBranch" |
138 | urldata="lp.blueprints.browser.specificationbranch.SpecificationBranchURL"/> |
139 | <browser:defaultView |
140 | @@ -246,7 +247,7 @@ |
141 | <browser:defaultView |
142 | for="lp.blueprints.interfaces.specification.ISpecification" |
143 | name="+index"/> |
144 | - <browser:url |
145 | + <lp:url |
146 | for="lp.blueprints.interfaces.specification.ISpecification" |
147 | path_expression="string:+spec/${name}" |
148 | attribute_to_parent="target" |
149 | @@ -471,7 +472,7 @@ |
150 | class="lp.blueprints.browser.specification.SpecificationLinkBranchView" |
151 | template="../../app/templates/generic-edit.pt" |
152 | permission="launchpad.AnyPerson"/> |
153 | - <browser:url |
154 | + <lp:url |
155 | for="lp.blueprints.interfaces.specification.ISpecificationSet" |
156 | path_expression="string:" |
157 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
158 | diff --git a/lib/lp/bugs/browser/configure.zcml b/lib/lp/bugs/browser/configure.zcml |
159 | index e5d11ae..c21599c 100644 |
160 | --- a/lib/lp/bugs/browser/configure.zcml |
161 | +++ b/lib/lp/bugs/browser/configure.zcml |
162 | @@ -6,6 +6,7 @@ |
163 | xmlns="http://namespaces.zope.org/zope" |
164 | xmlns:browser="http://namespaces.zope.org/browser" |
165 | xmlns:i18n="http://namespaces.zope.org/i18n" |
166 | + xmlns:lp="http://namespaces.canonical.com/lp" |
167 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
168 | i18n_domain="launchpad"> |
169 | <browser:feeds |
170 | @@ -158,7 +159,7 @@ |
171 | <browser:defaultView |
172 | for="lp.bugs.interfaces.bugmessage.IBugComment" |
173 | name="+index"/> |
174 | - <browser:url |
175 | + <lp:url |
176 | for="lp.bugs.interfaces.bugmessage.IBugComment" |
177 | path_expression="string:comments/${index}" |
178 | attribute_to_parent="bugtask" |
179 | @@ -203,7 +204,7 @@ |
180 | provides="lazr.restful.interfaces.IEntry" |
181 | factory="lp.bugs.adapters.bug.bugcomment_to_entry" |
182 | /> |
183 | - <browser:url |
184 | + <lp:url |
185 | for="lp.bugs.interfaces.malone.IMaloneApplication" |
186 | path_expression="string:bugs" |
187 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
188 | @@ -455,7 +456,7 @@ |
189 | <browser:defaultView |
190 | for="lp.bugs.interfaces.bugtask.IBugTask" |
191 | name="+index"/> |
192 | - <browser:url |
193 | + <lp:url |
194 | for="lp.bugs.interfaces.bugtask.IBugTask" |
195 | path_expression="string:+bug/${bug/id}" |
196 | attribute_to_parent="target" |
197 | @@ -481,7 +482,7 @@ |
198 | permission="launchpad.View" |
199 | name="+activity" |
200 | template="../templates/bug-activity.pt"/> |
201 | - <browser:url |
202 | + <lp:url |
203 | for="lp.bugs.interfaces.bugactivity.IBugActivity" |
204 | path_expression="string:activity" |
205 | attribute_to_parent="bug" |
206 | @@ -663,7 +664,7 @@ |
207 | class="lp.bugs.browser.bugsubscription.BugSubscriptionAddView" |
208 | permission="launchpad.AnyPerson" |
209 | template="../templates/bug-addsubscriber.pt"/> |
210 | - <browser:url |
211 | + <lp:url |
212 | for="lp.bugs.interfaces.bugattachment.IBugAttachment" |
213 | urldata="lp.bugs.browser.bugattachment.BugAttachmentURL"/> |
214 | <browser:defaultView |
215 | @@ -705,17 +706,17 @@ |
216 | <browser:defaultView |
217 | for="lp.bugs.interfaces.bugtracker.IBugTracker" |
218 | name="+index"/> |
219 | - <browser:url |
220 | + <lp:url |
221 | for="lp.bugs.interfaces.bugtracker.IBugTracker" |
222 | path_expression="string:${name}" |
223 | parent_utility="lp.bugs.interfaces.bugtracker.IBugTrackerSet" |
224 | rootsite="bugs"/> |
225 | - <browser:url |
226 | + <lp:url |
227 | for="lp.bugs.interfaces.bugtracker.IBugTrackerComponentGroup" |
228 | path_expression="string:+components/${name}" |
229 | attribute_to_parent="bug_tracker" |
230 | rootsite="bugs"/> |
231 | - <browser:url |
232 | + <lp:url |
233 | for="lp.bugs.interfaces.bugtracker.IBugTrackerComponent" |
234 | path_expression="name" |
235 | attribute_to_parent="component_group" |
236 | @@ -755,7 +756,7 @@ |
237 | <browser:defaultView |
238 | for="lp.bugs.interfaces.bugtracker.IBugTrackerSet" |
239 | name="+index"/> |
240 | - <browser:url |
241 | + <lp:url |
242 | for="lp.bugs.interfaces.bugtracker.IBugTrackerSet" |
243 | path_expression="string:bugtrackers" |
244 | parent_utility="lp.bugs.interfaces.malone.IMaloneApplication" |
245 | @@ -774,7 +775,7 @@ |
246 | class="lp.bugs.browser.bugtracker.BugTrackerAddView" |
247 | permission="launchpad.AnyPerson" |
248 | template="../../app/templates/generic-edit.pt"/> |
249 | - <browser:url |
250 | + <lp:url |
251 | for="lp.bugs.interfaces.bugtracker.IRemoteBug" |
252 | path_expression="string:${remotebug}" |
253 | attribute_to_parent="bugtracker" |
254 | @@ -790,7 +791,7 @@ |
255 | name="+index" |
256 | template="../templates/remotebug-index.pt"/> |
257 | </browser:pages> |
258 | - <browser:url |
259 | + <lp:url |
260 | for="lp.bugs.interfaces.bugbranch.IBugBranch" |
261 | path_expression="string:+bug/${bug/id}" |
262 | attribute_to_parent="branch"/> |
263 | @@ -819,7 +820,7 @@ |
264 | classes=" |
265 | CveContextMenu |
266 | CveSetContextMenu"/> |
267 | - <browser:url |
268 | + <lp:url |
269 | for="lp.bugs.interfaces.cve.ICve" |
270 | path_expression="sequence" |
271 | parent_utility="lp.bugs.interfaces.cve.ICveSet" |
272 | @@ -861,7 +862,7 @@ |
273 | <browser:defaultView |
274 | for="lp.bugs.interfaces.cve.ICveSet" |
275 | name="+index"/> |
276 | - <browser:url |
277 | + <lp:url |
278 | for="lp.bugs.interfaces.cve.ICveSet" |
279 | path_expression="string:cve" |
280 | parent_utility="lp.bugs.interfaces.malone.IMaloneApplication"/> |
281 | @@ -893,7 +894,7 @@ |
282 | class="lp.bugs.browser.buglinktarget.BugLinksListingView" |
283 | permission="zope.Public" |
284 | template="../templates/cve-portlet-bugs2.pt"/> |
285 | - <browser:url |
286 | + <lp:url |
287 | for="lp.bugs.interfaces.vulnerability.IVulnerability" |
288 | path_expression="string:+vulnerability/${id}" |
289 | attribute_to_parent="distribution" |
290 | @@ -918,7 +919,7 @@ |
291 | class="lp.bugs.browser.vulnerability.VulnerabilitySetIndexView" |
292 | permission="zope.Public" |
293 | template="../templates/vulnerabilityset-index.pt" /> |
294 | - <browser:url |
295 | + <lp:url |
296 | for="lp.bugs.interfaces.bugsubscription.IBugSubscription" |
297 | path_expression="string:+subscription/${person/name}" |
298 | attribute_to_parent="bug" |
299 | @@ -930,7 +931,7 @@ |
300 | <browser:defaultView |
301 | for="lp.bugs.interfaces.bug.IBug" |
302 | name="+index"/> |
303 | - <browser:url |
304 | + <lp:url |
305 | for="lp.bugs.interfaces.bug.IBug" |
306 | urldata="lp.bugs.browser.bug.BugURL"/> |
307 | <browser:navigation |
308 | @@ -1014,7 +1015,7 @@ |
309 | module="lp.bugs.browser.bug" |
310 | classes=" |
311 | BugSetNavigation"/> |
312 | - <browser:url |
313 | + <lp:url |
314 | for="lp.bugs.interfaces.bug.IBugSet" |
315 | path_expression="string:bugs" |
316 | parent_utility="lp.bugs.interfaces.malone.IMaloneApplication"/> |
317 | @@ -1040,12 +1041,12 @@ |
318 | class="lp.bugs.browser.bugnomination.BugNominationEditView" |
319 | permission="launchpad.Driver" |
320 | template="../templates/bugnomination-edit-form.pt"/> |
321 | - <browser:url |
322 | + <lp:url |
323 | for="lp.bugs.interfaces.bugnomination.IBugNomination" |
324 | path_expression="string:nominations/${id}" |
325 | attribute_to_parent="bug" |
326 | rootsite="bugs" /> |
327 | - <browser:url |
328 | + <lp:url |
329 | for="lp.bugs.interfaces.bugwatch.IBugWatch" |
330 | path_expression="string:+watch/${id}" |
331 | attribute_to_parent="bug" |
332 | @@ -1084,7 +1085,7 @@ |
333 | name="+error-help" |
334 | template="../templates/bugwatch-error-help.pt"/> |
335 | </browser:pages> |
336 | - <browser:url |
337 | + <lp:url |
338 | for="lp.bugs.interfaces.bugwatch.IBugWatchSet" |
339 | path_expression="string:watches" |
340 | attribute_to_parent="bug"/> |
341 | @@ -1116,7 +1117,7 @@ |
342 | permission="launchpad.AnyPerson" |
343 | template="../templates/bugtarget-subscription-list.pt"/> |
344 | |
345 | - <browser:url |
346 | + <lp:url |
347 | for="lp.bugs.interfaces.structuralsubscription.IStructuralSubscription" |
348 | path_expression="string:+subscription/${subscriber/name}" |
349 | attribute_to_parent="target"/> |
350 | @@ -1125,7 +1126,7 @@ |
351 | classes="StructuralSubscriptionNavigation"/> |
352 | |
353 | <!-- Bug Subscription Filters --> |
354 | - <browser:url |
355 | + <lp:url |
356 | for="lp.bugs.interfaces.bugsubscriptionfilter.IBugSubscriptionFilter" |
357 | path_expression="string:+filter/${id}" |
358 | attribute_to_parent="structural_subscription" |
359 | diff --git a/lib/lp/buildmaster/browser/configure.zcml b/lib/lp/buildmaster/browser/configure.zcml |
360 | index c1a40b4..83626e1 100644 |
361 | --- a/lib/lp/buildmaster/browser/configure.zcml |
362 | +++ b/lib/lp/buildmaster/browser/configure.zcml |
363 | @@ -6,9 +6,10 @@ |
364 | xmlns="http://namespaces.zope.org/zope" |
365 | xmlns:browser="http://namespaces.zope.org/browser" |
366 | xmlns:i18n="http://namespaces.zope.org/i18n" |
367 | + xmlns:lp="http://namespaces.canonical.com/lp" |
368 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
369 | i18n_domain="launchpad"> |
370 | - <browser:url |
371 | + <lp:url |
372 | for="lp.buildmaster.interfaces.processor.IProcessor" |
373 | path_expression="string:${name}" |
374 | parent_utility="lp.buildmaster.interfaces.processor.IProcessorSet" /> |
375 | @@ -16,7 +17,7 @@ |
376 | <browser:navigation |
377 | module="lp.buildmaster.browser.processor" |
378 | classes="ProcessorSetNavigation" /> |
379 | - <browser:url for="lp.buildmaster.interfaces.processor.IProcessorSet" |
380 | + <lp:url for="lp.buildmaster.interfaces.processor.IProcessorSet" |
381 | path_expression="string:+processors" |
382 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
383 | |
384 | @@ -33,7 +34,7 @@ |
385 | permission="launchpad.View" |
386 | template="../templates/buildfarmjob-current.pt"/> |
387 | |
388 | - <browser:url |
389 | + <lp:url |
390 | for="lp.buildmaster.interfaces.builder.IBuilderSet" |
391 | path_expression="string:builders" |
392 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
393 | @@ -65,7 +66,7 @@ |
394 | module="lp.buildmaster.browser.builder" |
395 | classes=" |
396 | BuilderNavigation"/> |
397 | - <browser:url |
398 | + <lp:url |
399 | for="lp.buildmaster.interfaces.builder.IBuilder" |
400 | path_expression="name" |
401 | parent_utility="lp.buildmaster.interfaces.builder.IBuilderSet"/> |
402 | diff --git a/lib/lp/charms/browser/configure.zcml b/lib/lp/charms/browser/configure.zcml |
403 | index 3741679..db532de 100644 |
404 | --- a/lib/lp/charms/browser/configure.zcml |
405 | +++ b/lib/lp/charms/browser/configure.zcml |
406 | @@ -6,9 +6,10 @@ |
407 | xmlns="http://namespaces.zope.org/zope" |
408 | xmlns:browser="http://namespaces.zope.org/browser" |
409 | xmlns:i18n="http://namespaces.zope.org/i18n" |
410 | + xmlns:lp="http://namespaces.canonical.com/lp" |
411 | i18n_domain="launchpad"> |
412 | <facet facet="overview"> |
413 | - <browser:url |
414 | + <lp:url |
415 | for="lp.charms.interfaces.charmrecipe.ICharmRecipe" |
416 | urldata="lp.charms.browser.charmrecipe.CharmRecipeURL" /> |
417 | <browser:menus |
418 | @@ -77,17 +78,17 @@ |
419 | name="+new-charm-recipe" |
420 | template="../templates/charmrecipe-new.pt" /> |
421 | |
422 | - <browser:url |
423 | + <lp:url |
424 | for="lp.charms.interfaces.charmrecipe.ICharmRecipeSet" |
425 | path_expression="string:+charm-recipes" |
426 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> |
427 | |
428 | - <browser:url |
429 | + <lp:url |
430 | for="lp.charms.interfaces.charmrecipe.ICharmRecipeBuildRequest" |
431 | path_expression="string:+build-request/${id}" |
432 | attribute_to_parent="recipe" /> |
433 | |
434 | - <browser:url |
435 | + <lp:url |
436 | for="lp.charms.interfaces.charmrecipebuild.ICharmRecipeBuild" |
437 | path_expression="string:+build/${id}" |
438 | attribute_to_parent="recipe" /> |
439 | @@ -130,11 +131,11 @@ |
440 | factory="lp.services.webapp.breadcrumb.TitleBreadcrumb" |
441 | permission="zope.Public" /> |
442 | |
443 | - <browser:url |
444 | + <lp:url |
445 | for="lp.charms.interfaces.charmbase.ICharmBase" |
446 | path_expression="string:${id}" |
447 | parent_utility="lp.charms.interfaces.charmbase.ICharmBaseSet" /> |
448 | - <browser:url |
449 | + <lp:url |
450 | for="lp.charms.interfaces.charmbase.ICharmBaseSet" |
451 | path_expression="string:+charm-bases" |
452 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> |
453 | diff --git a/lib/lp/code/browser/configure.zcml b/lib/lp/code/browser/configure.zcml |
454 | index ea9052d..788c7f2 100644 |
455 | --- a/lib/lp/code/browser/configure.zcml |
456 | +++ b/lib/lp/code/browser/configure.zcml |
457 | @@ -6,14 +6,15 @@ |
458 | xmlns="http://namespaces.zope.org/zope" |
459 | xmlns:browser="http://namespaces.zope.org/browser" |
460 | xmlns:i18n="http://namespaces.zope.org/i18n" |
461 | + xmlns:lp="http://namespaces.canonical.com/lp" |
462 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
463 | i18n_domain="launchpad"> |
464 | - <browser:url |
465 | + <lp:url |
466 | for="lp.code.interfaces.branch.IBranchSet" |
467 | path_expression="string:branches" |
468 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
469 | /> |
470 | - <browser:url |
471 | + <lp:url |
472 | for="lp.code.interfaces.gitrepository.IGitRepositorySet" |
473 | path_expression="string:+git" |
474 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
475 | @@ -95,7 +96,7 @@ |
476 | permission="zope.Public" |
477 | /> |
478 | |
479 | - <browser:url |
480 | + <lp:url |
481 | for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference" |
482 | path_expression="string:+review/${id}" |
483 | attribute_to_parent="branch_merge_proposal" |
484 | @@ -106,7 +107,7 @@ |
485 | class="lp.code.browser.codereviewvote.CodeReviewVoteReassign" |
486 | permission="launchpad.AnyPerson" |
487 | template="../../app/templates/generic-edit.pt"/> |
488 | - <browser:url |
489 | + <lp:url |
490 | for="lp.code.interfaces.codeimportmachine.ICodeImportMachine" |
491 | path_expression="string:${hostname}" |
492 | parent_utility="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet" |
493 | @@ -123,7 +124,7 @@ |
494 | <browser:navigation |
495 | module="lp.code.browser.codeimportmachine" |
496 | classes="CodeImportMachineSetNavigation"/> |
497 | - <browser:url |
498 | + <lp:url |
499 | for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet" |
500 | path_expression="string:+machines" |
501 | parent_utility="lp.code.interfaces.codeimport.ICodeImportSet" |
502 | @@ -137,14 +138,14 @@ |
503 | name="+index" |
504 | template="../templates/codeimport-machines.pt" |
505 | permission="zope.Public"/> |
506 | - <browser:url |
507 | + <lp:url |
508 | for="lp.code.interfaces.branchref.IBranchRef" |
509 | path_expression="string:.bzr" |
510 | attribute_to_parent="branch"/> |
511 | <browser:navigation |
512 | module="lp.code.browser.branchref" |
513 | classes="BranchRefNavigation"/> |
514 | - <browser:url |
515 | + <lp:url |
516 | for="lp.code.interfaces.codehosting.IBazaarApplication" |
517 | path_expression="string:+code" |
518 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
519 | @@ -306,7 +307,7 @@ |
520 | class="lp.code.browser.branchmergeproposal.BranchMergeProposalAddVoteView" |
521 | permission="launchpad.AnyPerson" |
522 | template="../templates/branchmergeproposal-vote.pt"/> |
523 | - <browser:url |
524 | + <lp:url |
525 | for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal" |
526 | path_expression="string:+merge/${id}" |
527 | attribute_to_parent="parent" |
528 | @@ -337,7 +338,7 @@ |
529 | class="lp.code.browser.branchsubscription.BranchSubscriptionEditView" |
530 | permission="launchpad.Edit" |
531 | template="../templates/branchsubscription-edit.pt"/> |
532 | - <browser:url |
533 | + <lp:url |
534 | for="lp.code.interfaces.branchsubscription.IBranchSubscription" |
535 | path_expression="string:+subscription/${person/name}" |
536 | attribute_to_parent="branch" |
537 | @@ -345,7 +346,7 @@ |
538 | <browser:defaultView |
539 | for="lp.code.interfaces.branch.IBranch" |
540 | name="+index"/> |
541 | - <browser:url |
542 | + <lp:url |
543 | for="lp.code.interfaces.branch.IBranch" |
544 | urldata="lp.code.browser.branch.BranchURL"/> |
545 | <browser:navigation |
546 | @@ -551,7 +552,7 @@ |
547 | BranchContextMenu |
548 | BranchEditMenu" |
549 | module="lp.code.browser.branch"/> |
550 | - <browser:url |
551 | + <lp:url |
552 | for="lp.code.interfaces.codereviewcomment.ICodeReviewComment" |
553 | path_expression="string:comments/${id}" |
554 | attribute_to_parent="branch_merge_proposal" |
555 | @@ -625,7 +626,7 @@ |
556 | name="+macros" |
557 | permission="zope.Public" |
558 | template="../templates/codeimport-macros.pt"/> |
559 | - <browser:url |
560 | + <lp:url |
561 | for="lp.code.interfaces.codeimport.ICodeImportSet" |
562 | path_expression="string:+code-imports" |
563 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
564 | @@ -651,7 +652,7 @@ |
565 | name="+new-import" |
566 | template="../templates/codeimport-new.pt" |
567 | permission="launchpad.AnyPerson"/> |
568 | - <browser:url |
569 | + <lp:url |
570 | for="lp.code.interfaces.codeimport.ICodeImport" |
571 | attribute_to_parent="target" |
572 | path_expression="string:+code-import" |
573 | @@ -812,7 +813,7 @@ |
574 | <browser:defaultView |
575 | for="lp.code.interfaces.gitrepository.IGitRepository" |
576 | name="+index"/> |
577 | - <browser:url |
578 | + <lp:url |
579 | for="lp.code.interfaces.gitrepository.IGitRepository" |
580 | urldata="lp.code.browser.gitrepository.GitRepositoryURL"/> |
581 | <browser:navigation |
582 | @@ -969,13 +970,13 @@ |
583 | factory="lp.code.browser.gitrepository.GitRepositoryBreadcrumb" |
584 | permission="zope.Public"/> |
585 | |
586 | - <browser:url |
587 | + <lp:url |
588 | for="lp.code.interfaces.revisionstatus.IRevisionStatusReport" |
589 | path_expression="string:+status/${id}" |
590 | attribute_to_parent="git_repository" |
591 | rootsite="code"/> |
592 | |
593 | - <browser:url |
594 | + <lp:url |
595 | for="lp.code.interfaces.revisionstatus.IRevisionStatusArtifact" |
596 | path_expression="string:+artifact/${id}" |
597 | attribute_to_parent="repository" |
598 | @@ -988,7 +989,7 @@ |
599 | <browser:defaultView |
600 | for="lp.code.interfaces.gitref.IGitRef" |
601 | name="+index"/> |
602 | - <browser:url |
603 | + <lp:url |
604 | for="lp.code.interfaces.gitref.IGitRef" |
605 | path_expression="string:+ref/${url_quoted_name}" |
606 | attribute_to_parent="repository" |
607 | @@ -1059,7 +1060,7 @@ |
608 | permission="launchpad.Edit" |
609 | name="+index" |
610 | template="../templates/gitsubscription-edit.pt"/> |
611 | - <browser:url |
612 | + <lp:url |
613 | for="lp.code.interfaces.gitsubscription.IGitSubscription" |
614 | path_expression="string:+subscription/${person/name}" |
615 | attribute_to_parent="repository" |
616 | @@ -1158,7 +1159,7 @@ |
617 | layer="lp.code.publisher.CodeLayer" |
618 | name="+branches"/> |
619 | |
620 | - <browser:url |
621 | + <lp:url |
622 | for="lp.code.interfaces.diff.IPreviewDiff" |
623 | path_expression="string:+preview-diff/${id}" |
624 | attribute_to_parent="branch_merge_proposal" |
625 | @@ -1285,12 +1286,12 @@ |
626 | name="fmt" |
627 | /> |
628 | |
629 | - <browser:url |
630 | + <lp:url |
631 | for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe" |
632 | attribute_to_parent="owner" |
633 | path_expression="string:+recipe/${name}" |
634 | rootsite="code" /> |
635 | - <browser:url |
636 | + <lp:url |
637 | for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild" |
638 | attribute_to_parent="archive" |
639 | path_expression="string:+recipebuild/${id}" |
640 | @@ -1425,7 +1426,7 @@ |
641 | factory="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBreadcrumb" |
642 | permission="zope.Public"/> |
643 | |
644 | - <browser:url |
645 | + <lp:url |
646 | for="lp.code.interfaces.cibuild.ICIBuild" |
647 | path_expression="string:+build/${id}" |
648 | attribute_to_parent="git_repository"/> |
649 | diff --git a/lib/lp/oci/browser/configure.zcml b/lib/lp/oci/browser/configure.zcml |
650 | index 2140829..ce3c49a 100644 |
651 | --- a/lib/lp/oci/browser/configure.zcml |
652 | +++ b/lib/lp/oci/browser/configure.zcml |
653 | @@ -6,9 +6,10 @@ |
654 | xmlns="http://namespaces.zope.org/zope" |
655 | xmlns:browser="http://namespaces.zope.org/browser" |
656 | xmlns:i18n="http://namespaces.zope.org/i18n" |
657 | + xmlns:lp="http://namespaces.canonical.com/lp" |
658 | i18n_domain="launchpad"> |
659 | <facet facet="overview"> |
660 | - <browser:url |
661 | + <lp:url |
662 | for="lp.oci.interfaces.ocirecipe.IOCIRecipe" |
663 | path_expression="string:${oci_project/pillar/name}/+oci/${oci_project/name}/+recipe/${name}" |
664 | attribute_to_parent="owner" /> |
665 | @@ -90,11 +91,11 @@ |
666 | factory="lp.oci.browser.ocirecipe.OCIRecipeBreadcrumb" |
667 | permission="zope.Public" /> |
668 | |
669 | - <browser:url |
670 | + <lp:url |
671 | for="lp.oci.interfaces.ocirecipe.IOCIRecipeBuildRequest" |
672 | path_expression="string:+build-request/${id}" |
673 | attribute_to_parent="recipe" /> |
674 | - <browser:url |
675 | + <lp:url |
676 | for="lp.oci.interfaces.ocirecipebuild.IOCIRecipeBuild" |
677 | path_expression="string:+build/${id}" |
678 | attribute_to_parent="recipe" /> |
679 | @@ -137,7 +138,7 @@ |
680 | factory="lp.services.webapp.breadcrumb.TitleBreadcrumb" |
681 | permission="zope.Public" /> |
682 | |
683 | - <browser:url |
684 | + <lp:url |
685 | for="lp.oci.interfaces.ocipushrule.IOCIPushRule" |
686 | path_expression="string:+push-rule/${id}" |
687 | attribute_to_parent="recipe" /> |
688 | @@ -175,7 +176,7 @@ |
689 | permission="launchpad.AnyPerson" |
690 | name="+addsubscriber" |
691 | template="../../app/templates/generic-edit.pt"/> |
692 | - <browser:url |
693 | + <lp:url |
694 | for="lp.oci.interfaces.ocirecipesubscription.IOCIRecipeSubscription" |
695 | path_expression="string:+subscription/${person/name}" |
696 | attribute_to_parent="recipe" |
697 | diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml |
698 | index 22096c8..2297a7f 100644 |
699 | --- a/lib/lp/registry/browser/configure.zcml |
700 | +++ b/lib/lp/registry/browser/configure.zcml |
701 | @@ -6,24 +6,25 @@ |
702 | xmlns="http://namespaces.zope.org/zope" |
703 | xmlns:browser="http://namespaces.zope.org/browser" |
704 | xmlns:i18n="http://namespaces.zope.org/i18n" |
705 | + xmlns:lp="http://namespaces.canonical.com/lp" |
706 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
707 | i18n_domain="launchpad"> |
708 | - <browser:url |
709 | + <lp:url |
710 | for="lp.registry.interfaces.person.IPersonSet" |
711 | path_expression="string:people" |
712 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
713 | /> |
714 | - <browser:url |
715 | + <lp:url |
716 | for="lp.registry.interfaces.distribution.IDistributionSet" |
717 | path_expression="string:distros" |
718 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
719 | /> |
720 | - <browser:url |
721 | + <lp:url |
722 | for="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet" |
723 | path_expression="string:sourcepackagenames" |
724 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
725 | /> |
726 | - <browser:url |
727 | + <lp:url |
728 | for="lp.registry.interfaces.projectgroup.IProjectGroupSet" |
729 | path_expression="string:projectgroups" |
730 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
731 | @@ -32,12 +33,12 @@ |
732 | module="lp.registry.feed.announcement" |
733 | classes="LaunchpadAnnouncementsFeed TargetAnnouncementsFeed" |
734 | /> |
735 | - <browser:url |
736 | + <lp:url |
737 | for="lp.app.interfaces.services.IServiceFactory" |
738 | path_expression="string:+services" |
739 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
740 | /> |
741 | - <browser:url |
742 | + <lp:url |
743 | for="lp.app.interfaces.services.IService" |
744 | path_expression="string:${name}" |
745 | parent_utility="lp.app.interfaces.services.IServiceFactory"/> |
746 | @@ -63,7 +64,7 @@ |
747 | permission="zope.Public" |
748 | attribute="__call__" |
749 | /> |
750 | - <browser:url |
751 | + <lp:url |
752 | for="lp.registry.interfaces.teammembership.ITeamMembership" |
753 | path_expression="string:+member/${person/name}" |
754 | rootsite="mainsite" |
755 | @@ -97,7 +98,7 @@ |
756 | classes=" |
757 | DistroSeriesNavigation" |
758 | /> |
759 | - <browser:url |
760 | + <lp:url |
761 | for="lp.registry.interfaces.distroseries.IDistroSeries" |
762 | urldata="lp.registry.browser.distroseries.DistroSeriesURL" |
763 | /> |
764 | @@ -210,7 +211,7 @@ |
765 | permission="zope.Public" |
766 | template="../templates/distroseries-localdifferences.pt" |
767 | /> |
768 | - <browser:url |
769 | + <lp:url |
770 | for="lp.registry.interfaces.distroseriesdifference.IDistroSeriesDifference" |
771 | path_expression="string:+source/${source_package_name/name}/+difference/${parent_series/parent/name}/${parent_series/name}" |
772 | rootsite="mainsite" |
773 | @@ -231,7 +232,7 @@ |
774 | module="lp.registry.browser.distroseriesdifference" |
775 | classes="DistroSeriesDifferenceNavigation" |
776 | /> |
777 | - <browser:url |
778 | + <lp:url |
779 | for="..interfaces.distroseriesdifferencecomment.IDistroSeriesDifferenceComment" |
780 | path_expression="string:comments/${id}" |
781 | attribute_to_parent="distro_series_difference" |
782 | @@ -296,12 +297,12 @@ |
783 | permission="launchpad.AnyPerson" |
784 | template="../templates/signedcodeofconduct-add.pt" |
785 | /> |
786 | - <browser:url |
787 | + <lp:url |
788 | for="lp.registry.interfaces.codeofconduct.ICodeOfConductSet" |
789 | path_expression="string:codeofconduct" |
790 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
791 | /> |
792 | - <browser:url |
793 | + <lp:url |
794 | for="lp.registry.interfaces.codeofconduct.ICodeOfConduct" |
795 | parent_utility="lp.registry.interfaces.codeofconduct.ICodeOfConductSet" |
796 | path_expression="version" |
797 | @@ -344,12 +345,12 @@ |
798 | permission="launchpad.Admin" |
799 | template="../../app/templates/generic-edit.pt" |
800 | /> |
801 | - <browser:url |
802 | + <lp:url |
803 | for="lp.registry.interfaces.codeofconduct.ISignedCodeOfConductSet" |
804 | path_expression="string:console" |
805 | parent_utility="lp.registry.interfaces.codeofconduct.ICodeOfConductSet" |
806 | /> |
807 | - <browser:url |
808 | + <lp:url |
809 | for="lp.registry.interfaces.codeofconduct.ISignedCodeOfConduct" |
810 | path_expression="string:${id}" |
811 | parent_utility="lp.registry.interfaces.codeofconduct.ISignedCodeOfConductSet" |
812 | @@ -378,7 +379,7 @@ |
813 | permission="launchpad.Admin" |
814 | template="../../app/templates/generic-edit.pt" |
815 | /> |
816 | - <browser:url |
817 | + <lp:url |
818 | for="lp.registry.interfaces.irc.IIrcID" |
819 | path_expression="string:+ircnick/${id}" |
820 | attribute_to_parent="person" |
821 | @@ -495,7 +496,7 @@ |
822 | classes=" |
823 | ProjectSetNavigation" |
824 | /> |
825 | - <browser:url |
826 | + <lp:url |
827 | for="lp.registry.interfaces.projectgroup.IProjectGroup" |
828 | path_expression="name" |
829 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
830 | @@ -520,7 +521,7 @@ |
831 | permission="launchpad.Moderate" |
832 | template="../../app/templates/generic-edit.pt" |
833 | /> |
834 | - <browser:url |
835 | + <lp:url |
836 | for="lp.registry.interfaces.projectgroup.IProjectGroupSeries" |
837 | path_expression="string:+series/${name}" |
838 | attribute_to_parent="projectgroup" |
839 | @@ -549,7 +550,7 @@ |
840 | for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage" |
841 | layer="lp.answers.publisher.AnswersLayer" |
842 | /> |
843 | - <browser:url |
844 | + <lp:url |
845 | for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage" |
846 | urldata="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageURL" |
847 | /> |
848 | @@ -612,11 +613,11 @@ |
849 | name="+index" |
850 | for="lp.registry.interfaces.ociproject.IOCIProject" |
851 | /> |
852 | - <browser:url |
853 | + <lp:url |
854 | for="lp.registry.interfaces.ociproject.IOCIProject" |
855 | urldata="lp.registry.browser.ociproject.OCIProjectURL" |
856 | /> |
857 | - <browser:url |
858 | + <lp:url |
859 | for="lp.registry.interfaces.ociprojectseries.IOCIProjectSeries" |
860 | path_expression="string:+series/${name}" |
861 | attribute_to_parent="oci_project" |
862 | @@ -652,18 +653,18 @@ |
863 | provides="zope.traversing.interfaces.IPathAdapter" |
864 | for="lp.registry.interfaces.ociproject.IOCIProject" |
865 | /> |
866 | - <browser:url |
867 | + <lp:url |
868 | for="lp.registry.interfaces.commercialsubscription.ICommercialSubscription" |
869 | path_expression="string:+commercialsubscription/${id}" |
870 | attribute_to_parent="pillar" |
871 | /> |
872 | - <browser:url |
873 | + <lp:url |
874 | for="lp.registry.interfaces.jabber.IJabberID" |
875 | path_expression="string:+jabberid/${jabberid}" |
876 | attribute_to_parent="person" |
877 | rootsite="api" |
878 | /> |
879 | - <browser:url |
880 | + <lp:url |
881 | for="lp.registry.interfaces.pillar.IPillarNameSet" |
882 | path_expression="string:pillars" |
883 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
884 | @@ -688,7 +689,7 @@ |
885 | permission="zope.Public" |
886 | template="../templates/pillar-involvement-portlet.pt" |
887 | /> |
888 | - <browser:url |
889 | + <lp:url |
890 | for="lp.registry.interfaces.karma.IKarmaAction" |
891 | path_expression="name" |
892 | parent_utility="lp.registry.interfaces.karma.IKarmaActionSet" |
893 | @@ -704,7 +705,7 @@ |
894 | permission="launchpad.Admin" |
895 | template="../../app/templates/generic-edit.pt" |
896 | /> |
897 | - <browser:url |
898 | + <lp:url |
899 | for="lp.registry.interfaces.karma.IKarmaActionSet" |
900 | path_expression="string:karmaaction" |
901 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
902 | @@ -760,12 +761,12 @@ |
903 | classes=" |
904 | PollNavigation" |
905 | /> |
906 | - <browser:url |
907 | + <lp:url |
908 | for="lp.registry.interfaces.poll.IPoll" |
909 | path_expression="string:+poll/${name}" |
910 | attribute_to_parent="team" |
911 | /> |
912 | - <browser:url |
913 | + <lp:url |
914 | for="lp.registry.interfaces.poll.IPollSet" |
915 | path_expression="string:+polls" |
916 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
917 | @@ -816,7 +817,7 @@ |
918 | name="+edit" |
919 | for="lp.registry.interfaces.poll.IPollOption" |
920 | /> |
921 | - <browser:url |
922 | + <lp:url |
923 | for="lp.registry.interfaces.poll.IPollOption" |
924 | path_expression="string:+option/${id}" |
925 | attribute_to_parent="poll" |
926 | @@ -828,7 +829,7 @@ |
927 | permission="launchpad.Edit" |
928 | template="../templates/polloption-edit.pt" |
929 | /> |
930 | - <browser:url |
931 | + <lp:url |
932 | for="lp.registry.interfaces.announcement.IAnnouncement" |
933 | path_expression="string:+announcement/${id}" |
934 | attribute_to_parent="target" |
935 | @@ -899,7 +900,7 @@ |
936 | permission="launchpad.Edit" |
937 | template="../templates/announcement-add.pt" |
938 | /> |
939 | - <browser:url |
940 | + <lp:url |
941 | for="lp.registry.interfaces.announcement.IAnnouncementSet" |
942 | path_expression="string:+announcements" |
943 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
944 | @@ -969,7 +970,7 @@ |
945 | TeamOverviewNavigationMenu |
946 | " |
947 | /> |
948 | - <browser:url |
949 | + <lp:url |
950 | for="lp.registry.interfaces.person.IPerson" |
951 | path_expression="string:~${name}" |
952 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
953 | @@ -1532,13 +1533,13 @@ |
954 | name="+index" |
955 | for="lp.registry.interfaces.milestone.IMilestoneData" |
956 | /> |
957 | - <browser:url |
958 | + <lp:url |
959 | for="lp.registry.interfaces.milestone.IMilestoneData" |
960 | path_expression="string:+milestone/${name}" |
961 | rootsite="mainsite" |
962 | attribute_to_parent="target" |
963 | /> |
964 | - <browser:url |
965 | + <lp:url |
966 | for="lp.registry.interfaces.milestonetag.IProjectGroupMilestoneTag" |
967 | path_expression="string:+tags/${name}" |
968 | rootsite="mainsite" |
969 | @@ -1643,7 +1644,7 @@ |
970 | permission="launchpad.View" |
971 | template="../templates/message-moderation.pt" |
972 | /> |
973 | - <browser:url |
974 | + <lp:url |
975 | for="lp.registry.interfaces.wikiname.IWikiName" |
976 | path_expression="string:+wikiname/${id}" |
977 | attribute_to_parent="person" |
978 | @@ -1667,7 +1668,7 @@ |
979 | module="lp.registry.browser.product" |
980 | classes="ProductNavigation" |
981 | /> |
982 | - <browser:url |
983 | + <lp:url |
984 | for="lp.registry.interfaces.product.IProduct" |
985 | path_expression="name" |
986 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
987 | @@ -1721,7 +1722,7 @@ |
988 | for="lp.registry.interfaces.pillar.IPillarPerson" |
989 | permission="zope.Public" |
990 | /> |
991 | - <browser:url |
992 | + <lp:url |
993 | for="lp.registry.interfaces.pillar.IPillarPerson" |
994 | path_expression="string:+sharing/${person/name}" |
995 | rootsite="mainsite" |
996 | @@ -1837,12 +1838,12 @@ |
997 | permission="launchpad.Edit" |
998 | template="../../app/templates/generic-edit.pt" |
999 | /> |
1000 | - <browser:url |
1001 | + <lp:url |
1002 | for="lp.registry.interfaces.nameblocklist.INameBlocklistSet" |
1003 | path_expression="string:+nameblocklist" |
1004 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1005 | /> |
1006 | - <browser:url |
1007 | + <lp:url |
1008 | for="lp.registry.interfaces.nameblocklist.INameBlocklist" |
1009 | path_expression="string:${id}" |
1010 | parent_utility="lp.registry.interfaces.nameblocklist.INameBlocklistSet" |
1011 | @@ -1896,7 +1897,7 @@ |
1012 | ProductSetNavigation |
1013 | " |
1014 | /> |
1015 | - <browser:url |
1016 | + <lp:url |
1017 | for="lp.registry.interfaces.product.IProductSet" |
1018 | path_expression="string:projects" |
1019 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1020 | @@ -1953,7 +1954,7 @@ |
1021 | classes=" |
1022 | ProductSeriesNavigation" |
1023 | /> |
1024 | - <browser:url |
1025 | + <lp:url |
1026 | for="lp.registry.interfaces.productseries.IProductSeries" |
1027 | path_expression="name" |
1028 | attribute_to_parent="product" |
1029 | @@ -1962,10 +1963,10 @@ |
1030 | ITimelinProductSeries. It has been configured to return the |
1031 | same url as IProductSeries. This won't cause a problem when |
1032 | navigating to the url, since ProductNavigation.traverse() just |
1033 | - returns an IProductSeries object, and browser:url only affects |
1034 | + returns an IProductSeries object, and lp:url only affects |
1035 | canonical_url(). |
1036 | --> |
1037 | - <browser:url |
1038 | + <lp:url |
1039 | for="lp.registry.interfaces.productseries.ITimelineProductSeries" |
1040 | path_expression="name" |
1041 | attribute_to_parent="product" |
1042 | @@ -2093,7 +2094,7 @@ |
1043 | class="lp.answers.browser.questiontarget.AskAQuestionButtonPortlet" |
1044 | permission="zope.Public" |
1045 | /> |
1046 | - <browser:url |
1047 | + <lp:url |
1048 | for="lp.registry.interfaces.productseries.IProductSeriesSet" |
1049 | path_expression="string:series" |
1050 | parent_utility="lp.code.interfaces.codehosting.IBazaarApplication" |
1051 | @@ -2356,7 +2357,7 @@ |
1052 | classes=" |
1053 | DistributionSetNavigation" |
1054 | /> |
1055 | - <browser:url |
1056 | + <lp:url |
1057 | for="lp.registry.interfaces.distribution.IDistribution" |
1058 | path_expression="name" |
1059 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1060 | @@ -2404,7 +2405,7 @@ |
1061 | classes=" |
1062 | SourcePackageNavigation" |
1063 | /> |
1064 | - <browser:url |
1065 | + <lp:url |
1066 | for="lp.registry.interfaces.sourcepackage.ISourcePackage" |
1067 | path_expression="string:+source/${name}" |
1068 | attribute_to_parent="distroseries" |
1069 | @@ -2460,12 +2461,12 @@ |
1070 | for="lp.registry.interfaces.productrelease.IProductRelease" |
1071 | permission="launchpad.View" |
1072 | /> |
1073 | - <browser:url |
1074 | + <lp:url |
1075 | for="lp.registry.interfaces.productrelease.IProductRelease" |
1076 | path_expression="version" |
1077 | attribute_to_parent="productseries" |
1078 | /> |
1079 | - <browser:url |
1080 | + <lp:url |
1081 | for="lp.registry.interfaces.productrelease.IProductReleaseFile" |
1082 | path_expression="string:+file/${libraryfile/filename}" |
1083 | rootsite="api" |
1084 | @@ -2534,7 +2535,7 @@ |
1085 | name="+index" |
1086 | for="lp.registry.interfaces.distributionmirror.IDistributionMirror" |
1087 | /> |
1088 | - <browser:url |
1089 | + <lp:url |
1090 | for="lp.registry.interfaces.distributionmirror.IDistributionMirror" |
1091 | path_expression="string:+mirror/${name}" |
1092 | attribute_to_parent="distribution" |
1093 | @@ -2631,7 +2632,7 @@ |
1094 | permission="launchpad.AnyPerson" |
1095 | template="../templates/sourcepackage-remove-packaging.pt" |
1096 | /> |
1097 | - <browser:url |
1098 | + <lp:url |
1099 | for="lp.registry.interfaces.persondistributionsourcepackage.IPersonDistributionSourcePackage" |
1100 | path_expression="string:${distro_source_package/distribution/name}/+source/${distro_source_package/sourcepackagename/name}" |
1101 | attribute_to_parent="person" |
1102 | @@ -2646,7 +2647,7 @@ |
1103 | classes=" |
1104 | PersonDistributionSourcePackageFacets" |
1105 | /> |
1106 | - <browser:url |
1107 | + <lp:url |
1108 | for="lp.registry.interfaces.personociproject.IPersonOCIProject" |
1109 | path_expression="string:${oci_project/pillar/name}/+oci/${oci_project/name}" |
1110 | attribute_to_parent="person" |
1111 | @@ -2655,7 +2656,7 @@ |
1112 | module="lp.registry.browser.personociproject" |
1113 | classes="PersonOCIProjectNavigation" |
1114 | /> |
1115 | - <browser:url |
1116 | + <lp:url |
1117 | for="lp.registry.interfaces.personproduct.IPersonProduct" |
1118 | path_expression="product/name" |
1119 | attribute_to_parent="person" |
1120 | @@ -2670,13 +2671,13 @@ |
1121 | classes=" |
1122 | PersonProductFacets" |
1123 | /> |
1124 | - <browser:url |
1125 | + <lp:url |
1126 | for="lp.registry.interfaces.ssh.ISSHKey" |
1127 | path_expression="string:+ssh-keys/${id}" |
1128 | rootsite="api" |
1129 | attribute_to_parent="person" |
1130 | /> |
1131 | - <browser:url |
1132 | + <lp:url |
1133 | for="lp.registry.interfaces.gpg.IGPGKey" |
1134 | path_expression="string:+gpg-keys/${fingerprint}" |
1135 | rootsite="api" |
1136 | diff --git a/lib/lp/services/auth/configure.zcml b/lib/lp/services/auth/configure.zcml |
1137 | index 984737e..6ae2d20 100644 |
1138 | --- a/lib/lp/services/auth/configure.zcml |
1139 | +++ b/lib/lp/services/auth/configure.zcml |
1140 | @@ -28,7 +28,7 @@ |
1141 | <allow interface="lp.services.auth.interfaces.IAccessTokenSet" /> |
1142 | </lp:securedutility> |
1143 | |
1144 | - <browser:url |
1145 | + <lp:url |
1146 | for="lp.services.auth.interfaces.IAccessToken" |
1147 | path_expression="string:+access-token/${id}" |
1148 | attribute_to_parent="target" /> |
1149 | diff --git a/lib/lp/services/features/browser/configure.zcml b/lib/lp/services/features/browser/configure.zcml |
1150 | index 344dbf8..9346db5 100644 |
1151 | --- a/lib/lp/services/features/browser/configure.zcml |
1152 | +++ b/lib/lp/services/features/browser/configure.zcml |
1153 | @@ -6,10 +6,11 @@ |
1154 | xmlns="http://namespaces.zope.org/zope" |
1155 | xmlns:browser="http://namespaces.zope.org/browser" |
1156 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1157 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1158 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1159 | i18n_domain="launchpad"> |
1160 | |
1161 | - <browser:url |
1162 | + <lp:url |
1163 | for="lp.services.features.interfaces.IFeatureRules" |
1164 | path_expression="string:+feature-rules" |
1165 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
1166 | diff --git a/lib/lp/services/identity/configure.zcml b/lib/lp/services/identity/configure.zcml |
1167 | index c04e72d..690b52f 100644 |
1168 | --- a/lib/lp/services/identity/configure.zcml |
1169 | +++ b/lib/lp/services/identity/configure.zcml |
1170 | @@ -40,7 +40,7 @@ |
1171 | interface="lp.services.identity.interfaces.emailaddress.IEmailAddressSet"/> |
1172 | </lp:securedutility> |
1173 | |
1174 | - <browser:url |
1175 | + <lp:url |
1176 | for="lp.services.identity.interfaces.emailaddress.IEmailAddress" |
1177 | path_expression="string:+email/${email}" |
1178 | rootsite="api" |
1179 | diff --git a/lib/lp/services/messages/browser/configure.zcml b/lib/lp/services/messages/browser/configure.zcml |
1180 | index 0413ba9..a86cecf 100644 |
1181 | --- a/lib/lp/services/messages/browser/configure.zcml |
1182 | +++ b/lib/lp/services/messages/browser/configure.zcml |
1183 | @@ -1,9 +1,9 @@ |
1184 | <configure |
1185 | xmlns="http://namespaces.zope.org/zope" |
1186 | - xmlns:browser="http://namespaces.zope.org/browser" |
1187 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1188 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1189 | i18n_domain="launchpad"> |
1190 | - <browser:url |
1191 | + <lp:url |
1192 | for="lp.services.messages.interfaces.messagerevision.IMessageRevision" |
1193 | path_expression="string:revisions/${revision}" |
1194 | attribute_to_parent="message_implementation" /> |
1195 | diff --git a/lib/lp/services/statistics/browser/configure.zcml b/lib/lp/services/statistics/browser/configure.zcml |
1196 | index d30cc51..04ab11e 100644 |
1197 | --- a/lib/lp/services/statistics/browser/configure.zcml |
1198 | +++ b/lib/lp/services/statistics/browser/configure.zcml |
1199 | @@ -2,9 +2,10 @@ |
1200 | xmlns="http://namespaces.zope.org/zope" |
1201 | xmlns:browser="http://namespaces.zope.org/browser" |
1202 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1203 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1204 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1205 | i18n_domain="launchpad"> |
1206 | - <browser:url |
1207 | + <lp:url |
1208 | for="lp.services.statistics.interfaces.statistic.ILaunchpadStatisticSet" |
1209 | path_expression="string:+statistics" |
1210 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
1211 | @@ -20,4 +21,4 @@ |
1212 | name="+index" |
1213 | template="../templates/launchpadstatisticset-index.pt"/> |
1214 | </browser:pages> |
1215 | -</configure> |
1216 | \ No newline at end of file |
1217 | +</configure> |
1218 | diff --git a/lib/lp/services/temporaryblobstorage/configure.zcml b/lib/lp/services/temporaryblobstorage/configure.zcml |
1219 | index e696b52..598ebfa 100644 |
1220 | --- a/lib/lp/services/temporaryblobstorage/configure.zcml |
1221 | +++ b/lib/lp/services/temporaryblobstorage/configure.zcml |
1222 | @@ -43,12 +43,12 @@ |
1223 | classes="TemporaryBlobStorageNavigation" |
1224 | /> |
1225 | |
1226 | - <browser:url |
1227 | + <lp:url |
1228 | for="lp.services.temporaryblobstorage.interfaces.ITemporaryBlobStorage" |
1229 | urldata="lp.services.temporaryblobstorage.browser.TemporaryBlobStorageURL" |
1230 | parent_utility="lp.services.webservice.interfaces.IWebServiceApplication"/> |
1231 | |
1232 | - <browser:url |
1233 | + <lp:url |
1234 | for="lp.services.temporaryblobstorage.interfaces.ITemporaryStorageManager" |
1235 | path_expression="string:temporary-blobs" |
1236 | parent_utility="lp.services.webservice.interfaces.IWebServiceApplication"/> |
1237 | diff --git a/lib/lp/services/verification/browser/configure.zcml b/lib/lp/services/verification/browser/configure.zcml |
1238 | index 856da04..a3a0765 100644 |
1239 | --- a/lib/lp/services/verification/browser/configure.zcml |
1240 | +++ b/lib/lp/services/verification/browser/configure.zcml |
1241 | @@ -2,9 +2,9 @@ |
1242 | xmlns="http://namespaces.zope.org/zope" |
1243 | xmlns:browser="http://namespaces.zope.org/browser" |
1244 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1245 | - xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1246 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1247 | i18n_domain="launchpad"> |
1248 | - <browser:url |
1249 | + <lp:url |
1250 | for="lp.services.verification.interfaces.logintoken.ILoginTokenSet" |
1251 | path_expression="string:token" |
1252 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1253 | @@ -14,7 +14,7 @@ |
1254 | <browser:defaultView |
1255 | for="lp.services.verification.interfaces.logintoken.ILoginToken" |
1256 | name="+index"/> |
1257 | - <browser:url |
1258 | + <lp:url |
1259 | for="lp.services.verification.interfaces.logintoken.ILoginToken" |
1260 | path_expression="token" |
1261 | parent_utility="lp.services.verification.interfaces.logintoken.ILoginTokenSet"/> |
1262 | diff --git a/lib/lp/services/webapp/doc/canonical_url.rst b/lib/lp/services/webapp/doc/canonical_url.rst |
1263 | index 32123e4..f2825cc 100644 |
1264 | --- a/lib/lp/services/webapp/doc/canonical_url.rst |
1265 | +++ b/lib/lp/services/webapp/doc/canonical_url.rst |
1266 | @@ -3,10 +3,10 @@ Canonical URLs |
1267 | |
1268 | https://launchpad.canonical.com/CanonicalUrls |
1269 | |
1270 | -The browser:url ZCML directive |
1271 | ------------------------------- |
1272 | +The lp:url ZCML directive |
1273 | +------------------------- |
1274 | |
1275 | -The browser:url directive registers an ICanonicalUrlData adapter. |
1276 | +The lp:url directive registers an ICanonicalUrlData adapter. |
1277 | |
1278 | In this test, we'll use a URL hierarchy /countries/England/+towns/London |
1279 | |
1280 | @@ -31,7 +31,7 @@ will put in a temporary module. |
1281 | ... |
1282 | |
1283 | >>> class ITown(Interface): |
1284 | - ... """Dummy interface for use in browser:url tests.""" |
1285 | + ... """Dummy interface for use in lp:url tests.""" |
1286 | ... |
1287 | ... __module__ = module.__name__ |
1288 | ... country = Attribute("the country the town is in") |
1289 | @@ -118,16 +118,16 @@ Next, we check there are no ICanonicalUrlData adapters for these objects. |
1290 | ... assert ICanonicalUrlData(obj, None) is None |
1291 | ... |
1292 | |
1293 | -Configure a browser:url for ITown. Our first attempt fails because we |
1294 | +Configure a lp:url for ITown. Our first attempt fails because we |
1295 | mistyped 'countryOopsTypo', and there is no such name in ITown. |
1296 | |
1297 | >>> from zope.configuration import xmlconfig |
1298 | >>> zcmlcontext = xmlconfig.string( |
1299 | ... """ |
1300 | - ... <configure xmlns:browser="http://namespaces.zope.org/browser"> |
1301 | + ... <configure xmlns:lp="http://namespaces.canonical.com/lp"> |
1302 | ... <include package="zope.component" file="meta.zcml" /> |
1303 | ... <include package="lp.services.webapp" file="meta.zcml" /> |
1304 | - ... <browser:url |
1305 | + ... <lp:url |
1306 | ... for="{module_name}.ITown" |
1307 | ... path_expression="string:+towns/${{name}}" |
1308 | ... attribute_to_parent="countryOopsTypo" |
1309 | @@ -144,9 +144,9 @@ mistyped 'countryOopsTypo', and there is no such name in ITown. |
1310 | |
1311 | >>> zcmlcontext = xmlconfig.string( |
1312 | ... """ |
1313 | - ... <configure xmlns:browser="http://namespaces.zope.org/browser"> |
1314 | + ... <configure xmlns:lp="http://namespaces.canonical.com/lp"> |
1315 | ... <include package="lp.services.webapp" file="meta.zcml" /> |
1316 | - ... <browser:url |
1317 | + ... <lp:url |
1318 | ... for="{module_name}.ITown" |
1319 | ... path_expression="string:+towns/${{name}}" |
1320 | ... attribute_to_parent="country" |
1321 | @@ -179,7 +179,7 @@ at it from zcml. I'll put it in our temporary module. |
1322 | ... """ |
1323 | ... <configure |
1324 | ... xmlns="http://namespaces.zope.org/zope" |
1325 | - ... xmlns:browser="http://namespaces.zope.org/browser"> |
1326 | + ... xmlns:lp="http://namespaces.canonical.com/lp"> |
1327 | ... <include package="zope.component" file="meta.zcml" /> |
1328 | ... <include package="lp.services.webapp" file="meta.zcml" /> |
1329 | ... <configure package="zope.security"> |
1330 | @@ -189,7 +189,7 @@ at it from zcml. I'll put it in our temporary module. |
1331 | ... provides="{module_name}.ICountrySet" |
1332 | ... component="{module_name}.countryset_instance" |
1333 | ... /> |
1334 | - ... <browser:url |
1335 | + ... <lp:url |
1336 | ... for="{module_name}.ICountry" |
1337 | ... path_expression="name" |
1338 | ... parent_utility="{module_name}.ICountrySet" |
1339 | @@ -211,7 +211,7 @@ Now, there is an ICanonicalUrlData registered for ICountry. |
1340 | >>> country_urldata.inside is countryset_instance |
1341 | True |
1342 | |
1343 | -We need to specify a browser:url for ICountrySet. We'll use a variation on |
1344 | +We need to specify an lp:url for ICountrySet. We'll use a variation on |
1345 | the zcml that allows us to directly set an ICanonicalUrlData adapter to use. |
1346 | The adapter will make its parent the ILaunchpadRoot utility. This is not the |
1347 | normal way to do this. Normally, we'd just say |
1348 | @@ -243,9 +243,9 @@ in our temporary module. |
1349 | |
1350 | >>> zcmlcontext = xmlconfig.string( |
1351 | ... """ |
1352 | - ... <configure xmlns:browser="http://namespaces.zope.org/browser"> |
1353 | + ... <configure xmlns:lp="http://namespaces.canonical.com/lp"> |
1354 | ... <include package="lp.services.webapp" file="meta.zcml" /> |
1355 | - ... <browser:url |
1356 | + ... <lp:url |
1357 | ... for="{module_name}.ICountrySet" |
1358 | ... urldata="{module_name}.CountrySetUrl" |
1359 | ... /> |
1360 | @@ -485,14 +485,14 @@ And if the configuration does provide a rootsite: |
1361 | ... """ |
1362 | ... <configure |
1363 | ... xmlns="http://namespaces.zope.org/zope" |
1364 | - ... xmlns:browser="http://namespaces.zope.org/browser"> |
1365 | + ... xmlns:lp="http://namespaces.canonical.com/lp"> |
1366 | ... <include package="zope.component" file="meta.zcml" /> |
1367 | ... <include package="lp.services.webapp" file="meta.zcml" /> |
1368 | ... <utility |
1369 | ... provides="{module_name}.ICountrySet" |
1370 | ... component="{module_name}.countryset_instance" |
1371 | ... /> |
1372 | - ... <browser:url |
1373 | + ... <lp:url |
1374 | ... for="{module_name}.ICountry" |
1375 | ... path_expression="name" |
1376 | ... parent_utility="{module_name}.ICountrySet" |
1377 | diff --git a/lib/lp/services/webapp/doc/zcmldirectives.rst b/lib/lp/services/webapp/doc/zcmldirectives.rst |
1378 | index 49e5434..ec7708e 100644 |
1379 | --- a/lib/lp/services/webapp/doc/zcmldirectives.rst |
1380 | +++ b/lib/lp/services/webapp/doc/zcmldirectives.rst |
1381 | @@ -6,7 +6,7 @@ We have a bunch of custom zcml directives in Launchpad. |
1382 | Canonical URLs |
1383 | -------------- |
1384 | |
1385 | -See canonical_url.rst for information and tests of the browser:url directive. |
1386 | +See canonical_url.rst for information and tests of the lp:url directive. |
1387 | |
1388 | |
1389 | A zcml context for zcml directive unittests |
1390 | diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml |
1391 | index 04d8934..8d59765 100644 |
1392 | --- a/lib/lp/services/webapp/meta.zcml |
1393 | +++ b/lib/lp/services/webapp/meta.zcml |
1394 | @@ -5,7 +5,7 @@ |
1395 | <configure xmlns="http://namespaces.zope.org/meta"> |
1396 | |
1397 | <directive |
1398 | - namespace="http://namespaces.zope.org/browser" |
1399 | + namespace="http://namespaces.canonical.com/lp" |
1400 | name="url" |
1401 | schema="lp.services.webapp.metazcml.IURLDirective" |
1402 | handler="lp.services.webapp.metazcml.url" |
1403 | diff --git a/lib/lp/services/webapp/metazcml.py b/lib/lp/services/webapp/metazcml.py |
1404 | index 6f34f26..5576f9f 100644 |
1405 | --- a/lib/lp/services/webapp/metazcml.py |
1406 | +++ b/lib/lp/services/webapp/metazcml.py |
1407 | @@ -403,7 +403,7 @@ def url( |
1408 | parent_utility=None, |
1409 | rootsite=None, |
1410 | ): |
1411 | - """browser:url directive handler.""" |
1412 | + """lp:url directive handler.""" |
1413 | if not attribute_to_parent and not parent_utility and not urldata: |
1414 | raise TypeError( |
1415 | "Must provide attribute_to_parent, urldata or parent_utility." |
1416 | diff --git a/lib/lp/services/webhooks/configure.zcml b/lib/lp/services/webhooks/configure.zcml |
1417 | index d35fe99..f93d21c 100644 |
1418 | --- a/lib/lp/services/webhooks/configure.zcml |
1419 | +++ b/lib/lp/services/webhooks/configure.zcml |
1420 | @@ -70,7 +70,7 @@ |
1421 | factory="lp.services.webhooks.payload.WebhookAbsoluteURL" |
1422 | /> |
1423 | |
1424 | - <browser:url |
1425 | + <lp:url |
1426 | for="lp.services.webhooks.interfaces.IWebhook" |
1427 | path_expression="string:+webhook/${id}" |
1428 | attribute_to_parent="target" |
1429 | @@ -78,7 +78,7 @@ |
1430 | <browser:navigation |
1431 | module="lp.services.webhooks.browser" classes="WebhookNavigation" /> |
1432 | |
1433 | - <browser:url |
1434 | + <lp:url |
1435 | for="lp.services.webhooks.interfaces.IWebhookDeliveryJob" |
1436 | path_expression="string:+delivery/${job_id}" |
1437 | attribute_to_parent="webhook" |
1438 | diff --git a/lib/lp/services/worlddata/browser/configure.zcml b/lib/lp/services/worlddata/browser/configure.zcml |
1439 | index 2e94fa3..9315d35 100644 |
1440 | --- a/lib/lp/services/worlddata/browser/configure.zcml |
1441 | +++ b/lib/lp/services/worlddata/browser/configure.zcml |
1442 | @@ -6,16 +6,17 @@ |
1443 | xmlns="http://namespaces.zope.org/zope" |
1444 | xmlns:browser="http://namespaces.zope.org/browser" |
1445 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1446 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1447 | xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1448 | i18n_domain="launchpad"> |
1449 | |
1450 | - <browser:url |
1451 | + <lp:url |
1452 | for="lp.services.worlddata.interfaces.country.ICountry" |
1453 | path_expression="iso3166code2" |
1454 | parent_utility="lp.services.worlddata.interfaces.country.ICountrySet" |
1455 | rootsite="mainsite" /> |
1456 | |
1457 | - <browser:url |
1458 | + <lp:url |
1459 | for="lp.services.worlddata.interfaces.country.ICountrySet" |
1460 | path_expression="string:+countries" |
1461 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1462 | diff --git a/lib/lp/snappy/browser/configure.zcml b/lib/lp/snappy/browser/configure.zcml |
1463 | index 21d849f..f2d8fa3 100644 |
1464 | --- a/lib/lp/snappy/browser/configure.zcml |
1465 | +++ b/lib/lp/snappy/browser/configure.zcml |
1466 | @@ -6,10 +6,10 @@ |
1467 | xmlns="http://namespaces.zope.org/zope" |
1468 | xmlns:browser="http://namespaces.zope.org/browser" |
1469 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1470 | - xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1471 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1472 | i18n_domain="launchpad"> |
1473 | <facet facet="overview"> |
1474 | - <browser:url |
1475 | + <lp:url |
1476 | for="lp.snappy.interfaces.snap.ISnap" |
1477 | urldata="lp.snappy.browser.snap.SnapURL" /> |
1478 | <browser:defaultView |
1479 | @@ -68,7 +68,7 @@ |
1480 | permission="launchpad.AnyPerson" |
1481 | name="+addsubscriber" |
1482 | template="../../app/templates/generic-edit.pt"/> |
1483 | - <browser:url |
1484 | + <lp:url |
1485 | for="lp.snappy.interfaces.snapsubscription.ISnapSubscription" |
1486 | path_expression="string:+subscription/${person/name}" |
1487 | attribute_to_parent="snap" |
1488 | @@ -127,15 +127,15 @@ |
1489 | for="lp.snappy.interfaces.snap.ISnap" |
1490 | factory="lp.snappy.browser.snap.SnapBreadcrumb" |
1491 | permission="zope.Public" /> |
1492 | - <browser:url |
1493 | + <lp:url |
1494 | for="lp.snappy.interfaces.snap.ISnapSet" |
1495 | path_expression="string:+snaps" |
1496 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> |
1497 | - <browser:url |
1498 | + <lp:url |
1499 | for="lp.snappy.interfaces.snap.ISnapBuildRequest" |
1500 | path_expression="string:+build-request/${id}" |
1501 | attribute_to_parent="snap" /> |
1502 | - <browser:url |
1503 | + <lp:url |
1504 | for="lp.snappy.interfaces.snapbuild.ISnapBuild" |
1505 | path_expression="string:+build/${id}" |
1506 | attribute_to_parent="snap" /> |
1507 | @@ -177,22 +177,22 @@ |
1508 | for="lp.snappy.interfaces.snapbuild.ISnapBuild" |
1509 | factory="lp.services.webapp.breadcrumb.TitleBreadcrumb" |
1510 | permission="zope.Public" /> |
1511 | - <browser:url |
1512 | + <lp:url |
1513 | for="lp.snappy.interfaces.snappyseries.ISnappySeries" |
1514 | path_expression="name" |
1515 | parent_utility="lp.snappy.interfaces.snappyseries.ISnappySeriesSet" /> |
1516 | - <browser:url |
1517 | + <lp:url |
1518 | for="lp.snappy.interfaces.snappyseries.ISnappySeriesSet" |
1519 | path_expression="string:+snappy-series" |
1520 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> |
1521 | <browser:navigation |
1522 | module="lp.snappy.browser.snappyseries" |
1523 | classes="SnappySeriesSetNavigation" /> |
1524 | - <browser:url |
1525 | + <lp:url |
1526 | for="lp.snappy.interfaces.snapbase.ISnapBase" |
1527 | path_expression="name" |
1528 | parent_utility="lp.snappy.interfaces.snapbase.ISnapBaseSet" /> |
1529 | - <browser:url |
1530 | + <lp:url |
1531 | for="lp.snappy.interfaces.snapbase.ISnapBaseSet" |
1532 | path_expression="string:+snap-bases" |
1533 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> |
1534 | diff --git a/lib/lp/soyuz/browser/configure.zcml b/lib/lp/soyuz/browser/configure.zcml |
1535 | index ea111dd..fa27b2a 100644 |
1536 | --- a/lib/lp/soyuz/browser/configure.zcml |
1537 | +++ b/lib/lp/soyuz/browser/configure.zcml |
1538 | @@ -6,9 +6,9 @@ |
1539 | xmlns="http://namespaces.zope.org/zope" |
1540 | xmlns:browser="http://namespaces.zope.org/browser" |
1541 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1542 | - xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1543 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1544 | i18n_domain="launchpad"> |
1545 | - <browser:url |
1546 | + <lp:url |
1547 | for="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet" |
1548 | path_expression="string:binarypackagenames" |
1549 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1550 | @@ -29,7 +29,7 @@ |
1551 | name="+record-details" |
1552 | template="../templates/packagepublishing-details.pt"/> |
1553 | </browser:pages> |
1554 | - <browser:url |
1555 | + <lp:url |
1556 | for="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistory" |
1557 | path_expression="string:+binarypub" |
1558 | attribute_to_parent="archive" |
1559 | @@ -125,7 +125,7 @@ |
1560 | name="+listing-archive-detailed-selectable" |
1561 | template="../templates/sourcepackagepublishinghistory-listing-archive-detailed.pt"/> |
1562 | </browser:pages> |
1563 | - <browser:url |
1564 | + <lp:url |
1565 | for="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistory" |
1566 | path_expression="string:+sourcepub" |
1567 | attribute_to_parent="archive" |
1568 | @@ -136,7 +136,7 @@ |
1569 | <browser:defaultView |
1570 | for="lp.soyuz.interfaces.distroarchseriesbinarypackagerelease.IDistroArchSeriesBinaryPackageRelease" |
1571 | name="+index"/> |
1572 | - <browser:url |
1573 | + <lp:url |
1574 | for="lp.soyuz.interfaces.distroarchseriesbinarypackagerelease.IDistroArchSeriesBinaryPackageRelease" |
1575 | path_expression="version" |
1576 | attribute_to_parent="distroarchseriesbinarypackage"/> |
1577 | @@ -158,11 +158,11 @@ |
1578 | name="+portlet-details" |
1579 | template="../templates/distroarchseriesbinarypackagerelease-portlet-details.pt"/> |
1580 | </browser:pages> |
1581 | - <browser:url |
1582 | + <lp:url |
1583 | for="lp.soyuz.interfaces.distroarchseriesfilter.IDistroArchSeriesFilter" |
1584 | path_expression="string:+source-filter" |
1585 | attribute_to_parent="distroarchseries"/> |
1586 | - <browser:url |
1587 | + <lp:url |
1588 | for="lp.soyuz.interfaces.archive.IArchiveSet" |
1589 | path_expression="string:archives" |
1590 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1591 | @@ -173,12 +173,12 @@ |
1592 | <browser:navigation |
1593 | module="lp.soyuz.browser.archive" |
1594 | classes="ArchiveNavigation" /> |
1595 | - <browser:url |
1596 | + <lp:url |
1597 | for="lp.soyuz.interfaces.archive.IPPA" |
1598 | path_expression="string:+archive" |
1599 | attribute_to_parent="owner" |
1600 | urldata="lp.soyuz.browser.archive.PPAURL"/> |
1601 | - <browser:url |
1602 | + <lp:url |
1603 | for="lp.soyuz.interfaces.archive.IDistributionArchive" |
1604 | path_expression="string:+archive" |
1605 | attribute_to_parent="distribution" |
1606 | @@ -278,12 +278,12 @@ |
1607 | ArchiveIndexActionsMenu |
1608 | ArchivePackagesActionMenu" |
1609 | module="lp.soyuz.browser.archive"/> |
1610 | - <browser:url |
1611 | + <lp:url |
1612 | for="lp.soyuz.interfaces.archivepermission.IArchiveUploader" |
1613 | path_expression="string:+upload" |
1614 | attribute_to_parent="archive" |
1615 | urldata="lp.soyuz.browser.archivepermission.ArchivePermissionURL"/> |
1616 | - <browser:url |
1617 | + <lp:url |
1618 | for="lp.soyuz.interfaces.archivepermission.IArchiveQueueAdmin" |
1619 | path_expression="string:+queue-admin" |
1620 | attribute_to_parent="archive" |
1621 | @@ -291,7 +291,7 @@ |
1622 | <browser:defaultView |
1623 | for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild" |
1624 | name="+index"/> |
1625 | - <browser:url |
1626 | + <lp:url |
1627 | for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild" |
1628 | urldata="lp.soyuz.browser.build.BuildUrl"/> |
1629 | <browser:navigation |
1630 | @@ -337,7 +337,7 @@ |
1631 | <browser:defaultView |
1632 | for="lp.soyuz.interfaces.distroarchseriesbinarypackage.IDistroArchSeriesBinaryPackage" |
1633 | name="+index"/> |
1634 | - <browser:url |
1635 | + <lp:url |
1636 | for="lp.soyuz.interfaces.distroarchseriesbinarypackage.IDistroArchSeriesBinaryPackage" |
1637 | path_expression="name" |
1638 | attribute_to_parent="distroarchseries"/> |
1639 | @@ -362,11 +362,11 @@ |
1640 | name="+portlet-releases" |
1641 | template="../templates/distroarchseriesbinarypackage-portlet-releases.pt"/> |
1642 | </browser:pages> |
1643 | - <browser:url |
1644 | + <lp:url |
1645 | for="lp.soyuz.interfaces.archivesubscriber.IArchiveSubscriber" |
1646 | path_expression="string:+subscriptions/${subscriber/name}" |
1647 | attribute_to_parent="archive"/> |
1648 | - <browser:url |
1649 | + <lp:url |
1650 | for="lp.soyuz.interfaces.archivesubscriber.IPersonalArchiveSubscription" |
1651 | path_expression="string:+archivesubscriptions/${archive/id}" |
1652 | attribute_to_parent="subscriber"/> |
1653 | @@ -394,7 +394,7 @@ |
1654 | <browser:defaultView |
1655 | for="lp.soyuz.interfaces.distributionsourcepackagerelease.IDistributionSourcePackageRelease" |
1656 | name="+index"/> |
1657 | - <browser:url |
1658 | + <lp:url |
1659 | for="lp.soyuz.interfaces.distributionsourcepackagerelease.IDistributionSourcePackageRelease" |
1660 | path_expression="version" |
1661 | attribute_to_parent="sourcepackage"/> |
1662 | @@ -425,7 +425,7 @@ |
1663 | <browser:defaultView |
1664 | for="lp.soyuz.interfaces.distroseriesbinarypackage.IDistroSeriesBinaryPackage" |
1665 | name="+index"/> |
1666 | - <browser:url |
1667 | + <lp:url |
1668 | for="lp.soyuz.interfaces.distroseriesbinarypackage.IDistroSeriesBinaryPackage" |
1669 | path_expression="string:+package/${name}" |
1670 | attribute_to_parent="distroseries"/> |
1671 | @@ -458,7 +458,7 @@ |
1672 | module="lp.soyuz.browser.distroarchseries" |
1673 | classes=" |
1674 | DistroArchSeriesActionMenu"/> |
1675 | - <browser:url |
1676 | + <lp:url |
1677 | for="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries" |
1678 | path_expression="architecturetag" |
1679 | attribute_to_parent="distroseries"/> |
1680 | @@ -645,7 +645,7 @@ |
1681 | template="../templates/distroseries-portlet-latestuploads.pt"/> |
1682 | </browser:pages> |
1683 | |
1684 | - <browser:url |
1685 | + <lp:url |
1686 | for="lp.soyuz.interfaces.packageset.IPackagesetSet" |
1687 | path_expression="string:package-sets" |
1688 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1689 | @@ -654,17 +654,17 @@ |
1690 | module="lp.soyuz.browser.packageset" |
1691 | classes="PackagesetSetNavigation" |
1692 | /> |
1693 | - <browser:url |
1694 | + <lp:url |
1695 | for="lp.soyuz.interfaces.packageset.IPackageset" |
1696 | path_expression="string:${distroseries/distribution/name}/${distroseries/name}/${name}" |
1697 | parent_utility="lp.soyuz.interfaces.packageset.IPackagesetSet" |
1698 | /> |
1699 | - <browser:url |
1700 | + <lp:url |
1701 | for="lp.soyuz.interfaces.queue.IPackageUpload" |
1702 | path_expression="string:+upload/${id}" |
1703 | attribute_to_parent="distroseries" |
1704 | /> |
1705 | - <browser:url |
1706 | + <lp:url |
1707 | for="lp.soyuz.interfaces.queue.IPackageUploadLog" |
1708 | path_expression="string:+log/${id}" |
1709 | attribute_to_parent="package_upload" |
1710 | @@ -673,12 +673,12 @@ |
1711 | module="lp.soyuz.browser.queue" |
1712 | classes="PackageUploadNavigation" |
1713 | /> |
1714 | - <browser:url |
1715 | + <lp:url |
1716 | for="lp.soyuz.interfaces.archivedependency.IArchiveDependency" |
1717 | path_expression="string:+dependency/${dependency/id}" |
1718 | attribute_to_parent="parent" |
1719 | /> |
1720 | - <browser:url |
1721 | + <lp:url |
1722 | for="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageReleaseDownloadCount" |
1723 | path_expression="string:+binaryhits/${binary_package_release/name}/${binary_package_release/version}/${binary_package_release/build/distro_arch_series/architecturetag}/${day}/${country_code}" |
1724 | attribute_to_parent="archive" |
1725 | @@ -692,7 +692,7 @@ |
1726 | template="../templates/packagerelationship-list.pt" |
1727 | /> |
1728 | </browser:pages> |
1729 | - <browser:url |
1730 | + <lp:url |
1731 | for="lp.soyuz.interfaces.livefs.ILiveFS" |
1732 | path_expression="string:+livefs/${distro_series/distribution/name}/${distro_series/name}/${name}" |
1733 | attribute_to_parent="owner" |
1734 | @@ -747,12 +747,12 @@ |
1735 | factory="lp.soyuz.browser.livefs.LiveFSBreadcrumb" |
1736 | permission="zope.Public" |
1737 | /> |
1738 | - <browser:url |
1739 | + <lp:url |
1740 | for="lp.soyuz.interfaces.livefs.ILiveFSSet" |
1741 | path_expression="string:livefses" |
1742 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1743 | /> |
1744 | - <browser:url |
1745 | + <lp:url |
1746 | for="lp.soyuz.interfaces.livefsbuild.ILiveFSBuild" |
1747 | path_expression="string:+build/${id}" |
1748 | attribute_to_parent="livefs" |
1749 | diff --git a/lib/lp/soyuz/model/archive.py b/lib/lp/soyuz/model/archive.py |
1750 | index 3eb9387..32b23dd 100644 |
1751 | --- a/lib/lp/soyuz/model/archive.py |
1752 | +++ b/lib/lp/soyuz/model/archive.py |
1753 | @@ -364,7 +364,7 @@ class Archive(SQLBase): |
1754 | SQLBase._init(self, *args, **kw) |
1755 | |
1756 | # Provide the additional marker interface depending on what type |
1757 | - # of archive this is. See also the browser:url declarations in |
1758 | + # of archive this is. See also the lp:url declarations in |
1759 | # zcml/archive.zcml. |
1760 | if self.is_ppa: |
1761 | alsoProvides(self, IPPA) |
1762 | diff --git a/lib/lp/soyuz/model/archivepermission.py b/lib/lp/soyuz/model/archivepermission.py |
1763 | index 86ca48c..6697808 100644 |
1764 | --- a/lib/lp/soyuz/model/archivepermission.py |
1765 | +++ b/lib/lp/soyuz/model/archivepermission.py |
1766 | @@ -118,7 +118,7 @@ class ArchivePermission(StormBase): |
1767 | |
1768 | def __storm_loaded__(self): |
1769 | # Provide the additional marker interface depending on what type |
1770 | - # of archive this is. See also the browser:url declarations in |
1771 | + # of archive this is. See also the lp:url declarations in |
1772 | # zcml/archivepermission.zcml. |
1773 | if self.permission == ArchivePermissionType.UPLOAD: |
1774 | alsoProvides(self, IArchiveUploader) |
1775 | diff --git a/lib/lp/testopenid/browser/configure.zcml b/lib/lp/testopenid/browser/configure.zcml |
1776 | index 79f46c9..a1cc217 100644 |
1777 | --- a/lib/lp/testopenid/browser/configure.zcml |
1778 | +++ b/lib/lp/testopenid/browser/configure.zcml |
1779 | @@ -5,6 +5,7 @@ |
1780 | <configure |
1781 | xmlns="http://namespaces.zope.org/zope" |
1782 | xmlns:browser="http://namespaces.zope.org/browser" |
1783 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1784 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1785 | i18n_domain="launchpad"> |
1786 | |
1787 | @@ -43,7 +44,7 @@ |
1788 | name="+auth" |
1789 | /> |
1790 | |
1791 | - <browser:url |
1792 | + <lp:url |
1793 | for="..interfaces.server.ITestOpenIDPersistentIdentity" |
1794 | path_expression="string:${openid_identifier}" |
1795 | parent_utility="..interfaces.server.ITestOpenIDApplication" |
1796 | diff --git a/lib/lp/translations/browser/configure.zcml b/lib/lp/translations/browser/configure.zcml |
1797 | index 61fcbc1..a96acd0 100644 |
1798 | --- a/lib/lp/translations/browser/configure.zcml |
1799 | +++ b/lib/lp/translations/browser/configure.zcml |
1800 | @@ -6,10 +6,10 @@ |
1801 | xmlns="http://namespaces.zope.org/zope" |
1802 | xmlns:browser="http://namespaces.zope.org/browser" |
1803 | xmlns:i18n="http://namespaces.zope.org/i18n" |
1804 | - xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc" |
1805 | + xmlns:lp="http://namespaces.canonical.com/lp" |
1806 | i18n_domain="launchpad"> |
1807 | <facet facet="translations"> |
1808 | - <browser:url |
1809 | + <lp:url |
1810 | for="lp.translations.interfaces.translations.IRosettaApplication" |
1811 | path_expression="string:translations" |
1812 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
1813 | @@ -68,7 +68,7 @@ |
1814 | <browser:defaultView |
1815 | for="lp.translations.interfaces.translator.ITranslator" |
1816 | name="+admin"/> |
1817 | - <browser:url |
1818 | + <lp:url |
1819 | for="lp.translations.interfaces.translator.ITranslator" |
1820 | path_expression="string:${language/code}" |
1821 | attribute_to_parent="translationgroup" |
1822 | @@ -99,7 +99,7 @@ |
1823 | <browser:defaultView |
1824 | for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry" |
1825 | name="+index"/> |
1826 | - <browser:url |
1827 | + <lp:url |
1828 | for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry" |
1829 | path_expression="string:${id}" |
1830 | parent_utility="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"/> |
1831 | @@ -115,7 +115,7 @@ |
1832 | name="+portlet-details" |
1833 | class="lp.translations.browser.translationimportqueue.TranslationImportQueueEntryView" |
1834 | template="../templates/translationimportqueueentry-portlet-details.pt"/> |
1835 | - <browser:url |
1836 | + <lp:url |
1837 | for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue" |
1838 | path_expression="string:+imports" |
1839 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"/> |
1840 | @@ -128,7 +128,7 @@ |
1841 | class="lp.translations.browser.translationimportqueue.TranslationImportQueueView" |
1842 | permission="zope.Public" |
1843 | template="../templates/translationimportqueue-index.pt"/> |
1844 | - <browser:url |
1845 | + <lp:url |
1846 | for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage" |
1847 | path_expression="string:+lang/${language/code}" |
1848 | attribute_to_parent="distroseries" |
1849 | @@ -156,7 +156,7 @@ |
1850 | module="lp.translations.browser.pofile" |
1851 | classes=" |
1852 | POFileNavigation"/> |
1853 | - <browser:url |
1854 | + <lp:url |
1855 | for="lp.translations.interfaces.pofile.IPOFile" |
1856 | path_expression="language/code" |
1857 | attribute_to_parent="potemplate" |
1858 | @@ -215,7 +215,7 @@ |
1859 | permission="zope.Public" |
1860 | template="../templates/pofile-filter.pt" |
1861 | class="lp.translations.browser.pofile.POFileFilteredView"/> |
1862 | - <browser:url |
1863 | + <lp:url |
1864 | for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage" |
1865 | path_expression="string:+lang/${language/code}" |
1866 | attribute_to_parent="parent" |
1867 | @@ -252,7 +252,7 @@ |
1868 | classes=" |
1869 | LanguageSetContextMenu |
1870 | LanguageNavigationMenu"/> |
1871 | - <browser:url |
1872 | + <lp:url |
1873 | for="lp.services.worlddata.interfaces.language.ILanguage" |
1874 | path_expression="code" |
1875 | parent_utility="lp.services.worlddata.interfaces.language.ILanguageSet" |
1876 | @@ -283,7 +283,7 @@ |
1877 | <browser:defaultView |
1878 | for="lp.services.worlddata.interfaces.language.ILanguageSet" |
1879 | name="+index"/> |
1880 | - <browser:url |
1881 | + <lp:url |
1882 | for="lp.services.worlddata.interfaces.language.ILanguageSet" |
1883 | path_expression="string:+languages" |
1884 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1885 | @@ -362,10 +362,10 @@ |
1886 | <browser:menus |
1887 | module="lp.translations.browser.potemplate" |
1888 | classes="POTemplateMenu"/> |
1889 | - <browser:url |
1890 | + <lp:url |
1891 | for="lp.translations.interfaces.potemplate.IPOTemplateSubset" |
1892 | urldata="lp.translations.browser.potemplate.POTemplateSubsetURL"/> |
1893 | - <browser:url |
1894 | + <lp:url |
1895 | for="lp.translations.interfaces.potemplate.IPOTemplate" |
1896 | urldata="lp.translations.browser.potemplate.POTemplateURL"/> |
1897 | <browser:defaultView |
1898 | @@ -385,7 +385,7 @@ |
1899 | <browser:defaultView |
1900 | for="lp.translations.interfaces.translationgroup.ITranslationGroup" |
1901 | name="+index"/> |
1902 | - <browser:url |
1903 | + <lp:url |
1904 | for="lp.translations.interfaces.translationgroup.ITranslationGroup" |
1905 | path_expression="name" |
1906 | rootsite="translations" |
1907 | @@ -427,7 +427,7 @@ |
1908 | permission="launchpad.Edit" |
1909 | name="+object-reassignment" |
1910 | template="../../app/templates/object-reassignment.pt"/> |
1911 | - <browser:url |
1912 | + <lp:url |
1913 | for="lp.translations.interfaces.translationgroup.ITranslationGroupSet" |
1914 | path_expression="string:+groups" |
1915 | parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" |
1916 | @@ -447,7 +447,7 @@ |
1917 | permission="zope.Public" |
1918 | template="../templates/translationgroups-index.pt" |
1919 | name="+index"/> |
1920 | - <browser:url |
1921 | + <lp:url |
1922 | for="lp.translations.interfaces.translationmessage.ITranslationMessage" |
1923 | path_expression="string:${sequence}" |
1924 | attribute_to_parent="browser_pofile" |
1925 | @@ -845,7 +845,7 @@ |
1926 | <browser:defaultView |
1927 | for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode" |
1928 | name="+index"/> |
1929 | - <browser:url |
1930 | + <lp:url |
1931 | for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode" |
1932 | path_expression="string:+customcode/${language_code}" |
1933 | attribute_to_parent="translation_target" |
1934 | @@ -884,7 +884,7 @@ |
1935 | <browser:defaultView |
1936 | for="lp.translations.interfaces.translationtemplatesbuild.ITranslationTemplatesBuild" |
1937 | name="+index"/> |
1938 | - <browser:url |
1939 | + <lp:url |
1940 | for="lp.translations.interfaces.translationtemplatesbuild.ITranslationTemplatesBuild" |
1941 | path_expression="string:+translation-templates-build/${id}" |
1942 | attribute_to_parent="branch"/> |
Self-approving mechanical change in line with previous work.