launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #29638
[Merge] ~cjwatson/launchpad:zcml-namespaces-securedutility into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:zcml-namespaces-securedutility into launchpad:master.
Commit message:
Move ZCML securedutility directive to lp namespace
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/436846
As with commit 57196c1d6a220f00039e027768cc05368135f556, it makes sense to move our local `securedutility` directive to our own namespace rather than poking it into the Zope namespace, even though it's a bit like the Zope `utility` directive. This is a big patch, but it's mostly mechanical.
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:zcml-namespaces-securedutility into launchpad:master.
diff --git a/lib/lp/answers/configure.zcml b/lib/lp/answers/configure.zcml
index d84083d..1794131 100644
--- a/lib/lp/answers/configure.zcml
+++ b/lib/lp/answers/configure.zcml
@@ -76,11 +76,11 @@
<allow interface=".interfaces.questionjob.IQuestionEmailJob"/>
</class>
- <securedutility
+ <lp:securedutility
component=".model.questionjob.QuestionEmailJob"
provides=".interfaces.questionjob.IQuestionEmailJobSource">
<allow interface=".interfaces.questionjob.IQuestionEmailJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- QuestionSubscription -->
<class class=".model.questionsubscription.QuestionSubscription">
@@ -185,21 +185,21 @@
factory=".adapters.sourcepackage_to_faqtarget"
/>
- <securedutility
+ <lp:securedutility
name="UsesAnswersDistribution"
component=".vocabulary.UsesAnswersDistributionVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="UsesAnswersProduct"
component=".vocabulary.UsesAnswersProductVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".vocabulary.UsesAnswersProductVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
@@ -209,12 +209,12 @@
<allow interface=".interfaces.questioncollection.IQuestionSet" />
</class>
- <securedutility
+ <lp:securedutility
class=".model.question.QuestionSet"
provides=".interfaces.questioncollection.IQuestionSet"
>
<allow interface=".interfaces.questioncollection.IQuestionSet" />
- </securedutility>
+ </lp:securedutility>
<class class=".model.faq.FAQ">
@@ -253,20 +253,20 @@
/>
<!-- IFAQSet -->
- <securedutility
+ <lp:securedutility
class=".model.faq.FAQSet"
provides=".interfaces.faq.IFAQSet"
>
<allow interface=".interfaces.faq.IFAQSet" />
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="FAQ"
component=".vocabulary.FAQVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".vocabulary.FAQVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/app/configure.zcml b/lib/lp/app/configure.zcml
index 6630f1f..69449b3 100644
--- a/lib/lp/app/configure.zcml
+++ b/lib/lp/app/configure.zcml
@@ -6,6 +6,7 @@
xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
+ xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:webservice="http://namespaces.canonical.com/webservice";
i18n_domain="launchpad">
<include package=".browser"/>
@@ -61,7 +62,7 @@
<!-- Services Infrastructure -->
<include
package="lp.registry.services"/>
- <securedutility
+ <lp:securedutility
class="lp.app.services.ServiceFactory"
provides="lp.app.interfaces.services.IServiceFactory">
<allow
@@ -70,15 +71,15 @@
interface="zope.publisher.interfaces.IPublishTraverse"/>
<allow
interface="zope.publisher.interfaces.browser.IBrowserPublisher"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.services.webservice.services.ServicesLink"
provides="lp.services.webservice.services.IServicesLink">
<allow
interface="lazr.restful.interfaces.ITopLevelEntryLink"/>
<allow
interface="lp.services.webapp.interfaces.ICanonicalUrlData"/>
- </securedutility>
+ </lp:securedutility>
<webservice:register module="lp.app.errors" />
diff --git a/lib/lp/archivepublisher/configure.zcml b/lib/lp/archivepublisher/configure.zcml
index 2b386e7..e2914ad 100644
--- a/lib/lp/archivepublisher/configure.zcml
+++ b/lib/lp/archivepublisher/configure.zcml
@@ -24,12 +24,12 @@
/>
<!-- PublisherConfig -->
- <securedutility
+ <lp:securedutility
class="lp.archivepublisher.model.publisherconfig.PublisherConfigSet"
provides="lp.archivepublisher.interfaces.publisherconfig.IPublisherConfigSet">
<allow
interface="lp.archivepublisher.interfaces.publisherconfig.IPublisherConfigSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.archivepublisher.model.publisherconfig.PublisherConfig">
@@ -47,61 +47,61 @@
marker in the codebase and make sure the same changes are made
everywhere which needs them.
-->
- <securedutility
+ <lp:securedutility
class="lp.archivepublisher.debian_installer.DebianInstallerUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="DEBIAN_INSTALLER">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.rosetta_translations.RosettaTranslationsUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="ROSETTA_TRANSLATIONS">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.dist_upgrader.DistUpgraderUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="DIST_UPGRADER">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.ddtp_tarball.DdtpTarballUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="DDTP_TARBALL">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.static_translations.StaticTranslationsUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="STATIC_TRANSLATIONS">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.meta_data.MetaDataUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="META_DATA">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.signing.UefiUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="UEFI">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.archivepublisher.signing.SigningUpload"
provides="lp.soyuz.interfaces.queue.ICustomUploadHandler"
name="SIGNING">
<allow
interface="lp.soyuz.interfaces.queue.ICustomUploadHandler"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/blueprints/configure.zcml b/lib/lp/blueprints/configure.zcml
index 8b482eb..a3641a0 100644
--- a/lib/lp/blueprints/configure.zcml
+++ b/lib/lp/blueprints/configure.zcml
@@ -75,11 +75,11 @@
class="lp.blueprints.model.sprint.SprintSet">
<allow interface="lp.blueprints.interfaces.sprint.ISprintSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.blueprints.model.sprint.SprintSet"
provides="lp.blueprints.interfaces.sprint.ISprintSet">
<allow interface="lp.blueprints.interfaces.sprint.ISprintSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SprintSpecification -->
@@ -100,11 +100,11 @@
<!-- SpecificationWorkItemSet -->
- <securedutility
+ <lp:securedutility
class="lp.blueprints.model.specificationworkitem.SpecificationWorkItemSet"
provides="lp.blueprints.interfaces.specificationworkitem.ISpecificationWorkItemSet">
<allow interface="lp.blueprints.interfaces.specificationworkitem.ISpecificationWorkItemSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SpecificationDependency -->
@@ -161,11 +161,11 @@
<!-- SpecificationBranchSet -->
- <securedutility
+ <lp:securedutility
class="lp.blueprints.model.specificationbranch.SpecificationBranchSet"
provides="lp.blueprints.interfaces.specificationbranch.ISpecificationBranchSet">
<allow interface="lp.blueprints.interfaces.specificationbranch.ISpecificationBranchSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Specification -->
@@ -231,11 +231,11 @@
<allow interface="lp.blueprints.interfaces.specification.ISpecificationSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.blueprints.model.specification.SpecificationSet"
provides="lp.blueprints.interfaces.specification.ISpecificationSet">
<allow interface="lp.blueprints.interfaces.specification.ISpecificationSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SpecificationDelta -->
@@ -255,11 +255,11 @@
<allow interface="lp.blueprints.interfaces.specificationmessage.ISpecificationMessageSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.blueprints.model.specificationmessage.SpecificationMessageSet"
provides="lp.blueprints.interfaces.specificationmessage.ISpecificationMessageSet">
<allow interface="lp.blueprints.interfaces.specificationmessage.ISpecificationMessageSet"/>
- </securedutility>
+ </lp:securedutility>
<webservice:register module="lp.blueprints.interfaces.webservice" />
diff --git a/lib/lp/blueprints/vocabularies/configure.zcml b/lib/lp/blueprints/vocabularies/configure.zcml
index a00c1d2..86985e0 100644
--- a/lib/lp/blueprints/vocabularies/configure.zcml
+++ b/lib/lp/blueprints/vocabularies/configure.zcml
@@ -2,59 +2,61 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="SpecificationDepCandidates"
component=".specificationdependency.SpecificationDepCandidatesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".specificationdependency.SpecificationDepCandidatesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="Specification"
component=".specification.SpecificationVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".specification.SpecificationVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="SpecificationDependencies"
component=".specificationdependency.SpecificationDependenciesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".specificationdependency.SpecificationDependenciesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="Sprint"
component=".sprint.SprintVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="FutureSprint"
component=".sprint.FutureSprintVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".sprint.FutureSprintVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/bugs/configure.zcml b/lib/lp/bugs/configure.zcml
index 0ce6cba..fe55acc 100644
--- a/lib/lp/bugs/configure.zcml
+++ b/lib/lp/bugs/configure.zcml
@@ -35,12 +35,12 @@
<allow
interface="lp.bugs.interfaces.bugactivity.IBugActivity"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugactivity.BugActivitySet"
provides="lp.bugs.interfaces.bugactivity.IBugActivitySet">
<allow
interface="lp.bugs.interfaces.bugactivity.IBugActivitySet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Macros -->
@@ -115,12 +115,12 @@
<subscriber
for="lp.bugs.interfaces.bug.IBug lazr.lifecycle.interfaces.IObjectModifiedEvent"
handler="lp.bugs.subscribers.bug.notify_bug_modified"/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.MaloneApplication"
provides="lp.bugs.interfaces.malone.IMaloneApplication">
<allow
interface="lp.bugs.interfaces.malone.IMaloneApplication"/>
- </securedutility>
+ </lp:securedutility>
<!-- pages for the malone application -->
@@ -324,12 +324,12 @@
<allow
interface="lp.bugs.interfaces.bugtask.IBugTaskSet"/>
</class>
- <securedutility
+ <lp:securedutility
provides="lp.bugs.interfaces.bugtask.IBugTaskSet"
class="lp.bugs.model.bugtask.BugTaskSet">
<allow
interface="lp.bugs.interfaces.bugtask.IBugTaskSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BugTaskDelta -->
@@ -356,12 +356,12 @@
<allow
interface="lp.bugs.interfaces.bugattachment.IBugAttachmentSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugattachment.BugAttachmentSet"
provides="lp.bugs.interfaces.bugattachment.IBugAttachmentSet">
<allow
interface="lp.bugs.interfaces.bugattachment.IBugAttachmentSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BugTracker -->
@@ -438,13 +438,13 @@
interface="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
attributes="__len__"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugtracker.BugTrackerSet"
provides="lp.bugs.interfaces.bugtracker.IBugTrackerSet">
<allow
interface="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
attributes="__len__"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.IBreadcrumb"
for="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
@@ -469,12 +469,12 @@
<allow
interface="lp.bugs.interfaces.bugtracker.IBugTrackerAliasSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugtracker.BugTrackerAliasSet"
provides="lp.bugs.interfaces.bugtracker.IBugTrackerAliasSet">
<allow
interface="lp.bugs.interfaces.bugtracker.IBugTrackerAliasSet"/>
- </securedutility>
+ </lp:securedutility>
<!--BugTrackerComponent -->
@@ -554,12 +554,12 @@
<allow
interface="lp.bugs.interfaces.bugbranch.IBugBranchSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugbranch.BugBranchSet"
provides="lp.bugs.interfaces.bugbranch.IBugBranchSet">
<allow
interface="lp.bugs.interfaces.bugbranch.IBugBranchSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- CVE -->
@@ -590,12 +590,12 @@
<allow
interface="lp.bugs.interfaces.cve.ICveSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.cve.CveSet"
provides="lp.bugs.interfaces.cve.ICveSet">
<allow
interface="lp.bugs.interfaces.cve.ICveSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Vulnerability -->
<class class="lp.bugs.model.vulnerability.Vulnerability">
@@ -627,11 +627,11 @@
<class class="lp.bugs.model.vulnerability.VulnerabilitySet">
<allow interface="lp.bugs.interfaces.vulnerability.IVulnerabilitySet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.vulnerability.VulnerabilitySet"
provides="lp.bugs.interfaces.vulnerability.IVulnerabilitySet">
<allow interface="lp.bugs.interfaces.vulnerability.IVulnerabilitySet" />
- </securedutility>
+ </lp:securedutility>
<!-- VulnerabilityActivity -->
<class class="lp.bugs.model.vulnerability.VulnerabilityActivity">
@@ -642,11 +642,11 @@
<class class="lp.bugs.model.vulnerability.VulnerabilityActivitySet">
<allow interface="lp.bugs.interfaces.vulnerability.IVulnerabilityActivitySet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.vulnerability.VulnerabilityActivitySet"
provides="lp.bugs.interfaces.vulnerability.IVulnerabilityActivitySet">
<allow interface="lp.bugs.interfaces.vulnerability.IVulnerabilityActivitySet" />
- </securedutility>
+ </lp:securedutility>
<!-- BugSubscription -->
@@ -813,12 +813,12 @@
<allow
interface="lp.bugs.interfaces.bug.IBugSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bug.BugSet"
provides="lp.bugs.interfaces.bug.IBugSet">
<allow
interface="lp.bugs.interfaces.bug.IBugSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BugDelta -->
@@ -848,12 +848,12 @@
<allow
interface="lp.bugs.interfaces.bugmessage.IBugMessageSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugmessage.BugMessageSet"
provides="lp.bugs.interfaces.bugmessage.IBugMessageSet">
<allow
interface="lp.bugs.interfaces.bugmessage.IBugMessageSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.bugs.model.bugnomination.BugNomination">
<require
@@ -884,12 +884,12 @@
attributes="
destroySelf"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugnomination.BugNominationSet"
provides="lp.bugs.interfaces.bugnomination.IBugNominationSet">
<allow
interface="lp.bugs.interfaces.bugnomination.IBugNominationSet"/>
- </securedutility>
+ </lp:securedutility>
<subscriber
for="lp.bugs.interfaces.bug.IBug zope.lifecycleevent.interfaces.IObjectCreatedEvent"
handler="lp.bugs.subscribers.bugactivity.record_bug_added"/>
@@ -982,12 +982,12 @@
<allow
interface="lp.bugs.interfaces.bugwatch.IBugWatchSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.bugs.model.bugwatch.BugWatchSet"
provides="lp.bugs.interfaces.bugwatch.IBugWatchSet">
<allow
interface="lp.bugs.interfaces.bugwatch.IBugWatchSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BugWatchActivity -->
<class
@@ -1041,24 +1041,24 @@
<allow
attributes="subscription_filters addFilter"/>
</class>
- <securedutility
+ <lp:securedutility
provides="lp.bugs.interfaces.bugnotification.IBugNotificationSet"
class="lp.bugs.model.bugnotification.BugNotificationSet">
<allow
interface="lp.bugs.interfaces.bugnotification.IBugNotificationSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ProcessApportBlobJobs -->
<class class="lp.bugs.model.apportjob.ProcessApportBlobJob">
<allow interface="lp.bugs.interfaces.apportjob.IApportJob" />
<allow interface="lp.bugs.interfaces.apportjob.IProcessApportBlobJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.bugs.model.apportjob.ProcessApportBlobJob"
provides="lp.bugs.interfaces.apportjob.IProcessApportBlobJobSource">
<allow
interface="lp.bugs.interfaces.apportjob.IProcessApportBlobJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- FileBugData -->
<class class="lp.bugs.model.bug.FileBugData">
@@ -1106,11 +1106,11 @@
<webservice:register module="lp.bugs.errors" />
<webservice:register module="lp.bugs.interfaces.webservice" />
- <securedutility
+ <lp:securedutility
name="UsesBugsDistribution"
component="lp.bugs.vocabularies.UsesBugsDistributionVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/bugs/vocabularies.zcml b/lib/lp/bugs/vocabularies.zcml
index 10f9f0d..a8a584d 100644
--- a/lib/lp/bugs/vocabularies.zcml
+++ b/lib/lp/bugs/vocabularies.zcml
@@ -2,28 +2,30 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="Bug"
component="lp.bugs.vocabularies.BugVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.BugVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="BugNominatableSeries"
component="lp.bugs.vocabularies.BugNominatableSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.BugNominatableProductSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
@@ -34,73 +36,73 @@
</class>
- <securedutility
+ <lp:securedutility
name="BugTracker"
component="lp.bugs.vocabularies.BugTrackerVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.BugTrackerVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="WebBugTracker"
component="lp.bugs.vocabularies.WebBugTrackerVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.WebBugTrackerVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="BugWatch"
component="lp.bugs.vocabularies.BugWatchVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.BugWatchVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistributionUsingMalone"
component="lp.bugs.vocabularies.DistributionUsingMaloneVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.DistributionUsingMaloneVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ProjectProductsUsingMalone"
component="lp.bugs.vocabularies.project_products_using_malone_vocabulary_factory"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="BugTaskMilestone"
component="lp.bugs.vocabularies.BugTaskMilestoneVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.bugs.vocabularies.BugTaskMilestoneVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/buildmaster/configure.zcml b/lib/lp/buildmaster/configure.zcml
index d8a80ce..c1e76ab 100644
--- a/lib/lp/buildmaster/configure.zcml
+++ b/lib/lp/buildmaster/configure.zcml
@@ -25,12 +25,12 @@
</class>
<!-- ProcessorSet -->
- <securedutility
+ <lp:securedutility
class="lp.buildmaster.model.processor.ProcessorSet"
provides="lp.buildmaster.interfaces.processor.IProcessorSet">
<allow
interface="lp.buildmaster.interfaces.processor.IProcessorSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Builder -->
<class
@@ -49,7 +49,7 @@
<!-- BuilderSet -->
- <securedutility
+ <lp:securedutility
class="lp.buildmaster.model.builder.BuilderSet"
provides="lp.buildmaster.interfaces.builder.IBuilderSet">
<allow
@@ -57,7 +57,7 @@
<require
permission="launchpad.Admin"
interface="lp.buildmaster.interfaces.builder.IBuilderSetAdmin"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.IBreadcrumb"
for="lp.buildmaster.interfaces.builder.IBuilder"
@@ -76,19 +76,19 @@
<allow
interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobDB" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.buildmaster.model.buildfarmjob.BuildFarmJob"
provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobSource">
<allow
interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobSource" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.buildmaster.model.buildfarmjob.BuildFarmJobSet"
provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobSet">
<allow
interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobSet" />
- </securedutility>
+ </lp:securedutility>
<!-- BuildQueue -->
<class
@@ -106,12 +106,12 @@
<!-- BuildQueueSet -->
- <securedutility
+ <lp:securedutility
class="lp.buildmaster.model.buildqueue.BuildQueueSet"
provides="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet">
<allow
interface="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet"/>
- </securedutility>
+ </lp:securedutility>
<webservice:register module="lp.buildmaster.interfaces.webservice" />
diff --git a/lib/lp/buildmaster/vocabularies.zcml b/lib/lp/buildmaster/vocabularies.zcml
index ba5f97f..41e8b74 100644
--- a/lib/lp/buildmaster/vocabularies.zcml
+++ b/lib/lp/buildmaster/vocabularies.zcml
@@ -2,27 +2,29 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="Processor"
component="lp.buildmaster.vocabularies.ProcessorVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.buildmaster.vocabularies.ProcessorVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="BuilderResource"
component="lp.buildmaster.vocabularies.BuilderResourceVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.buildmaster.vocabularies.BuilderResourceVocabulary">
<allow interface="lp.services.webapp.vocabulary.IVocabularyTokenized"/>
diff --git a/lib/lp/charms/configure.zcml b/lib/lp/charms/configure.zcml
index bb598ba..fe115ad 100644
--- a/lib/lp/charms/configure.zcml
+++ b/lib/lp/charms/configure.zcml
@@ -37,11 +37,11 @@
handler="lp.charms.model.charmrecipe.charm_recipe_modified" />
<!-- CharmRecipeSet -->
- <securedutility
+ <lp:securedutility
class="lp.charms.model.charmrecipe.CharmRecipeSet"
provides="lp.charms.interfaces.charmrecipe.ICharmRecipeSet">
<allow interface="lp.charms.interfaces.charmrecipe.ICharmRecipeSet" />
- </securedutility>
+ </lp:securedutility>
<!-- CharmRecipeBuildRequest -->
<class class="lp.charms.model.charmrecipe.CharmRecipeBuildRequest">
@@ -51,12 +51,12 @@
</class>
<!-- CharmhubSecretsEncryptedContainer -->
- <securedutility
+ <lp:securedutility
class="lp.charms.model.charmrecipe.CharmhubSecretsEncryptedContainer"
provides="lp.services.crypto.interfaces.IEncryptedContainer"
name="charmhub-secrets">
<allow interface="lp.services.crypto.interfaces.IEncryptedContainer" />
- </securedutility>
+ </lp:securedutility>
<!-- CharmRecipeBuild -->
<class class="lp.charms.model.charmrecipebuild.CharmRecipeBuild">
@@ -80,17 +80,17 @@
handler="lp.charms.subscribers.charmrecipebuild.charm_recipe_build_modified" />
<!-- CharmRecipeBuildSet -->
- <securedutility
+ <lp:securedutility
class="lp.charms.model.charmrecipebuild.CharmRecipeBuildSet"
provides="lp.charms.interfaces.charmrecipebuild.ICharmRecipeBuildSet">
<allow interface="lp.charms.interfaces.charmrecipebuild.ICharmRecipeBuildSet" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.charms.model.charmrecipebuild.CharmRecipeBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="CHARMRECIPEBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- CharmFile -->
<class class="lp.charms.model.charmrecipebuild.CharmFile">
@@ -114,7 +114,7 @@
interface="lp.charms.interfaces.charmbase.ICharmBaseEdit"
set_schema="lp.charms.interfaces.charmbase.ICharmBaseEditableAttributes" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.charms.model.charmbase.CharmBaseSet"
provides="lp.charms.interfaces.charmbase.ICharmBaseSet">
<allow
@@ -122,24 +122,24 @@
<require
permission="launchpad.Edit"
interface="lp.charms.interfaces.charmbase.ICharmBaseSetEdit" />
- </securedutility>
+ </lp:securedutility>
<!-- Charmhub interaction -->
- <securedutility
+ <lp:securedutility
class="lp.charms.model.charmhubclient.CharmhubClient"
provides="lp.charms.interfaces.charmhubclient.ICharmhubClient">
<allow interface="lp.charms.interfaces.charmhubclient.ICharmhubClient" />
- </securedutility>
+ </lp:securedutility>
<!-- Charm-related jobs -->
<class class="lp.charms.model.charmrecipejob.CharmRecipeJob">
<allow interface="lp.charms.interfaces.charmrecipejob.ICharmRecipeJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.charms.model.charmrecipejob.CharmRecipeRequestBuildsJob"
provides="lp.charms.interfaces.charmrecipejob.ICharmRecipeRequestBuildsJobSource">
<allow interface="lp.charms.interfaces.charmrecipejob.ICharmRecipeRequestBuildsJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.charms.model.charmrecipejob.CharmRecipeRequestBuildsJob">
<allow interface="lp.charms.interfaces.charmrecipejob.ICharmRecipeJob" />
<allow interface="lp.charms.interfaces.charmrecipejob.ICharmRecipeRequestBuildsJob" />
@@ -147,11 +147,11 @@
<class class="lp.charms.model.charmrecipebuildjob.CharmRecipeBuildJob">
<allow interface="lp.charms.interfaces.charmrecipebuildjob.ICharmRecipeBuildJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.charms.model.charmrecipebuildjob.CharmhubUploadJob"
provides="lp.charms.interfaces.charmrecipebuildjob.ICharmhubUploadJobSource">
<allow interface="lp.charms.interfaces.charmrecipebuildjob.ICharmhubUploadJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.charms.model.charmrecipebuildjob.CharmhubUploadJob">
<allow interface="lp.charms.interfaces.charmrecipebuildjob.ICharmRecipeBuildJob" />
<allow interface="lp.charms.interfaces.charmrecipebuildjob.ICharmhubUploadJob" />
diff --git a/lib/lp/code/configure.zcml b/lib/lp/code/configure.zcml
index 75afc36..48bde56 100644
--- a/lib/lp/code/configure.zcml
+++ b/lib/lp/code/configure.zcml
@@ -63,11 +63,11 @@
<!-- CodeImportMachineSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportmachine.CodeImportMachineSet"
provides="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet">
<allow interface="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BranchRef -->
@@ -126,19 +126,19 @@
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
provides="lp.code.interfaces.branchcollection.IBranchCollection"
factory="lp.code.adapters.branchcollection.branch_collection_for_distro_source_package"/>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchcollection.GenericBranchCollection"
provides="lp.code.interfaces.branchcollection.IAllBranches">
<allow interface="lp.code.interfaces.branchcollection.IAllBranches"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.revisioncache.GenericRevisionCollection">
<allow interface="lp.code.interfaces.revisioncache.IRevisionCollection"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.revisioncache.GenericRevisionCollection"
provides="lp.code.interfaces.revisioncache.IRevisionCache">
<allow interface="lp.code.interfaces.revisioncache.IRevisionCache"/>
- </securedutility>
+ </lp:securedutility>
<adapter
for="lp.registry.interfaces.person.IPerson"
provides="lp.code.interfaces.revisioncache.IRevisionCache"
@@ -167,16 +167,16 @@
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
provides="lp.code.interfaces.revisioncache.IRevisionCache"
factory="lp.code.adapters.revisioncache.revision_cache_for_distro_source_package"/>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchpuller.BranchPuller"
provides="lp.code.interfaces.branchpuller.IBranchPuller">
<allow interface="lp.code.interfaces.branchpuller.IBranchPuller"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.systemhomes.BazaarApplication"
provides="lp.code.interfaces.codehosting.IBazaarApplication">
<allow interface="lp.code.interfaces.codehosting.IBazaarApplication"/>
- </securedutility>
+ </lp:securedutility>
<!-- pages for the bazaar application -->
@@ -213,17 +213,17 @@
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob"/>
<allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.MergeProposalNeedsReviewEmailJob"
provides="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.BranchMergeProposalJobSource"
provides="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.code.model.branchmergeproposaljob.GenerateIncrementalDiffJob">
@@ -234,41 +234,41 @@
<allow interface="lp.code.interfaces.branchmergeproposal.IUpdatePreviewDiffJob" />
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.UpdatePreviewDiffJob"
provides="lp.code.interfaces.branchmergeproposal.IUpdatePreviewDiffJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.IUpdatePreviewDiffJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchmergeproposaljob.CodeReviewCommentEmailJob">
<allow interface="lp.code.interfaces.branchmergeproposal.ICodeReviewCommentEmailJob" />
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.CodeReviewCommentEmailJob"
provides="lp.code.interfaces.branchmergeproposal.ICodeReviewCommentEmailJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.ICodeReviewCommentEmailJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchmergeproposaljob.ReviewRequestedEmailJob">
<allow interface="lp.code.interfaces.branchmergeproposal.IReviewRequestedEmailJob" />
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.ReviewRequestedEmailJob"
provides="lp.code.interfaces.branchmergeproposal.IReviewRequestedEmailJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.IReviewRequestedEmailJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchmergeproposaljob.MergeProposalUpdatedEmailJob">
<allow interface="lp.services.job.interfaces.job.IRunnableJob" />
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchmergeproposaljob.MergeProposalUpdatedEmailJob"
provides="lp.code.interfaces.branchmergeproposal.IMergeProposalUpdatedEmailJobSource">
<allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalUpdatedEmailJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- Branch Merge Proposal Subscribers -->
@@ -299,21 +299,21 @@
<!-- hierarchy -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchmergeproposal.BranchMergeProposalGetter"
provides="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalGetter">
<allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalGetter"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.code.model.seriessourcepackagebranch.SeriesSourcePackageBranch">
<allow interface="lp.code.interfaces.seriessourcepackagebranch.ISeriesSourcePackageBranch"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.seriessourcepackagebranch.SeriesSourcePackageBranchSet"
provides="lp.code.interfaces.seriessourcepackagebranch.IFindOfficialBranchLinks">
<allow interface="lp.code.interfaces.seriessourcepackagebranch.IFindOfficialBranchLinks"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportResult -->
@@ -323,24 +323,24 @@
<!-- CodeImportResultSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportresult.CodeImportResultSet"
provides="lp.code.interfaces.codeimportresult.ICodeImportResultSet">
<allow interface="lp.code.interfaces.codeimportresult.ICodeImportResultSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchlookup.BranchLookup">
<allow interface="lp.code.interfaces.branchlookup.IBranchLookup"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchlookup.BranchLookup"
provides="lp.code.interfaces.branchlookup.IBranchLookup">
<allow interface="lp.code.interfaces.branchlookup.IBranchLookup"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.code.model.branchlookup.LinkedBranchTraverser"
provides="lp.code.interfaces.branchlookup.ILinkedBranchTraverser">
<allow interface="lp.code.interfaces.branchlookup.ILinkedBranchTraverser"/>
- </securedutility>
+ </lp:securedutility>
<adapter factory="lp.code.model.branchlookup.ProductTraversable" />
<adapter factory="lp.code.model.branchlookup.DistributionTraversable" />
<adapter factory="lp.code.model.branchlookup.DistroSeriesTraversable" />
@@ -440,33 +440,33 @@
<class class="lp.code.model.branch.BranchSet">
<allow interface="lp.code.interfaces.branch.IBranchSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branch.BranchSet"
provides="lp.code.interfaces.branch.IBranchSet">
<allow interface="lp.code.interfaces.branch.IBranchSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BranchListingQueryOptimiser -->
<class class="lp.code.model.branchlistingqueryoptimiser.BranchListingQueryOptimiser">
<allow interface="lp.code.interfaces.branch.IBranchListingQueryOptimiser"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchlistingqueryoptimiser.BranchListingQueryOptimiser"
provides="lp.code.interfaces.branch.IBranchListingQueryOptimiser">
<allow interface="lp.code.interfaces.branch.IBranchListingQueryOptimiser"/>
- </securedutility>
+ </lp:securedutility>
<!-- BranchDelta -->
<class class="lp.code.adapters.branch.BranchDelta">
<allow interface="lp.code.interfaces.branch.IBranchDelta"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchcloud.BranchCloud"
provides="lp.code.interfaces.branch.IBranchCloud">
<allow interface="lp.code.interfaces.branch.IBranchCloud"/>
- </securedutility>
+ </lp:securedutility>
<subscriber
for="lp.code.interfaces.branch.IBranch
@@ -494,11 +494,11 @@
<allow interface="lp.code.interfaces.branchnamespace.IBranchNamespace"/>
<allow interface="lp.code.interfaces.branchnamespace.IBranchNamespacePolicy"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchnamespace.BranchNamespaceSet"
provides="lp.code.interfaces.branchnamespace.IBranchNamespaceSet">
<allow interface="lp.code.interfaces.branchnamespace.IBranchNamespaceSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchtarget.PackageBranchTarget">
<allow interface="lp.code.interfaces.branchtarget.IBranchTarget"/>
</class>
@@ -539,11 +539,11 @@
</class>
<!-- Branch hosting -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.branchhosting.BranchHostingClient"
provides="lp.code.interfaces.branchhosting.IBranchHostingClient">
<allow interface="lp.code.interfaces.branchhosting.IBranchHostingClient" />
- </securedutility>
+ </lp:securedutility>
<!-- CodeReviewComment -->
@@ -570,11 +570,11 @@
<!-- CodeReviewInlineCommentSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codereviewinlinecomment.CodeReviewInlineCommentSet"
provides="lp.code.interfaces.codereviewinlinecomment.ICodeReviewInlineCommentSet">
<allow interface="lp.code.interfaces.codereviewinlinecomment.ICodeReviewInlineCommentSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.codereviewinlinecomment.CodeReviewInlineCommentSet">
<allow interface="lp.code.interfaces.codereviewinlinecomment.ICodeReviewInlineCommentSet"/>
</class>
@@ -604,31 +604,31 @@
<allow interface="lp.code.interfaces.branchjob.IBranchModifiedMailJob"/>
<allow interface="lp.code.interfaces.branchjob.IBranchJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchjob.RevisionMailJob"
provides="lp.code.interfaces.branchjob.IRevisionMailJobSource">
<allow interface="lp.code.interfaces.branchjob.IRevisionMailJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.branchjob.RevisionsAddedJob"
provides="lp.code.interfaces.branchjob.IRevisionsAddedJobSource">
<allow interface="lp.code.interfaces.branchjob.IRevisionsAddedJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.branchjob.RosettaUploadJob"
provides="lp.code.interfaces.branchjob.IRosettaUploadJobSource">
<allow interface="lp.code.interfaces.branchjob.IRosettaUploadJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.branchjob.ReclaimBranchSpaceJob"
provides="lp.code.interfaces.branchjob.IReclaimBranchSpaceJobSource">
<allow interface="lp.code.interfaces.branchjob.IReclaimBranchSpaceJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.branchjob.BranchModifiedMailJob"
provides="lp.code.interfaces.branchjob.IBranchModifiedMailJobSource">
<allow interface="lp.code.interfaces.branchjob.IBranchModifiedMailJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImport -->
@@ -687,11 +687,11 @@
<!-- CodeImportSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimport.CodeImportSet"
provides="lp.code.interfaces.codeimport.ICodeImportSet">
<allow interface="lp.code.interfaces.codeimport.ICodeImportSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportJob -->
@@ -701,18 +701,18 @@
<!-- CodeImportJobSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportjob.CodeImportJobSet"
provides="lp.code.interfaces.codeimportjob.ICodeImportJobSet">
<require
permission="launchpad.View"
interface="lp.code.interfaces.codeimportjob.ICodeImportJobSet"/>
<allow interface="lp.code.interfaces.codeimportjob.ICodeImportJobSetPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportJobWorkflow -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportjob.CodeImportJobWorkflow"
provides="lp.code.interfaces.codeimportjob.ICodeImportJobWorkflow">
<require
@@ -736,16 +736,16 @@
<allow attributes="
startJob
reclaimJob"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportJobMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportjob.CodeImportJobMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="code-import-job">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportEvent -->
@@ -755,11 +755,11 @@
<!-- CodeImportEventSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.codeimportevent.CodeImportEventSet"
provides="lp.code.interfaces.codeimportevent.ICodeImportEventSet">
<allow interface="lp.code.interfaces.codeimportevent.ICodeImportEventSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeImportEventToken -->
@@ -788,27 +788,27 @@
<allow interface="lp.code.interfaces.revision.IRevisionSet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.revision.RevisionSet"
provides="lp.code.interfaces.revision.IRevisionSet" >
<allow interface="lp.code.interfaces.revision.IRevisionSet" />
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchjob.BranchUpgradeJob"
provides="lp.code.interfaces.branchjob.IBranchUpgradeJobSource">
<allow interface="lp.code.interfaces.branchjob.IBranchUpgradeJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchjob.BranchUpgradeJob">
<allow interface="lp.services.job.interfaces.job.IRunnableJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.branchjob.BranchScanJob"
provides="lp.code.interfaces.branchjob.IBranchScanJobSource">
<allow interface="lp.code.interfaces.branchjob.IBranchScanJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.branchjob.BranchScanJob">
<allow interface="lp.services.job.interfaces.job.IRunnableJob" />
<allow interface="lp.code.interfaces.branchjob.IBranchJob" />
@@ -867,20 +867,20 @@
<class class="lp.code.model.gitrepository.GitRepositorySet">
<allow interface="lp.code.interfaces.gitrepository.IGitRepositorySet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitrepository.GitRepositorySet"
provides="lp.code.interfaces.gitrepository.IGitRepositorySet">
<allow interface="lp.code.interfaces.gitrepository.IGitRepositorySet" />
- </securedutility>
+ </lp:securedutility>
<!-- GitRepositoryMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitrepository.GitRepositoryMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="git-repository">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic" />
- </securedutility>
+ </lp:securedutility>
<!-- GitRepositoryDelta -->
@@ -915,11 +915,11 @@
<allow interface="lp.code.interfaces.gitnamespace.IGitNamespace" />
<allow interface="lp.code.interfaces.gitnamespace.IGitNamespacePolicy" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitnamespace.GitNamespaceSet"
provides="lp.code.interfaces.gitnamespace.IGitNamespaceSet">
<allow interface="lp.code.interfaces.gitnamespace.IGitNamespaceSet" />
- </securedutility>
+ </lp:securedutility>
<!-- GitRef -->
@@ -955,11 +955,11 @@
permission="launchpad.Edit"
interface="lp.code.interfaces.gitref.IGitRefEdit" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.gitref.GitRefRemote"
provides="lp.code.interfaces.gitref.IGitRefRemoteSet">
<allow interface="lp.code.interfaces.gitref.IGitRefRemoteSet" />
- </securedutility>
+ </lp:securedutility>
<!-- RevisionStatusReport -->
@@ -981,19 +981,19 @@
<class class="lp.code.model.revisionstatus.RevisionStatusReportSet">
<allow interface="lp.code.interfaces.revisionstatus.IRevisionStatusReportSet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.revisionstatus.RevisionStatusReportSet"
provides="lp.code.interfaces.revisionstatus.IRevisionStatusReportSet">
<allow interface="lp.code.interfaces.revisionstatus.IRevisionStatusReportSet" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.revisionstatus.RevisionStatusArtifactSet">
<allow interface="lp.code.interfaces.revisionstatus.IRevisionStatusArtifactSet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.revisionstatus.RevisionStatusArtifactSet"
provides="lp.code.interfaces.revisionstatus.IRevisionStatusArtifactSet">
<allow interface="lp.code.interfaces.revisionstatus.IRevisionStatusArtifactSet" />
- </securedutility>
+ </lp:securedutility>
<!-- Git repository access rules -->
@@ -1041,11 +1041,11 @@
permission="launchpad.View"
interface="lp.code.interfaces.gitactivity.IGitActivity" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitactivity.GitActivitySet"
provides="lp.code.interfaces.gitactivity.IGitActivitySet">
<allow interface="lp.code.interfaces.gitactivity.IGitActivitySet" />
- </securedutility>
+ </lp:securedutility>
<!-- GitCollection -->
@@ -1098,11 +1098,11 @@
for="lp.registry.interfaces.personociproject.IPersonOCIProject"
provides="lp.code.interfaces.gitcollection.IGitCollection"
factory="lp.code.adapters.gitcollection.git_collection_for_person_oci_project"/>
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitcollection.GenericGitCollection"
provides="lp.code.interfaces.gitcollection.IAllGitRepositories">
<allow interface="lp.code.interfaces.gitcollection.IAllGitRepositories"/>
- </securedutility>
+ </lp:securedutility>
<!-- Default Git repositories -->
@@ -1116,16 +1116,16 @@
<class class="lp.code.model.gitlookup.GitLookup">
<allow interface="lp.code.interfaces.gitlookup.IGitLookup" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.code.model.gitlookup.GitLookup"
provides="lp.code.interfaces.gitlookup.IGitLookup">
<allow interface="lp.code.interfaces.gitlookup.IGitLookup" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.code.model.gitlookup.GitTraverser"
provides="lp.code.interfaces.gitlookup.IGitTraverser">
<allow interface="lp.code.interfaces.gitlookup.IGitTraverser" />
- </securedutility>
+ </lp:securedutility>
<adapter factory="lp.code.model.gitlookup.PersonGitTraversable" />
<adapter factory="lp.code.model.gitlookup.ProjectGitTraversable" />
<adapter factory="lp.code.model.gitlookup.DistributionGitTraversable" />
@@ -1133,31 +1133,31 @@
<adapter factory="lp.code.model.gitlookup.DistributionOCIProjectGitTraversable" />
<!-- Git hosting -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.githosting.GitHostingClient"
provides="lp.code.interfaces.githosting.IGitHostingClient">
<allow interface="lp.code.interfaces.githosting.IGitHostingClient" />
- </securedutility>
+ </lp:securedutility>
<!-- Git-related jobs -->
<class class="lp.code.model.gitjob.GitJob">
<allow interface="lp.code.interfaces.gitjob.IGitJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.gitjob.GitRefScanJob"
provides="lp.code.interfaces.gitjob.IGitRefScanJobSource">
<allow interface="lp.code.interfaces.gitjob.IGitRefScanJobSource" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.gitjob.ReclaimGitRepositorySpaceJob"
provides="lp.code.interfaces.gitjob.IReclaimGitRepositorySpaceJobSource">
<allow interface="lp.code.interfaces.gitjob.IReclaimGitRepositorySpaceJobSource" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.code.model.gitjob.GitRepositoryModifiedMailJob"
provides="lp.code.interfaces.gitjob.IGitRepositoryModifiedMailJobSource">
<allow interface="lp.code.interfaces.gitjob.IGitRepositoryModifiedMailJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.code.model.gitjob.GitRefScanJob">
<allow interface="lp.code.interfaces.gitjob.IGitJob" />
<allow interface="lp.code.interfaces.gitjob.IGitRefScanJob" />
@@ -1189,12 +1189,12 @@
<!-- SourcePackageRecipe -->
- <securedutility
+ <lp:securedutility
component="lp.code.model.sourcepackagerecipe.SourcePackageRecipe"
provides="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource">
<allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild">
@@ -1209,18 +1209,18 @@
interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildAdmin"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource">
<allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="RECIPEBRANCHBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"/>
- </securedutility>
+ </lp:securedutility>
<adapter factory="lp.code.model.recipebuilder.RecipeBuildBehaviour"
permission="zope.Public" />
@@ -1235,11 +1235,11 @@
component="lp.code.model.sourcepackagerecipedata.SourcePackageRecipeData"
provides="lp.code.interfaces.sourcepackagerecipe.IRecipeBranchSource">
</utility>
- <securedutility
+ <lp:securedutility
component="lp.code.model.sourcepackagerecipedata.SourcePackageRecipeData"
provides="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeDataSource">
<allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeDataSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- SourcePackageRecipe -->
<class
class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe">
@@ -1299,25 +1299,25 @@
</class>
<!-- CIBuildSet -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.cibuild.CIBuildSet"
provides="lp.code.interfaces.cibuild.ICIBuildSet">
<allow interface="lp.code.interfaces.cibuild.ICIBuildSet" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.code.model.cibuild.CIBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="CIBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- CIBuildMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.code.model.cibuild.CIBuildMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="ci-build">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic" />
- </securedutility>
+ </lp:securedutility>
<!-- CIBuildBehaviour -->
<adapter
diff --git a/lib/lp/code/vocabularies/configure.zcml b/lib/lp/code/vocabularies/configure.zcml
index ef0933d..61a4faf 100644
--- a/lib/lp/code/vocabularies/configure.zcml
+++ b/lib/lp/code/vocabularies/configure.zcml
@@ -2,110 +2,112 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="BuildableDistroSeries"
component=".sourcepackagerecipe.BuildableDistroSeries"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".sourcepackagerecipe.BuildableDistroSeries">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TargetPPAs"
component=".sourcepackagerecipe.target_ppas_vocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="Branch"
component=".branch.BranchVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".branch.BranchVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="HostedBranchRestrictedOnOwner"
component=".branch.HostedBranchRestrictedOnOwnerVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".branch.HostedBranchRestrictedOnOwnerVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="BranchRestrictedOnProduct"
component=".branch.BranchRestrictedOnProductVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".branch.BranchRestrictedOnProductVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="GitRepository"
component=".gitrepository.GitRepositoryVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".gitrepository.GitRepositoryVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="GitRepositoryRestrictedOnProduct"
component=".gitrepository.GitRepositoryRestrictedOnProductVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".gitrepository.GitRepositoryRestrictedOnProductVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="GitPermissions"
component=".gitrule.GitPermissionsVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".gitrule.GitPermissionsVocabulary">
<allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
</class>
- <securedutility
+ <lp:securedutility
name="GitRef"
component=".gitref.GitRefVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".gitref.GitRefVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
<allow interface=".gitref.IRepositoryManagerGitRefVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="GitBranch"
component=".gitref.GitBranchVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".gitref.GitBranchVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/oci/configure.zcml b/lib/lp/oci/configure.zcml
index 6ec946e..4921c2c 100644
--- a/lib/lp/oci/configure.zcml
+++ b/lib/lp/oci/configure.zcml
@@ -35,12 +35,12 @@
zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.oci.model.ocirecipe.oci_recipe_modified" />
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ocirecipe.OCIRecipeSet"
provides="lp.oci.interfaces.ocirecipe.IOCIRecipeSet">
<allow
interface="lp.oci.interfaces.ocirecipe.IOCIRecipeSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIRecipeSubscription -->
@@ -63,11 +63,11 @@
<allow interface="lp.oci.interfaces.ocirecipejob.IOCIRecipeRequestBuildsJob" />
<allow interface="lp.oci.interfaces.ocirecipejob.IOCIRecipeJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.oci.model.ocirecipejob.OCIRecipeRequestBuildsJob"
provides="lp.oci.interfaces.ocirecipejob.IOCIRecipeRequestBuildsJobSource">
<allow interface="lp.oci.interfaces.ocirecipejob.IOCIRecipeRequestBuildsJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- OCIRecipeBuild -->
<class class="lp.oci.model.ocirecipebuild.OCIRecipeBuild">
@@ -91,17 +91,17 @@
handler="lp.oci.subscribers.ocirecipebuild.oci_recipe_build_modified" />
<!-- OCIRecipeBuildSet -->
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ocirecipebuild.OCIRecipeBuildSet"
provides="lp.oci.interfaces.ocirecipebuild.IOCIRecipeBuildSet">
<allow interface="lp.oci.interfaces.ocirecipebuild.IOCIRecipeBuildSet" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.oci.model.ocirecipebuild.OCIRecipeBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="OCIRECIPEBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource" />
- </securedutility>
+ </lp:securedutility>
<adapter
for="lp.oci.interfaces.ocirecipebuild.IOCIRecipeBuild"
@@ -110,12 +110,12 @@
permission="zope.Public" />
<!-- OCIRecipeBuildMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ocirecipebuild.OCIRecipeBuildMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="oci-recipe-build">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIFile -->
<class class="lp.oci.model.ocirecipebuild.OCIFile">
@@ -123,11 +123,11 @@
</class>
<!-- OCIFileSet -->
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ocirecipebuild.OCIFileSet"
provides="lp.oci.interfaces.ocirecipebuild.IOCIFileSet">
<allow interface="lp.oci.interfaces.ocirecipebuild.IOCIFileSet" />
- </securedutility>
+ </lp:securedutility>
<!-- OCIRegistryCredentials -->
<class class="lp.oci.model.ociregistrycredentials.OCIRegistryCredentials">
@@ -141,20 +141,20 @@
set_schema="lp.oci.interfaces.ociregistrycredentials.IOCIRegistryCredentialsEditableAttributes" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ociregistrycredentials.OCIRegistryCredentialsSet"
provides="lp.oci.interfaces.ociregistrycredentials.IOCIRegistryCredentialsSet">
<allow
interface="lp.oci.interfaces.ociregistrycredentials.IOCIRegistryCredentialsSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIRegistrySecretsEncryptedContainer -->
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ociregistrycredentials.OCIRegistrySecretsEncryptedContainer"
provides="lp.services.crypto.interfaces.IEncryptedContainer"
name="oci-registry-secrets">
<allow interface="lp.services.crypto.interfaces.IEncryptedContainer"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIPushRule -->
<class class="lp.oci.model.ocipushrule.OCIPushRule">
@@ -168,12 +168,12 @@
set_schema="lp.oci.interfaces.ocipushrule.IOCIPushRuleEditableAttributes" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ocipushrule.OCIPushRuleSet"
provides="lp.oci.interfaces.ocipushrule.IOCIPushRuleSet">
<allow
interface="lp.oci.interfaces.ocipushrule.IOCIPushRuleSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIDistributionPushRule -->
<class class="lp.oci.model.ocipushrule.OCIDistributionPushRule">
@@ -188,21 +188,21 @@
</class>
<!-- OCI related jobs -->
- <securedutility
+ <lp:securedutility
component="lp.oci.model.ocirecipebuildjob.OCIRegistryUploadJob"
provides="lp.oci.interfaces.ocirecipebuildjob.IOCIRegistryUploadJobSource">
<allow interface="lp.oci.interfaces.ocirecipebuildjob.IOCIRegistryUploadJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.oci.model.ocirecipebuildjob.OCIRegistryUploadJob">
<allow interface="lp.oci.interfaces.ocirecipebuildjob.IOCIRecipeBuildJob" />
<allow interface="lp.oci.interfaces.ocirecipebuildjob.IOCIRegistryUploadJob" />
</class>
<!-- Registry interaction -->
- <securedutility
+ <lp:securedutility
class="lp.oci.model.ociregistryclient.OCIRegistryClient"
provides="lp.oci.interfaces.ociregistryclient.IOCIRegistryClient">
<allow interface="lp.oci.interfaces.ociregistryclient.IOCIRegistryClient" />
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/oci/vocabularies.zcml b/lib/lp/oci/vocabularies.zcml
index 24a57d8..195f387 100644
--- a/lib/lp/oci/vocabularies.zcml
+++ b/lib/lp/oci/vocabularies.zcml
@@ -2,35 +2,37 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="OCIRecipeDistroArchSeries"
component="lp.oci.vocabularies.OCIRecipeDistroArchSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.oci.vocabularies.OCIRecipeDistroArchSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
</class>
- <securedutility
+ <lp:securedutility
name="OCIRegistryCredentials"
component="lp.oci.vocabularies.OCIRegistryCredentialsVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.oci.vocabularies.OCIRegistryCredentialsVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
</class>
- <securedutility
+ <lp:securedutility
name="OCIRecipe"
component="lp.oci.vocabularies.OCIRecipeVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.oci.vocabularies.OCIRecipeVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
diff --git a/lib/lp/registry/configure.zcml b/lib/lp/registry/configure.zcml
index 534b883..9da6880 100644
--- a/lib/lp/registry/configure.zcml
+++ b/lib/lp/registry/configure.zcml
@@ -21,12 +21,12 @@
<allow
interface="lp.registry.interfaces.teammembership.ITeamMembershipSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.teammembership.TeamMembershipSet"
provides="lp.registry.interfaces.teammembership.ITeamMembershipSet">
<allow
interface="lp.registry.interfaces.teammembership.ITeamMembershipSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- XXX: Guilherme Salgado 2008-02-15: Need to refactor ITeamMembership
into specific interfaces for each persmission. -->
@@ -88,53 +88,53 @@
</class>
<!-- IPersonTransferJob -->
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.MembershipNotificationJob"
provides=".interfaces.persontransferjob.IMembershipNotificationJobSource">
<allow interface=".interfaces.persontransferjob.IMembershipNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.PersonMergeJob"
provides=".interfaces.persontransferjob.IPersonMergeJobSource">
<allow interface=".interfaces.persontransferjob.IPersonMergeJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.PersonDeactivateJob"
provides=".interfaces.persontransferjob.IPersonDeactivateJobSource">
<allow interface=".interfaces.persontransferjob.IPersonDeactivateJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.PersonCloseAccountJob"
provides=".interfaces.persontransferjob.IPersonCloseAccountJobSource">
<allow interface=".interfaces.persontransferjob.IPersonCloseAccountJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.TeamInvitationNotificationJob"
provides=".interfaces.persontransferjob.ITeamInvitationNotificationJobSource">
<allow interface=".interfaces.persontransferjob.ITeamInvitationNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.TeamJoinNotificationJob"
provides=".interfaces.persontransferjob.ITeamJoinNotificationJobSource">
<allow interface=".interfaces.persontransferjob.ITeamJoinNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.ExpiringMembershipNotificationJob"
provides=".interfaces.persontransferjob.IExpiringMembershipNotificationJobSource">
<allow interface=".interfaces.persontransferjob.IExpiringMembershipNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component=".model.persontransferjob.SelfRenewalNotificationJob"
provides=".interfaces.persontransferjob.ISelfRenewalNotificationJobSource">
<allow interface=".interfaces.persontransferjob.ISelfRenewalNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class=".model.persontransferjob.PersonTransferJob">
<allow interface=".interfaces.persontransferjob.IPersonTransferJob"/>
@@ -173,43 +173,43 @@
</class>
<!-- IProductNotificationJob -->
- <securedutility
+ <lp:securedutility
component=".model.productjob.CommercialExpiredJob"
provides=".interfaces.productjob.ICommercialExpiredJobSource">
<allow interface=".interfaces.productjob.ICommercialExpiredJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class=".model.productjob.CommercialExpiredJob">
<allow interface=".interfaces.productjob.ICommercialExpiredJob"/>
</class>
- <securedutility
+ <lp:securedutility
component=".model.productjob.SevenDayCommercialExpirationJob"
provides=".interfaces.productjob.ISevenDayCommercialExpirationJobSource">
<allow interface=".interfaces.productjob.ISevenDayCommercialExpirationJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class=".model.productjob.SevenDayCommercialExpirationJob">
<allow interface=".interfaces.productjob.ISevenDayCommercialExpirationJob"/>
</class>
- <securedutility
+ <lp:securedutility
component=".model.productjob.ThirtyDayCommercialExpirationJob"
provides=".interfaces.productjob.IThirtyDayCommercialExpirationJobSource">
<allow interface=".interfaces.productjob.IThirtyDayCommercialExpirationJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class=".model.productjob.ThirtyDayCommercialExpirationJob">
<allow interface=".interfaces.productjob.IThirtyDayCommercialExpirationJob"/>
</class>
<!-- INameBlocklist -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.nameblocklist.NameBlocklistSet"
provides="lp.registry.interfaces.nameblocklist.INameBlocklistSet">
<allow
interface="lp.registry.interfaces.nameblocklist.INameBlocklistSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.model.nameblocklist.NameBlocklistSet">
<require
@@ -246,11 +246,11 @@
</class>
<!-- DistroSeriesDifference -->
- <securedutility
+ <lp:securedutility
component="lp.registry.model.distroseriesdifference.DistroSeriesDifference"
provides="lp.registry.interfaces.distroseriesdifference.IDistroSeriesDifferenceSource">
<allow interface="lp.registry.interfaces.distroseriesdifference.IDistroSeriesDifferenceSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.distroseriesdifference.DistroSeriesDifference">
<allow interface="lp.registry.interfaces.distroseriesdifference.IDistroSeriesDifferencePublic"/>
@@ -264,23 +264,23 @@
</class>
<!-- DistroSeriesDifferenceComment -->
- <securedutility
+ <lp:securedutility
component="lp.registry.model.distroseriesdifferencecomment.DistroSeriesDifferenceComment"
provides="lp.registry.interfaces.distroseriesdifferencecomment.IDistroSeriesDifferenceCommentSource">
<allow interface="lp.registry.interfaces.distroseriesdifferencecomment.IDistroSeriesDifferenceCommentSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.distroseriesdifferencecomment.DistroSeriesDifferenceComment">
<allow interface="lp.registry.interfaces.distroseriesdifferencecomment.IDistroSeriesDifferenceComment"/>
</class>
<!-- DistroSeriesParent -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.distroseriesparent.DistroSeriesParentSet"
provides="lp.registry.interfaces.distroseriesparent.IDistroSeriesParentSet">
<allow
interface="lp.registry.interfaces.distroseriesparent.IDistroSeriesParentSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.distroseriesparent.DistroSeriesParent">
<require
@@ -353,12 +353,12 @@
interface="lp.bugs.interfaces.structuralsubscription.IStructuralSubscriptionTargetWrite" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.distroseries.DistroSeriesSet"
provides="lp.registry.interfaces.distroseries.IDistroSeriesSet">
<allow
interface="lp.registry.interfaces.distroseries.IDistroSeriesSet"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.registry.interfaces.distribution.IDistribution"
for="lp.registry.interfaces.distroseries.IDistroSeries"
@@ -388,21 +388,21 @@
<!-- CodeOfConductConf -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.codeofconduct.CodeOfConductConf"
provides="lp.registry.interfaces.codeofconduct.ICodeOfConductConf">
<allow
interface="lp.registry.interfaces.codeofconduct.ICodeOfConductConf"/>
- </securedutility>
+ </lp:securedutility>
<!-- CodeOfConductSet -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.codeofconduct.CodeOfConductSet"
provides="lp.registry.interfaces.codeofconduct.ICodeOfConductSet">
<allow
interface="lp.registry.interfaces.codeofconduct.ICodeOfConductSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SignedCodeofConduct -->
@@ -422,12 +422,12 @@
<allow
interface="lp.registry.interfaces.codeofconduct.ISignedCodeOfConductSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.codeofconduct.SignedCodeOfConductSet"
provides="lp.registry.interfaces.codeofconduct.ISignedCodeOfConductSet">
<allow
interface="lp.registry.interfaces.codeofconduct.ISignedCodeOfConductSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- string:${id} because id is an int -->
@@ -452,12 +452,12 @@
<allow
interface="lp.registry.interfaces.irc.IIrcIDSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.person.IrcIDSet"
provides="lp.registry.interfaces.irc.IIrcIDSet">
<allow
interface="lp.registry.interfaces.irc.IIrcIDSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ProjectGroup -->
@@ -530,12 +530,12 @@
<allow
interface="lp.registry.interfaces.projectgroup.IProjectGroupSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.projectgroup.ProjectGroupSet"
provides="lp.registry.interfaces.projectgroup.IProjectGroupSet">
<allow
interface="lp.registry.interfaces.projectgroup.IProjectGroupSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ProjectGroupSeries -->
@@ -686,31 +686,31 @@
<allow
interface="lp.registry.interfaces.jabber.IJabberIDSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.person.JabberIDSet"
provides="lp.registry.interfaces.jabber.IJabberIDSet">
<allow
interface="lp.registry.interfaces.jabber.IJabberIDSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.pillar.PillarName">
<allow
interface="lp.registry.interfaces.pillar.IPillarName"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.pillar.PillarNameSet"
provides="lp.registry.interfaces.pillar.IPillarNameSet">
<allow
interface="lp.registry.interfaces.pillar.IPillarNameSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.services.webservice.pillarset.PillarSetLink"
provides="lp.services.webservice.pillarset.IPillarSetLink">
<allow
interface="lazr.restful.interfaces.ITopLevelEntryLink"/>
<allow
interface="lp.services.webapp.interfaces.ICanonicalUrlData"/>
- </securedutility>
+ </lp:securedutility>
<!-- PillarPerson-->
@@ -720,12 +720,12 @@
interface="lp.registry.interfaces.pillar.IPillarPerson"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.pillar.PillarPerson"
provides="lp.registry.interfaces.pillar.IPillarPersonFactory">
<allow
interface="lp.registry.interfaces.pillar.IPillarPersonFactory"/>
- </securedutility>
+ </lp:securedutility>
<!-- OCIProjectName -->
<class
@@ -735,12 +735,12 @@
</class>
<!-- OCIProjectNameSet -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.ociprojectname.OCIProjectNameSet"
provides="lp.registry.interfaces.ociprojectname.IOCIProjectNameSet">
<allow
interface="lp.registry.interfaces.ociprojectname.IOCIProjectNameSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.ociprojectname.OCIProjectNameSet">
<allow
@@ -765,12 +765,12 @@
<subscriber
for="lp.registry.interfaces.ociproject.IOCIProject zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.registry.model.ociproject.oci_project_modified" />
- <securedutility
+ <lp:securedutility
class="lp.registry.model.ociproject.OCIProjectSet"
provides="lp.registry.interfaces.ociproject.IOCIProjectSet">
<allow
interface="lp.registry.interfaces.ociproject.IOCIProjectSet"/>
- </securedutility>
+ </lp:securedutility>
<adapter
for="lp.registry.interfaces.ociproject.IOCIProject"
provides="lp.services.webapp.interfaces.IBreadcrumb"
@@ -799,12 +799,12 @@
<!-- SourcePackageNameSet -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.sourcepackagename.SourcePackageNameSet"
provides="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet">
<allow
interface="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.sourcepackagename.SourcePackageNameSet">
<allow
@@ -864,12 +864,12 @@
<allow
interface="lp.registry.interfaces.karma.IKarmaCacheManager"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.karma.KarmaCacheManager"
provides="lp.registry.interfaces.karma.IKarmaCacheManager">
<allow
interface="lp.registry.interfaces.karma.IKarmaCacheManager"/>
- </securedutility>
+ </lp:securedutility>
<!-- KarmaActionSet -->
@@ -878,12 +878,12 @@
<allow
interface="lp.registry.interfaces.karma.IKarmaActionSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.karma.KarmaActionSet"
provides="lp.registry.interfaces.karma.IKarmaActionSet">
<allow
interface="lp.registry.interfaces.karma.IKarmaActionSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Poll -->
@@ -944,12 +944,12 @@
<allow
interface="lp.registry.interfaces.poll.IPollSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.poll.PollSet"
provides="lp.registry.interfaces.poll.IPollSet">
<allow
interface="lp.registry.interfaces.poll.IPollSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- PollSubset -->
@@ -966,24 +966,24 @@
<allow
interface="lp.registry.interfaces.poll.IPollOptionSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.poll.PollOptionSet"
provides="lp.registry.interfaces.poll.IPollOptionSet">
<allow
interface="lp.registry.interfaces.poll.IPollOptionSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.registry.model.poll.VoteSet"
provides="lp.registry.interfaces.poll.IVoteSet">
<allow
interface="lp.registry.interfaces.poll.IVoteSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.registry.model.poll.VoteCastSet"
provides="lp.registry.interfaces.poll.IVoteCastSet">
<allow
interface="lp.registry.interfaces.poll.IVoteCastSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Announcement -->
@@ -1016,12 +1016,12 @@
<!-- AnnouncementSet -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.announcement.AnnouncementSet"
provides="lp.registry.interfaces.announcement.IAnnouncementSet">
<allow
interface="lp.registry.interfaces.announcement.IAnnouncementSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Person -->
@@ -1153,7 +1153,7 @@
<allow
interface="lp.registry.interfaces.person.IPersonSetPublic"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.person.PersonSet"
provides="lp.registry.interfaces.person.IPersonSet">
<require
@@ -1161,15 +1161,15 @@
interface="lp.registry.interfaces.person.IPersonSetModerate" />
<allow
interface="lp.registry.interfaces.person.IPersonSetPublic"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.services.webservice.me.MeLink"
provides="lp.services.webservice.me.IMeLink">
<allow
interface="lazr.restful.interfaces.ITopLevelEntryLink"/>
<allow
interface="lp.services.webapp.interfaces.ICanonicalUrlData"/>
- </securedutility>
+ </lp:securedutility>
<adapter
for="lp.services.webapp.interfaces.ILaunchpadPrincipal"
provides="lp.registry.interfaces.person.IPerson"
@@ -1252,12 +1252,12 @@
<!-- IMilestoneSet -->
- <securedutility
+ <lp:securedutility
class="lp.registry.model.milestone.MilestoneSet"
provides="lp.registry.interfaces.milestone.IMilestoneSet">
<allow
interface="lp.registry.interfaces.milestone.IMilestoneSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ProjectMilestone -->
@@ -1297,34 +1297,34 @@
<allow
interface="lp.registry.interfaces.mailinglist.IMessageApproval"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.mailinglist.MailingListSet"
provides="lp.registry.interfaces.mailinglist.IMailingListSet">
<allow
interface="lp.registry.interfaces.mailinglist.IMailingListSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.systemhomes.MailingListApplication"
provides="lp.registry.interfaces.mailinglist.IMailingListApplication">
<allow
interface="lp.registry.interfaces.mailinglist.IMailingListApplication"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.registry.model.mailinglist.MessageApprovalSet"
provides="lp.registry.interfaces.mailinglist.IMessageApprovalSet">
<allow
interface="lp.registry.interfaces.mailinglist.IMessageApprovalSet"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.registry.interfaces.mailinglist.IMailingListApplication"
interface="lp.registry.interfaces.mailinglist.IMailingListAPIView"
class="lp.registry.xmlrpc.mailinglist.MailingListAPIView"
permission="zope.Public"/>
- <securedutility
+ <lp:securedutility
class="lp.registry.xmlrpc.canonicalsso.CanonicalSSOApplication"
provides="lp.registry.interfaces.person.ICanonicalSSOApplication">
<allow interface="lp.registry.interfaces.person.ICanonicalSSOApplication" />
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.registry.interfaces.person.ICanonicalSSOApplication"
interface="lp.registry.interfaces.person.ICanonicalSSOAPI"
@@ -1361,12 +1361,12 @@
<allow
interface="lp.registry.interfaces.wikiname.IWikiNameSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.person.WikiNameSet"
provides="lp.registry.interfaces.wikiname.IWikiNameSet">
<allow
interface="lp.registry.interfaces.wikiname.IWikiNameSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.gpgkey.GPGKey">
<allow
@@ -1383,12 +1383,12 @@
<allow
interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.gpgkey.GPGKeySet"
provides="lp.registry.interfaces.gpg.IGPGKeySet">
<allow
interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Product -->
@@ -1657,7 +1657,7 @@
count_answered
count_codified"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.product.ProductSet"
provides="lp.registry.interfaces.product.IProductSet">
<allow
@@ -1666,7 +1666,7 @@
permission="launchpad.Moderate"
attributes="
forReview"/>
- </securedutility>
+ </lp:securedutility>
<!-- SSHKey -->
@@ -1686,12 +1686,12 @@
<allow
interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.person.SSHKeySet"
provides="lp.registry.interfaces.ssh.ISSHKeySet">
<allow
interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
- </securedutility>
+ </lp:securedutility>
<subscriber
for="lp.registry.interfaces.teammembership.IJoinTeamEvent"
handler="lp.registry.mail.notification.notify_team_join"/>
@@ -1810,12 +1810,12 @@
<allow
interface="lp.registry.interfaces.productseries.IProductSeriesSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.productseries.ProductSeriesSet"
provides="lp.registry.interfaces.productseries.IProductSeriesSet">
<allow
interface="lp.registry.interfaces.productseries.IProductSeriesSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Distribution -->
@@ -1969,13 +1969,13 @@
interface="lp.registry.interfaces.distribution.IDistributionSet"
attributes="__len__"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.distribution.DistributionSet"
provides="lp.registry.interfaces.distribution.IDistributionSet">
<allow
interface="lp.registry.interfaces.distribution.IDistributionSet"
attributes="__len__"/>
- </securedutility>
+ </lp:securedutility>
<!-- SourcePackage -->
<class
@@ -1991,12 +1991,12 @@
permission="launchpad.Edit"
interface="lp.registry.interfaces.sourcepackage.ISourcePackageEdit"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.sourcepackage.SourcePackage"
provides="lp.registry.interfaces.sourcepackage.ISourcePackageFactory">
<allow
interface="lp.registry.interfaces.sourcepackage.ISourcePackageFactory"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.registry.interfaces.distribution.IDistribution"
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
@@ -2026,12 +2026,12 @@
permission="zope.Public"
set_schema="lp.registry.interfaces.productrelease.IProductReleaseSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.productrelease.ProductReleaseSet"
provides="lp.registry.interfaces.productrelease.IProductReleaseSet">
<allow
interface="lp.registry.interfaces.productrelease.IProductReleaseSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- This is class ProductRelease -->
@@ -2147,11 +2147,11 @@
<allow interface="lp.registry.interfaces.distributionmirror.IDistributionMirrorSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.distributionmirror.DistributionMirrorSet"
provides="lp.registry.interfaces.distributionmirror.IDistributionMirrorSet">
<allow interface="lp.registry.interfaces.distributionmirror.IDistributionMirrorSet" />
- </securedutility>
+ </lp:securedutility>
<!-- MirrorDistroArchSeries -->
<class class="lp.registry.model.distributionmirror.MirrorDistroArchSeries">
@@ -2200,12 +2200,12 @@
<allow
interface="lp.registry.interfaces.packaging.IPackagingUtil"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.registry.model.packaging.PackagingUtil"
provides="lp.registry.interfaces.packaging.IPackagingUtil">
<allow
interface="lp.registry.interfaces.packaging.IPackagingUtil"/>
- </securedutility>
+ </lp:securedutility>
<!-- PersonDistributionSourcePackage -->
@@ -2221,12 +2221,12 @@
factory="lp.registry.browser.persondistributionsourcepackage.PersonDistributionSourcePackageBreadcrumb"
permission="zope.Public"/>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.persondistributionsourcepackage.PersonDistributionSourcePackage"
provides="lp.registry.interfaces.persondistributionsourcepackage.IPersonDistributionSourcePackageFactory">
<allow
interface="lp.registry.interfaces.persondistributionsourcepackage.IPersonDistributionSourcePackageFactory"/>
- </securedutility>
+ </lp:securedutility>
<!-- PersonNotification -->
@@ -2236,12 +2236,12 @@
interface="lp.registry.interfaces.personnotification.IPersonNotification"/>
</class>
- <securedutility
+ <lp:securedutility
provides="lp.registry.interfaces.personnotification.IPersonNotificationSet"
class="lp.registry.model.personnotification.PersonNotificationSet">
<allow
interface="lp.registry.interfaces.personnotification.IPersonNotificationSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- PersonOCIProject -->
@@ -2251,12 +2251,12 @@
interface="lp.registry.interfaces.personociproject.IPersonOCIProject"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.personociproject.PersonOCIProject"
provides="lp.registry.interfaces.personociproject.IPersonOCIProjectFactory">
<allow
interface="lp.registry.interfaces.personociproject.IPersonOCIProjectFactory"/>
- </securedutility>
+ </lp:securedutility>
<!-- PersonProduct -->
@@ -2275,12 +2275,12 @@
factory="lp.registry.browser.personproduct.PersonProductBreadcrumb"
permission="zope.Public"/>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.personproduct.PersonProductFactory"
provides="lp.registry.interfaces.personproduct.IPersonProductFactory">
<allow
interface="lp.registry.interfaces.personproduct.IPersonProductFactory"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.personroles.PersonRoles">
@@ -2297,62 +2297,62 @@
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicy"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessPolicy"
provides="lp.registry.interfaces.accesspolicy.IAccessPolicySource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicySource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.accesspolicy.AccessArtifact">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessArtifact"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessArtifact"
provides="lp.registry.interfaces.accesspolicy.IAccessArtifactSource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessArtifactSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.accesspolicy.AccessPolicyArtifact">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicyArtifact"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessPolicyArtifact"
provides="lp.registry.interfaces.accesspolicy.IAccessPolicyArtifactSource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicyArtifactSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.accesspolicy.AccessArtifactGrant">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessArtifactGrant"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessArtifactGrant"
provides="lp.registry.interfaces.accesspolicy.IAccessArtifactGrantSource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessArtifactGrantSource"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.registry.model.accesspolicy.AccessPolicyGrant">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicyGrant"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessPolicyGrant"
provides="lp.registry.interfaces.accesspolicy.IAccessPolicyGrantSource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicyGrantSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.registry.model.accesspolicy.AccessPolicyGrantFlat"
provides="lp.registry.interfaces.accesspolicy.IAccessPolicyGrantFlatSource">
<allow
interface="lp.registry.interfaces.accesspolicy.IAccessPolicyGrantFlatSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- Sharing jobs -->
<class class=".model.sharingjob.RemoveArtifactSubscriptionsJob">
@@ -2362,10 +2362,10 @@
log_name"/>
</class>
- <securedutility
+ <lp:securedutility
component=".model.sharingjob.RemoveArtifactSubscriptionsJob"
provides=".interfaces.sharingjob.IRemoveArtifactSubscriptionsJobSource">
<allow interface=".interfaces.sharingjob.IRemoveArtifactSubscriptionsJobSource"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/registry/services/configure.zcml b/lib/lp/registry/services/configure.zcml
index 429b184..9a730a8 100644
--- a/lib/lp/registry/services/configure.zcml
+++ b/lib/lp/registry/services/configure.zcml
@@ -4,15 +4,15 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
<!-- Named Services -->
- <securedutility
+ <lp:securedutility
name="sharing"
class="lp.registry.services.sharingservice.SharingService"
provides="lp.app.interfaces.services.IService">
<allow
interface="lp.registry.interfaces.sharingservice.ISharingService"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/registry/vocabularies.zcml b/lib/lp/registry/vocabularies.zcml
index 395f8f6..52500d3 100644
--- a/lib/lp/registry/vocabularies.zcml
+++ b/lib/lp/registry/vocabularies.zcml
@@ -2,505 +2,507 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
- <securedutility
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
+ <lp:securedutility
name="Distribution"
component="lp.registry.vocabularies.DistributionVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistributionVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistroSeries"
component="lp.registry.vocabularies.DistroSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistroSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistroSeriesDerivation"
component=".vocabularies.DistroSeriesDerivationVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".vocabularies.DistroSeriesDerivationVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistroSeriesDifferences"
component=".vocabularies.DistroSeriesDifferencesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class=".vocabularies.DistroSeriesDifferencesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FeaturedProject"
component="lp.registry.vocabularies.FeaturedProjectVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.FeaturedProjectVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FilteredDistroSeries"
component="lp.registry.vocabularies.FilteredDistroSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.FilteredDistroSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FilteredProductSeries"
component="lp.registry.vocabularies.FilteredProductSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.FilteredProductSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="KarmaCategory"
component="lp.registry.vocabularies.KarmaCategoryVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.KarmaCategoryVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="Milestone"
component="lp.registry.vocabularies.MilestoneVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.MilestoneVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="MilestoneWithDateExpected"
component="lp.registry.vocabularies.MilestoneWithDateExpectedVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.MilestoneWithDateExpectedVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="NonMergedPeopleAndTeams"
component="lp.registry.vocabularies.NonMergedPeopleAndTeamsVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.NonMergedPeopleAndTeamsVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="AdminMergeablePerson"
component="lp.registry.vocabularies.AdminMergeablePersonVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.AdminMergeablePersonVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="PersonAccountToMerge"
component="lp.registry.vocabularies.PersonAccountToMergeVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.PersonAccountToMergeVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="PersonActiveMembership"
component="lp.registry.vocabularies.PersonActiveMembershipVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.PersonActiveMembershipVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="Product"
component="lp.registry.vocabularies.ProductVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ProductVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ProductRelease"
component="lp.registry.vocabularies.ProductReleaseVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ProductReleaseVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ProductSeries"
component="lp.registry.vocabularies.ProductSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ProductSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ProjectGroup"
component="lp.registry.vocabularies.ProjectGroupVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ProjectGroupVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ProjectProducts"
component="lp.registry.vocabularies.project_products_vocabulary_factory"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="CommercialProjects"
component="lp.registry.vocabularies.CommercialProjectsVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.CommercialProjectsVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="UserTeamsParticipation"
component="lp.registry.vocabularies.UserTeamsParticipationVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.UserTeamsParticipationVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="UserTeamsParticipationPlusSelf"
component="lp.registry.vocabularies.UserTeamsParticipationPlusSelfVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.UserTeamsParticipationPlusSelfVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="UserTeamsParticipationPlusSelfSimpleDisplay"
component="lp.registry.vocabularies.UserTeamsParticipationPlusSelfSimpleDisplayVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.UserTeamsParticipationPlusSelfSimpleDisplayVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="AllUserTeamsParticipation"
component="lp.registry.vocabularies.AllUserTeamsParticipationVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.AllUserTeamsParticipationVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="AllUserTeamsParticipationPlusSelf"
component="lp.registry.vocabularies.AllUserTeamsParticipationPlusSelfVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.AllUserTeamsParticipationPlusSelfVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="AllUserTeamsParticipationPlusSelfSimpleDisplay"
component="lp.registry.vocabularies.AllUserTeamsParticipationPlusSelfSimpleDisplayVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.AllUserTeamsParticipationPlusSelfSimpleDisplayVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ActiveMailingList"
component="lp.registry.vocabularies.ActiveMailingListVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ActiveMailingListVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidPersonOrTeam"
component="lp.registry.vocabularies.ValidPersonOrTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidPersonOrTeamVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidAssignee"
component="lp.registry.vocabularies.ValidPersonOrTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="ValidMaintainer"
component="lp.registry.vocabularies.ValidPersonOrTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="ValidOwner"
component="lp.registry.vocabularies.ValidPersonOrTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="ValidPillarOwner"
component="lp.registry.vocabularies.ValidPersonOrExclusiveTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
name="ValidBranchReviewer"
component="lp.registry.vocabularies.ValidPersonOrExclusiveTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidPersonOrExclusiveTeamVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidTeam"
component="lp.registry.vocabularies.ValidTeamVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidTeamVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidPerson"
component="lp.registry.vocabularies.ValidPersonVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidPersonVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidTeamMember"
component="lp.registry.vocabularies.ValidTeamMemberVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidTeamMemberVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidTeamOwner"
component="lp.registry.vocabularies.ValidTeamOwnerVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.ValidTeamOwnerVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="NewPillarGrantee"
component="lp.registry.vocabularies.NewPillarGranteeVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.NewPillarGranteeVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistributionOrProduct"
component="lp.registry.vocabularies.DistributionOrProductVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistributionOrProductVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistributionOrProductOrProjectGroup"
component="lp.registry.vocabularies.DistributionOrProductOrProjectGroupVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistributionOrProductOrProjectGroupVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="SourcePackageName"
component="lp.registry.vocabularies.SourcePackageNameVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.SourcePackageNameVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
@@ -511,13 +513,13 @@
<allow interface="lp.services.webapp.vocabulary.ICountableIterator"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistributionSourcePackage"
component="lp.registry.vocabularies.DistributionSourcePackageVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistributionSourcePackageVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
@@ -563,12 +565,12 @@
attributes="name title description"/>
</class>
- <securedutility
+ <lp:securedutility
name="OCIProject"
component="lp.registry.vocabularies.OCIProjectVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.OCIProjectVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
@@ -577,12 +579,12 @@
attributes="setPillar"/>
</class>
- <securedutility
+ <lp:securedutility
name="DistributionPackage"
component="lp.registry.vocabularies.DistributionPackageVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.registry.vocabularies.DistributionPackageVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
diff --git a/lib/lp/services/auth/configure.zcml b/lib/lp/services/auth/configure.zcml
index 1ee8eb4..984737e 100644
--- a/lib/lp/services/auth/configure.zcml
+++ b/lib/lp/services/auth/configure.zcml
@@ -22,11 +22,11 @@
<allow interface="lp.services.auth.interfaces.IAccessTokenSet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.auth.model.AccessTokenSet"
provides="lp.services.auth.interfaces.IAccessTokenSet">
<allow interface="lp.services.auth.interfaces.IAccessTokenSet" />
- </securedutility>
+ </lp:securedutility>
<browser:url
for="lp.services.auth.interfaces.IAccessToken"
diff --git a/lib/lp/services/authserver/configure.zcml b/lib/lp/services/authserver/configure.zcml
index 1fd2c72..722956c 100644
--- a/lib/lp/services/authserver/configure.zcml
+++ b/lib/lp/services/authserver/configure.zcml
@@ -4,16 +4,16 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
+ xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
>
- <securedutility
+ <lp:securedutility
class="lp.services.authserver.xmlrpc.AuthServerApplication"
provides="lp.services.authserver.interfaces.IAuthServerApplication">
<allow
interface="lp.services.authserver.interfaces.IAuthServerApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.services.authserver.interfaces.IAuthServerApplication"
diff --git a/lib/lp/services/features/configure.zcml b/lib/lp/services/features/configure.zcml
index bcd22cd..62d93ba 100644
--- a/lib/lp/services/features/configure.zcml
+++ b/lib/lp/services/features/configure.zcml
@@ -19,16 +19,16 @@
for="zope.publisher.interfaces.IEndRequestEvent"
handler="lp.services.features.webapp.end_request"/>
- <securedutility
+ <lp:securedutility
class="lp.services.features.model.FeatureRules"
provides="lp.services.features.interfaces.IFeatureRules">
<allow interface="lp.services.features.interfaces.IFeatureRules"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
class="lp.services.features.xmlrpc.FeatureFlagApplication"
provides="lp.services.features.xmlrpc.IFeatureFlagApplication">
<allow interface="lp.services.features.xmlrpc.IFeatureFlagApplication"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/feeds/configure.zcml b/lib/lp/services/feeds/configure.zcml
index 1290e80..12b12b6 100644
--- a/lib/lp/services/feeds/configure.zcml
+++ b/lib/lp/services/feeds/configure.zcml
@@ -6,14 +6,15 @@
xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.FeedsApplication"
provides="lp.services.feeds.interfaces.application.IFeedsApplication">
<allow
interface="lp.services.feeds.interfaces.application.IFeedsApplication" />
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.ICanonicalUrlData"
diff --git a/lib/lp/services/geoip/configure.zcml b/lib/lp/services/geoip/configure.zcml
index 6645e21..2dda396 100644
--- a/lib/lp/services/geoip/configure.zcml
+++ b/lib/lp/services/geoip/configure.zcml
@@ -6,18 +6,18 @@
xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
- xmlns:zope="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
<class class="lp.services.geoip.model.GeoIP">
<allow interface="lp.services.geoip.interfaces.IGeoIP" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.geoip.model.GeoIP"
provides="lp.services.geoip.interfaces.IGeoIP">
<allow interface="lp.services.geoip.interfaces.IGeoIP" />
- </securedutility>
+ </lp:securedutility>
<adapter
for="zope.publisher.interfaces.browser.IBrowserRequest"
diff --git a/lib/lp/services/gpg/configure.zcml b/lib/lp/services/gpg/configure.zcml
index c78dfc9..013f5af 100644
--- a/lib/lp/services/gpg/configure.zcml
+++ b/lib/lp/services/gpg/configure.zcml
@@ -6,18 +6,18 @@
xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
- xmlns:zope="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
<class class="lp.services.gpg.handler.GPGHandler">
<allow interface="lp.services.gpg.interfaces.IGPGHandler" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.gpg.handler.GPGHandler"
provides="lp.services.gpg.interfaces.IGPGHandler">
<allow interface="lp.services.gpg.interfaces.IGPGHandler" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.gpg.handler.PymeSignature">
<allow interface="lp.services.gpg.interfaces.IPymeSignature" />
diff --git a/lib/lp/services/identity/configure.zcml b/lib/lp/services/identity/configure.zcml
index b99ccb4..c04e72d 100644
--- a/lib/lp/services/identity/configure.zcml
+++ b/lib/lp/services/identity/configure.zcml
@@ -33,12 +33,12 @@
syncUpdate"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.identity.model.emailaddress.EmailAddressSet"
provides="lp.services.identity.interfaces.emailaddress.IEmailAddressSet">
<allow
interface="lp.services.identity.interfaces.emailaddress.IEmailAddressSet"/>
- </securedutility>
+ </lp:securedutility>
<browser:url
for="lp.services.identity.interfaces.emailaddress.IEmailAddress"
@@ -62,12 +62,12 @@
set_attributes="displayname"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.identity.model.account.AccountSet"
provides="lp.services.identity.interfaces.account.IAccountSet">
<allow
interface="lp.services.identity.interfaces.account.IAccountSet"/>
- </securedutility>
+ </lp:securedutility>
<adapter
for="lp.services.webapp.interfaces.ILaunchpadPrincipal"
diff --git a/lib/lp/services/librarian/client.zcml b/lib/lp/services/librarian/client.zcml
index ad05a8e..876a232 100644
--- a/lib/lp/services/librarian/client.zcml
+++ b/lib/lp/services/librarian/client.zcml
@@ -2,22 +2,24 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
<class class=".client._File">
<allow attributes="read close" />
</class>
- <securedutility
+ <lp:securedutility
class=".client.LibrarianClient"
provides=".interfaces.client.ILibrarianClient">
<allow interface=".interfaces.client.ILibrarianClient" />
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
class=".client.RestrictedLibrarianClient"
provides=".interfaces.client.IRestrictedLibrarianClient">
<allow interface=".interfaces.client.IRestrictedLibrarianClient" />
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/librarian/configure.zcml b/lib/lp/services/librarian/configure.zcml
index 93a94d1..a9e6a44 100644
--- a/lib/lp/services/librarian/configure.zcml
+++ b/lib/lp/services/librarian/configure.zcml
@@ -29,11 +29,11 @@
<allow interface="lp.services.librarian.interfaces.ILibraryFileContent" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.librarian.model.LibraryFileAliasSet"
provides="lp.services.librarian.interfaces.ILibraryFileAliasSet">
<allow interface="lp.services.librarian.interfaces.ILibraryFileAliasSet" />
- </securedutility>
+ </lp:securedutility>
<browser:defaultView
for="lp.services.librarian.interfaces.ILibraryFileAlias"
diff --git a/lib/lp/services/messages/configure.zcml b/lib/lp/services/messages/configure.zcml
index 9feb624..e84df12 100644
--- a/lib/lp/services/messages/configure.zcml
+++ b/lib/lp/services/messages/configure.zcml
@@ -57,11 +57,11 @@
</class>
<!-- MessageSet -->
- <securedutility
+ <lp:securedutility
class="lp.services.messages.model.message.MessageSet"
provides="lp.services.messages.interfaces.message.IMessageSet">
<allow interface="lp.services.messages.interfaces.message.IMessageSet" />
- </securedutility>
+ </lp:securedutility>
<!-- Some message have a canonical_url -->
<adapter for="lp.services.messages.interfaces.message.IMessage"
diff --git a/lib/lp/services/oauth/configure.zcml b/lib/lp/services/oauth/configure.zcml
index a857945..681757e 100644
--- a/lib/lp/services/oauth/configure.zcml
+++ b/lib/lp/services/oauth/configure.zcml
@@ -19,12 +19,12 @@
<allow interface="lp.services.oauth.interfaces.IOAuthConsumerSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.oauth.model.OAuthConsumerSet"
provides="lp.services.oauth.interfaces.IOAuthConsumerSet">
<allow
interface="lp.services.oauth.interfaces.IOAuthConsumerSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.oauth.model.OAuthRequestToken">
<allow interface="lp.services.oauth.interfaces.IOAuthRequestToken"/>
@@ -33,12 +33,12 @@
set_schema="lp.services.oauth.interfaces.IOAuthRequestToken"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.oauth.model.OAuthRequestTokenSet"
provides="lp.services.oauth.interfaces.IOAuthRequestTokenSet">
<allow
interface="lp.services.oauth.interfaces.IOAuthRequestTokenSet"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.oauth.model.OAuthAccessToken">
<allow interface="lp.services.oauth.interfaces.IOAuthAccessToken"/>
diff --git a/lib/lp/services/scripts/configure.zcml b/lib/lp/services/scripts/configure.zcml
index e265536..50ab570 100644
--- a/lib/lp/services/scripts/configure.zcml
+++ b/lib/lp/services/scripts/configure.zcml
@@ -2,7 +2,9 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
<class class="lp.services.scripts.model.scriptactivity.ScriptActivity">
<allow interface="lp.services.scripts.interfaces.scriptactivity.IScriptActivity"/>
@@ -12,10 +14,10 @@
<allow interface="lp.services.scripts.interfaces.scriptactivity.IScriptActivitySet" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.scripts.model.scriptactivity.ScriptActivitySet"
provides="lp.services.scripts.interfaces.scriptactivity.IScriptActivitySet" >
<allow interface="lp.services.scripts.interfaces.scriptactivity.IScriptActivitySet" />
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/signing/configure.zcml b/lib/lp/services/signing/configure.zcml
index b97f96d..2e8e58f 100644
--- a/lib/lp/services/signing/configure.zcml
+++ b/lib/lp/services/signing/configure.zcml
@@ -1,5 +1,6 @@
<configure
- xmlns="http://namespaces.zope.org/zope";>
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
<class class="lp.services.signing.model.signingkey.ArchiveSigningKey">
<allow
@@ -10,24 +11,24 @@
<allow
interface="lp.services.signing.interfaces.signingkey.ISigningKey"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.services.signing.model.signingkey.SigningKey"
provides="lp.services.signing.interfaces.signingkey.ISigningKeySet">
<allow
interface="lp.services.signing.interfaces.signingkey.ISigningKeySet"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
class="lp.services.signing.model.signingkey.ArchiveSigningKeySet"
provides="lp.services.signing.interfaces.signingkey.IArchiveSigningKeySet">
<allow
interface="lp.services.signing.interfaces.signingkey.IArchiveSigningKeySet"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
class="lp.services.signing.proxy.SigningServiceClient"
provides="lp.services.signing.interfaces.signingserviceclient.ISigningServiceClient">
<allow
interface="lp.services.signing.interfaces.signingserviceclient.ISigningServiceClient" />
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/sitesearch/configure.zcml b/lib/lp/services/sitesearch/configure.zcml
index 1bd8ba3..9ecd8a2 100644
--- a/lib/lp/services/sitesearch/configure.zcml
+++ b/lib/lp/services/sitesearch/configure.zcml
@@ -3,7 +3,8 @@
-->
<configure
- xmlns="http://namespaces.zope.org/zope";>
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
<class
class="lp.services.sitesearch.PageMatch">
@@ -15,11 +16,11 @@
<allow interface="lp.services.sitesearch.interfaces.ISearchResults" />
</class>
- <securedutility
+ <lp:securedutility
name="bing"
class="lp.services.sitesearch.BingSearchService"
provides="lp.services.sitesearch.interfaces.ISearchService">
<allow interface="lp.services.sitesearch.interfaces.ISearchService" />
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/statistics/configure.zcml b/lib/lp/services/statistics/configure.zcml
index 3b8643a..78245d0 100644
--- a/lib/lp/services/statistics/configure.zcml
+++ b/lib/lp/services/statistics/configure.zcml
@@ -1,8 +1,7 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
- xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
<include
package=".browser"/>
@@ -17,10 +16,10 @@
<!-- LaunchpadStatisticSet -->
- <securedutility
+ <lp:securedutility
class="lp.services.statistics.model.statistics.LaunchpadStatisticSet"
provides="lp.services.statistics.interfaces.statistic.ILaunchpadStatisticSet">
<allow
interface="lp.services.statistics.interfaces.statistic.ILaunchpadStatisticSet"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/temporaryblobstorage/configure.zcml b/lib/lp/services/temporaryblobstorage/configure.zcml
index 9bb10cb..e696b52 100644
--- a/lib/lp/services/temporaryblobstorage/configure.zcml
+++ b/lib/lp/services/temporaryblobstorage/configure.zcml
@@ -6,6 +6,7 @@
xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
+ xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:webservice="http://namespaces.canonical.com/webservice";
i18n_domain="launchpad">
@@ -30,12 +31,12 @@
interface="lp.services.temporaryblobstorage.interfaces.ITemporaryStorageManager" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.temporaryblobstorage.model.TemporaryStorageManager"
provides="lp.services.temporaryblobstorage.interfaces.ITemporaryStorageManager">
<allow
interface="lp.services.temporaryblobstorage.interfaces.ITemporaryStorageManager" />
- </securedutility>
+ </lp:securedutility>
<browser:navigation
module="lp.services.temporaryblobstorage.browser"
diff --git a/lib/lp/services/tests/test_vocabularies.py b/lib/lp/services/tests/test_vocabularies.py
index 7447f6c..f1309f3 100644
--- a/lib/lp/services/tests/test_vocabularies.py
+++ b/lib/lp/services/tests/test_vocabularies.py
@@ -17,12 +17,12 @@ class TestVocabularies(TestCase):
layer = FunctionalLayer
def test_security_proxy(self):
- """Our vocabularies should be registered with <securedutility>."""
+ """Our vocabularies should be registered with <lp:securedutility>."""
vocabularies = getUtilitiesFor(IVocabularyFactory)
for name, vocab in vocabularies:
# If the vocabulary is not in a security proxy, check
# whether it is a vocabulary defined by zope, which are
- # not registered with <securedutility> and can be ignored.
+ # not registered with <lp:securedutility> and can be ignored.
if not isProxy(vocab) and vocab.__module__[:5] != "zope.":
raise AssertionError(
"%s.%s vocabulary is not wrapped in a security proxy."
diff --git a/lib/lp/services/verification/configure.zcml b/lib/lp/services/verification/configure.zcml
index 0620a53..20378a5 100644
--- a/lib/lp/services/verification/configure.zcml
+++ b/lib/lp/services/verification/configure.zcml
@@ -1,8 +1,7 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
- xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
<include
package=".browser"/>
@@ -25,11 +24,11 @@
<allow
interface="lp.services.verification.interfaces.logintoken.ILoginTokenSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.services.verification.model.logintoken.LoginTokenSet"
provides="lp.services.verification.interfaces.logintoken.ILoginTokenSet">
<allow
interface="lp.services.verification.interfaces.logintoken.ILoginTokenSet"/>
- </securedutility>
+ </lp:securedutility>
</facet>
</configure>
diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml
index e45ec73..04d8934 100644
--- a/lib/lp/services/webapp/meta.zcml
+++ b/lib/lp/services/webapp/meta.zcml
@@ -54,7 +54,7 @@
/>
<complexDirective
- namespace="http://namespaces.zope.org/zope";
+ namespace="http://namespaces.canonical.com/lp";
name="securedutility"
schema="lp.services.webapp.metazcml.ISecuredUtilityDirective"
handler="lp.services.webapp.metazcml.SecuredUtilityDirective"
diff --git a/lib/lp/services/webhooks/configure.zcml b/lib/lp/services/webhooks/configure.zcml
index 1982ed1..d35fe99 100644
--- a/lib/lp/services/webhooks/configure.zcml
+++ b/lib/lp/services/webhooks/configure.zcml
@@ -18,40 +18,40 @@
<subscriber
for="lp.services.webhooks.interfaces.IWebhook zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.services.webhooks.model.webhook_modified"/>
- <securedutility
+ <lp:securedutility
class="lp.services.webhooks.model.WebhookSet"
provides="lp.services.webhooks.interfaces.IWebhookSet">
<allow interface="lp.services.webhooks.interfaces.IWebhookSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
name="AnyWebhookEventType"
component="lp.services.webhooks.interfaces.AnyWebhookEventTypeVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.webhooks.interfaces.AnyWebhookEventTypeVocabulary">
<allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
</class>
- <securedutility
+ <lp:securedutility
name="ValidWebhookEventType"
component="lp.services.webhooks.interfaces.ValidWebhookEventTypeVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.webhooks.interfaces.ValidWebhookEventTypeVocabulary">
<allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.services.webhooks.model.WebhookJob"
provides="lp.services.webhooks.interfaces.IWebhookJobSource">
<allow interface="lp.services.webhooks.interfaces.IWebhookJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.services.webhooks.model.WebhookDeliveryJob"
provides="lp.services.webhooks.interfaces.IWebhookDeliveryJobSource">
<allow interface="lp.services.webhooks.interfaces.IWebhookDeliveryJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.webhooks.model.WebhookDeliveryJob">
<require
permission="launchpad.View"
diff --git a/lib/lp/services/webservice/configure.zcml b/lib/lp/services/webservice/configure.zcml
index dfce232..d3136b5 100644
--- a/lib/lp/services/webservice/configure.zcml
+++ b/lib/lp/services/webservice/configure.zcml
@@ -7,6 +7,7 @@
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:grok="http://namespaces.zope.org/grok";
xmlns:i18n="http://namespaces.zope.org/i18n";
+ xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:webservice="http://namespaces.canonical.com/webservice";
i18n_domain="launchpad">
@@ -17,14 +18,14 @@
provides="lazr.restful.interfaces.IWebServiceConfiguration">
</utility>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.WebServiceApplication"
provides="lp.services.webservice.interfaces.IWebServiceApplication">
<allow
interface="lp.services.webservice.interfaces.IWebServiceApplication" />
<allow interface='lazr.restful.interfaces.IServiceRootResource' />
<allow interface='lp.services.webapp.interfaces.ICanonicalUrlData' />
- </securedutility>
+ </lp:securedutility>
<!-- Registration for the class that manages an entry's byte
storage fields. -->
diff --git a/lib/lp/services/worlddata/configure.zcml b/lib/lp/services/worlddata/configure.zcml
index 05a196c..41be6d9 100644
--- a/lib/lp/services/worlddata/configure.zcml
+++ b/lib/lp/services/worlddata/configure.zcml
@@ -21,12 +21,12 @@
interface=".interfaces.country.ICountrySet" />
</class>
- <securedutility
+ <lp:securedutility
class=".model.country.CountrySet"
provides=".interfaces.country.ICountrySet">
<allow
interface=".interfaces.country.ICountrySet" />
- </securedutility>
+ </lp:securedutility>
<class class=".model.country.Continent">
<allow
@@ -46,11 +46,11 @@
factory="lp.translations.browser.language.LanguageBreadcrumb"
permission="zope.Public"/>
- <securedutility
+ <lp:securedutility
class=".model.language.LanguageSet"
provides=".interfaces.language.ILanguageSet">
<allow interface=".interfaces.language.ILanguageSet" />
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.IBreadcrumb"
diff --git a/lib/lp/services/worlddata/vocabularies.zcml b/lib/lp/services/worlddata/vocabularies.zcml
index 0a6f465..e0f5048 100644
--- a/lib/lp/services/worlddata/vocabularies.zcml
+++ b/lib/lp/services/worlddata/vocabularies.zcml
@@ -2,40 +2,42 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="CountryName"
component="lp.services.worlddata.vocabularies.CountryNameVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.worlddata.vocabularies.CountryNameVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="Language"
component="lp.services.worlddata.vocabularies.LanguageVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.services.worlddata.vocabularies.LanguageVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TimezoneName"
component="lp.services.worlddata.vocabularies.TimezoneNameVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/services/xref/configure.zcml b/lib/lp/services/xref/configure.zcml
index 9e2b407..244ba75 100644
--- a/lib/lp/services/xref/configure.zcml
+++ b/lib/lp/services/xref/configure.zcml
@@ -2,12 +2,14 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
class="lp.services.xref.model.XRefSet"
provides="lp.services.xref.interfaces.IXRefSet">
<allow interface="lp.services.xref.interfaces.IXRefSet"/>
- </securedutility>
+ </lp:securedutility>
</configure>
diff --git a/lib/lp/snappy/configure.zcml b/lib/lp/snappy/configure.zcml
index da9d6bc..dfc1d9d 100644
--- a/lib/lp/snappy/configure.zcml
+++ b/lib/lp/snappy/configure.zcml
@@ -35,11 +35,11 @@
handler="lp.snappy.model.snap.snap_modified" />
<!-- SnapSet -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snap.SnapSet"
provides="lp.snappy.interfaces.snap.ISnapSet">
<allow interface="lp.snappy.interfaces.snap.ISnapSet" />
- </securedutility>
+ </lp:securedutility>
<!-- SnapSubscription -->
@@ -60,12 +60,12 @@
</class>
<!-- SnapStoreSecretsEncryptedContainer -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snap.SnapStoreSecretsEncryptedContainer"
provides="lp.services.crypto.interfaces.IEncryptedContainer"
name="snap-store-secrets">
<allow interface="lp.services.crypto.interfaces.IEncryptedContainer"/>
- </securedutility>
+ </lp:securedutility>
<!-- SnapBuild -->
<class class="lp.snappy.model.snapbuild.SnapBuild">
@@ -89,25 +89,25 @@
handler="lp.snappy.subscribers.snapbuild.snap_build_status_changed" />
<!-- SnapBuildSet -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snapbuild.SnapBuildSet"
provides="lp.snappy.interfaces.snapbuild.ISnapBuildSet">
<allow interface="lp.snappy.interfaces.snapbuild.ISnapBuildSet" />
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.snappy.model.snapbuild.SnapBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="SNAPBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- SnapBuildMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snapbuild.SnapBuildMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="snap-build">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- SnapBuildBehaviour -->
<adapter
@@ -144,7 +144,7 @@
</class>
<!-- SnappySeriesSet -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snappyseries.SnappySeriesSet"
provides="lp.snappy.interfaces.snappyseries.ISnappySeriesSet">
<allow
@@ -152,15 +152,15 @@
<require
permission="launchpad.Edit"
interface="lp.snappy.interfaces.snappyseries.ISnappySeriesSetEdit" />
- </securedutility>
+ </lp:securedutility>
<!-- SnappyDistroSeriesSet -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snappyseries.SnappyDistroSeriesSet"
provides="lp.snappy.interfaces.snappyseries.ISnappyDistroSeriesSet">
<allow
interface="lp.snappy.interfaces.snappyseries.ISnappyDistroSeriesSet" />
- </securedutility>
+ </lp:securedutility>
<!-- Bases for snaps -->
<class class="lp.snappy.model.snapbase.SnapBase">
@@ -172,7 +172,7 @@
interface="lp.snappy.interfaces.snapbase.ISnapBaseEdit"
set_schema="lp.snappy.interfaces.snapbase.ISnapBaseEditableAttributes" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snapbase.SnapBaseSet"
provides="lp.snappy.interfaces.snapbase.ISnapBaseSet">
<allow
@@ -180,24 +180,24 @@
<require
permission="launchpad.Edit"
interface="lp.snappy.interfaces.snapbase.ISnapBaseSetEdit" />
- </securedutility>
+ </lp:securedutility>
<!-- Store interaction -->
- <securedutility
+ <lp:securedutility
class="lp.snappy.model.snapstoreclient.SnapStoreClient"
provides="lp.snappy.interfaces.snapstoreclient.ISnapStoreClient">
<allow interface="lp.snappy.interfaces.snapstoreclient.ISnapStoreClient" />
- </securedutility>
+ </lp:securedutility>
<!-- Snap-related jobs -->
<class class="lp.snappy.model.snapjob.SnapJob">
<allow interface="lp.snappy.interfaces.snapjob.ISnapJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.snappy.model.snapjob.SnapRequestBuildsJob"
provides="lp.snappy.interfaces.snapjob.ISnapRequestBuildsJobSource">
<allow interface="lp.snappy.interfaces.snapjob.ISnapRequestBuildsJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.model.snapjob.SnapRequestBuildsJob">
<allow interface="lp.snappy.interfaces.snapjob.ISnapJob" />
<allow interface="lp.snappy.interfaces.snapjob.ISnapRequestBuildsJob" />
@@ -205,11 +205,11 @@
<class class="lp.snappy.model.snapbuildjob.SnapBuildJob">
<allow interface="lp.snappy.interfaces.snapbuildjob.ISnapBuildJob" />
</class>
- <securedutility
+ <lp:securedutility
component="lp.snappy.model.snapbuildjob.SnapStoreUploadJob"
provides="lp.snappy.interfaces.snapbuildjob.ISnapStoreUploadJobSource">
<allow interface="lp.snappy.interfaces.snapbuildjob.ISnapStoreUploadJobSource" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.model.snapbuildjob.SnapStoreUploadJob">
<allow interface="lp.snappy.interfaces.snapbuildjob.ISnapBuildJob" />
<allow interface="lp.snappy.interfaces.snapbuildjob.ISnapStoreUploadJob" />
diff --git a/lib/lp/snappy/vocabularies.zcml b/lib/lp/snappy/vocabularies.zcml
index 4df0102..313a978 100644
--- a/lib/lp/snappy/vocabularies.zcml
+++ b/lib/lp/snappy/vocabularies.zcml
@@ -2,36 +2,38 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="SnapDistroArchSeries"
component="lp.snappy.vocabularies.SnapDistroArchSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.vocabularies.SnapDistroArchSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
</class>
- <securedutility
+ <lp:securedutility
name="SnappySeries"
component="lp.snappy.vocabularies.SnappySeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.vocabularies.SnappySeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
</class>
- <securedutility
+ <lp:securedutility
name="SnappyDistroSeries"
component="lp.snappy.vocabularies.SnappyDistroSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.vocabularies.SnappyDistroSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
@@ -42,12 +44,12 @@
lazr.restful.interfaces.IJSONPublishable" />
</class>
- <securedutility
+ <lp:securedutility
name="SnapStoreChannel"
component="lp.snappy.vocabularies.SnapStoreChannelVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory">
<allow interface="zope.schema.interfaces.IVocabularyFactory" />
- </securedutility>
+ </lp:securedutility>
<class class="lp.snappy.vocabularies.SnapStoreChannelVocabulary">
<allow interface="zope.schema.interfaces.IVocabularyTokenized" />
diff --git a/lib/lp/soyuz/configure.zcml b/lib/lp/soyuz/configure.zcml
index 0ea1e96..893878a 100644
--- a/lib/lp/soyuz/configure.zcml
+++ b/lib/lp/soyuz/configure.zcml
@@ -19,12 +19,12 @@
<!-- PackageCloner -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.packagecloner.PackageCloner"
provides="lp.soyuz.interfaces.packagecloner.IPackageCloner">
<allow
interface="lp.soyuz.interfaces.packagecloner.IPackageCloner"/>
- </securedutility>
+ </lp:securedutility>
<!-- BinaryPackagePublishingHistory -->
@@ -77,12 +77,12 @@
<allow
interface="lp.soyuz.interfaces.binarysourcereference.IBinarySourceReference"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.binarysourcereference.BinarySourceReferenceSet"
provides="lp.soyuz.interfaces.binarysourcereference.IBinarySourceReferenceSet">
<allow
interface="lp.soyuz.interfaces.binarysourcereference.IBinarySourceReferenceSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SourcePackagePublishingHistory -->
@@ -108,12 +108,12 @@
<allow
interface="lp.soyuz.interfaces.publishing.IPublishingSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.publishing.PublishingSet"
provides="lp.soyuz.interfaces.publishing.IPublishingSet">
<allow
interface="lp.soyuz.interfaces.publishing.IPublishingSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.soyuz.model.queue.PackageUploadQueue">
<implements
@@ -223,12 +223,12 @@
<!-- PackageUploadSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.queue.PackageUploadSet"
provides="lp.soyuz.interfaces.queue.IPackageUploadSet">
<allow
interface="lp.soyuz.interfaces.queue.IPackageUploadSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BinaryPackagename -->
@@ -240,12 +240,12 @@
<!-- BinaryPackageNameSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.binarypackagename.BinaryPackageNameSet"
provides="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet">
<allow
interface="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.soyuz.model.binarypackagename.BinaryPackageNameSet">
<allow
@@ -279,13 +279,13 @@
interface="lp.soyuz.interfaces.packagediff.IPackageDiffSet"
attributes="__len__"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.packagediff.PackageDiffSet"
provides="lp.soyuz.interfaces.packagediff.IPackageDiffSet">
<allow
interface="lp.soyuz.interfaces.packagediff.IPackageDiffSet"
attributes="__len__"/>
- </securedutility>
+ </lp:securedutility>
<!-- ArchiveAuthToken -->
@@ -302,12 +302,12 @@
<!-- ArchiveAuthTokenSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.archiveauthtoken.ArchiveAuthTokenSet"
provides="lp.soyuz.interfaces.archiveauthtoken.IArchiveAuthTokenSet">
<allow
interface="lp.soyuz.interfaces.archiveauthtoken.IArchiveAuthTokenSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- DistributionSourcePackageCache -->
<class
@@ -404,12 +404,12 @@
<allow
interface="lp.soyuz.interfaces.archive.IArchiveSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.archive.ArchiveSet"
provides="lp.soyuz.interfaces.archive.IArchiveSet">
<allow
interface="lp.soyuz.interfaces.archive.IArchiveSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ArchiveFile -->
@@ -422,42 +422,42 @@
<class class="lp.soyuz.model.archivefile.ArchiveFileSet">
<allow interface="lp.soyuz.interfaces.archivefile.IArchiveFileSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.archivefile.ArchiveFileSet"
provides="lp.soyuz.interfaces.archivefile.IArchiveFileSet">
<allow interface="lp.soyuz.interfaces.archivefile.IArchiveFileSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- ArchiveJob -->
<class class="lp.soyuz.model.archivejob.ArchiveJob">
<allow interface="lp.soyuz.interfaces.archivejob.IArchiveJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.soyuz.model.archivejob.ArchiveJob"
provides="lp.soyuz.interfaces.archivejob.IArchiveJobSource">
<allow interface="lp.soyuz.interfaces.archivejob.IArchiveJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.model.archivejob.PackageUploadNotificationJob">
<allow interface="lp.soyuz.interfaces.archivejob.IArchiveJob"/>
<allow interface="lp.soyuz.interfaces.archivejob.IPackageUploadNotificationJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.soyuz.model.archivejob.PackageUploadNotificationJob"
provides="lp.soyuz.interfaces.archivejob.IPackageUploadNotificationJobSource">
<allow interface="lp.soyuz.interfaces.archivejob.IPackageUploadNotificationJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.model.archivejob.CIBuildUploadJob">
<allow interface="lp.soyuz.interfaces.archivejob.IArchiveJob"/>
<allow interface="lp.soyuz.interfaces.archivejob.ICIBuildUploadJob"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.soyuz.model.archivejob.CIBuildUploadJob"
provides="lp.soyuz.interfaces.archivejob.ICIBuildUploadJobSource">
<allow interface="lp.soyuz.interfaces.archivejob.ICIBuildUploadJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- ArchivePermission -->
@@ -474,12 +474,12 @@
<implements
interface="lp.soyuz.interfaces.archivepermission.IArchivePermissionSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.archivepermission.ArchivePermissionSet"
provides="lp.soyuz.interfaces.archivepermission.IArchivePermissionSet">
<allow
interface="lp.soyuz.interfaces.archivepermission.IArchivePermissionSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- BinaryPackageBuild -->
@@ -507,27 +507,27 @@
<!-- BinaryPackageBuildSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.binarypackagebuild.BinaryPackageBuildSet"
provides="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildSet">
<allow
interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.soyuz.model.binarypackagebuild.BinaryPackageBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="PACKAGEBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- BinaryPackageBuildMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.binarypackagebuild.BinaryPackageBuildMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="binary-package-build">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- DistroArchSeriesBinaryPackage -->
@@ -557,7 +557,7 @@
<!-- ArchiveSubscriberSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.archivesubscriber.ArchiveSubscriberSet"
provides="lp.soyuz.interfaces.archivesubscriber.IArchiveSubscriberSet">
<allow
@@ -565,7 +565,7 @@
<require
permission="launchpad.Admin"
interface="lp.soyuz.interfaces.archivesubscriber.IArchiveSubscriberSetAdmin"/>
- </securedutility>
+ </lp:securedutility>
<!-- PersonalArchiveSubscription -->
@@ -663,12 +663,12 @@
permission="launchpad.Edit"
interface="lp.soyuz.interfaces.distroarchseriesfilter.IDistroArchSeriesFilterEdit" />
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.distroarchseriesfilter.DistroArchSeriesFilterSet"
provides="lp.soyuz.interfaces.distroarchseriesfilter.IDistroArchSeriesFilterSet">
<allow
interface="lp.soyuz.interfaces.distroarchseriesfilter.IDistroArchSeriesFilterSet" />
- </securedutility>
+ </lp:securedutility>
<subscriber
for="lp.soyuz.interfaces.distroarchseriesfilter.IDistroArchSeriesFilter
lazr.lifecycle.interfaces.IObjectModifiedEvent"
@@ -697,12 +697,12 @@
<allow
interface="lp.soyuz.interfaces.component.IComponentSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.component.ComponentSet"
provides="lp.soyuz.interfaces.component.IComponentSet">
<allow
interface="lp.soyuz.interfaces.component.IComponentSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Section -->
@@ -727,12 +727,12 @@
<allow
interface="lp.soyuz.interfaces.section.ISectionSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.section.SectionSet"
provides="lp.soyuz.interfaces.section.ISectionSet">
<allow
interface="lp.soyuz.interfaces.section.ISectionSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SourcePackageFormatSelection -->
@@ -749,12 +749,12 @@
<allow
interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelectionSet"
provides="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet">
<allow
interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- SourcePackageReleaseFile -->
@@ -799,14 +799,14 @@
<implements
interface="lp.soyuz.interfaces.packageset.IPackagesetSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.packageset.PackagesetSet"
provides="lp.soyuz.interfaces.packageset.IPackagesetSet">
<allow interface=".interfaces.packageset.IPackagesetSet" />
<require
permission="launchpad.Edit"
interface=".interfaces.packageset.IPackagesetSetEdit" />
- </securedutility>
+ </lp:securedutility>
<!-- PackagesetGroup -->
<class
@@ -850,13 +850,13 @@
<allow interface="lp.services.webapp.vocabulary.ICountableIterator" />
</class>
- <securedutility
+ <lp:securedutility
name="BinaryAndSourcePackageName"
component="lp.soyuz.model.binaryandsourcepackagename.BinaryAndSourcePackageNameVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.model.binaryandsourcepackagename.BinaryAndSourcePackageNameVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
@@ -868,38 +868,38 @@
</class>
<!-- InitializeDistroSeriesJobSource -->
- <securedutility
+ <lp:securedutility
component="lp.soyuz.model.initializedistroseriesjob.InitializeDistroSeriesJob"
provides="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJobSource">
<allow interface="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.model.initializedistroseriesjob.InitializeDistroSeriesJob">
<allow interface="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJob" />
<allow interface="lp.soyuz.interfaces.distributionjob.IDistributionJob" />
</class>
<!-- DistroSeriesDifferenceJobSource -->
- <securedutility
+ <lp:securedutility
component="lp.soyuz.model.distroseriesdifferencejob.DistroSeriesDifferenceJob"
provides="lp.soyuz.interfaces.distributionjob.IDistroSeriesDifferenceJobSource">
<allow interface="lp.soyuz.interfaces.distributionjob.IDistroSeriesDifferenceJobSource"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.model.distroseriesdifferencejob.DistroSeriesDifferenceJob">
<allow interface="lp.soyuz.interfaces.distributionjob.IDistroSeriesDifferenceJob" />
<allow interface="lp.soyuz.interfaces.distributionjob.IDistributionJob" />
</class>
<!-- PackageCopyJobSource -->
- <securedutility
+ <lp:securedutility
component=".model.packagecopyjob.PackageCopyJob"
provides=".interfaces.packagecopyjob.IPackageCopyJobSource">
<allow interface=".interfaces.packagecopyjob.IPackageCopyJobSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component=".model.packagecopyjob.PlainPackageCopyJob"
provides=".interfaces.packagecopyjob.IPlainPackageCopyJobSource">
<allow interface=".interfaces.packagecopyjob.IPlainPackageCopyJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- PackageCopyJob -->
<class class=".model.packagecopyjob.PackageCopyJob">
@@ -933,11 +933,11 @@
factory="lp.soyuz.adapters.copypolicy.get_icopypolicy_for_packagecopypolicy"/>
<!-- PackageCopyRequestSet -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.packagecopyrequest.PackageCopyRequestSet"
provides="lp.soyuz.interfaces.packagecopyrequest.IPackageCopyRequestSet">
<allow interface="lp.soyuz.interfaces.packagecopyrequest.IPackageCopyRequestSet" />
- </securedutility>
+ </lp:securedutility>
<!-- PackageCopyRequest -->
@@ -982,11 +982,11 @@
</class>
<!-- ProcessAcceptedBugsJobSource -->
- <securedutility
+ <lp:securedutility
component=".model.processacceptedbugsjob.ProcessAcceptedBugsJob"
provides=".interfaces.processacceptedbugsjob.IProcessAcceptedBugsJobSource">
<allow interface=".interfaces.processacceptedbugsjob.IProcessAcceptedBugsJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- ProcessAcceptedBugsJob -->
<class class=".model.processacceptedbugsjob.ProcessAcceptedBugsJob">
@@ -994,11 +994,11 @@
</class>
<!-- PackageDiffJobSource -->
- <securedutility
+ <lp:securedutility
component=".model.packagediffjob.PackageDiffJob"
provides=".interfaces.packagediffjob.IPackageDiffJobSource">
<allow interface=".interfaces.packagediffjob.IPackageDiffJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- PackageDiffJob -->
<class class=".model.packagediffjob.PackageDiffJob">
@@ -1006,11 +1006,11 @@
</class>
<!-- PackageTranslationsUploadJobSource -->
- <securedutility
+ <lp:securedutility
component=".model.packagetranslationsuploadjob.PackageTranslationsUploadJob"
provides=".interfaces.packagetranslationsuploadjob.IPackageTranslationsUploadJobSource">
<allow interface=".interfaces.packagetranslationsuploadjob.IPackageTranslationsUploadJobSource" />
- </securedutility>
+ </lp:securedutility>
<!-- PackageTranslationsUploadJob -->
<class class=".model.packagetranslationsuploadjob.PackageTranslationsUploadJob">
@@ -1042,11 +1042,11 @@
handler=".model.livefs.livefs_modified"/>
<!-- LiveFSSet -->
- <securedutility
+ <lp:securedutility
class=".model.livefs.LiveFSSet"
provides=".interfaces.livefs.ILiveFSSet">
<allow interface=".interfaces.livefs.ILiveFSSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- LiveFSBuild -->
<class class=".model.livefsbuild.LiveFSBuild">
@@ -1070,25 +1070,25 @@
handler="lp.soyuz.subscribers.livefsbuild.livefs_build_status_changed" />
<!-- LiveFSBuildSet -->
- <securedutility
+ <lp:securedutility
class=".model.livefsbuild.LiveFSBuildSet"
provides=".interfaces.livefsbuild.ILiveFSBuildSet">
<allow interface=".interfaces.livefsbuild.ILiveFSBuildSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class=".model.livefsbuild.LiveFSBuildSet"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="LIVEFSBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- LiveFSBuildMacaroonIssuer -->
- <securedutility
+ <lp:securedutility
class="lp.soyuz.model.livefsbuild.LiveFSBuildMacaroonIssuer"
provides="lp.services.macaroons.interfaces.IMacaroonIssuer"
name="livefs-build">
<allow interface="lp.services.macaroons.interfaces.IMacaroonIssuerPublic"/>
- </securedutility>
+ </lp:securedutility>
<!-- LiveFSBuildBehaviour -->
<adapter
diff --git a/lib/lp/soyuz/vocabularies.zcml b/lib/lp/soyuz/vocabularies.zcml
index 2b8a80b..95c78c2 100644
--- a/lib/lp/soyuz/vocabularies.zcml
+++ b/lib/lp/soyuz/vocabularies.zcml
@@ -2,54 +2,56 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="Component"
component="lp.soyuz.vocabularies.ComponentVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.vocabularies.ComponentVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FilteredDistroArchSeries"
component="lp.soyuz.vocabularies.FilteredDistroArchSeriesVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.vocabularies.FilteredDistroArchSeriesVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="PackageRelease"
component="lp.soyuz.vocabularies.PackageReleaseVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.vocabularies.PackageReleaseVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="PPA"
component="lp.soyuz.vocabularies.PPAVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.soyuz.vocabularies.PPAVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/testopenid/configure.zcml b/lib/lp/testopenid/configure.zcml
index b94cab7..6f0ade8 100644
--- a/lib/lp/testopenid/configure.zcml
+++ b/lib/lp/testopenid/configure.zcml
@@ -4,15 +4,15 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
xmlns:i18n="http://namespaces.zope.org/i18n";
+ xmlns:lp="http://namespaces.canonical.com/lp";
i18n_domain="launchpad">
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.TestOpenIDApplication"
provides="lp.testopenid.interfaces.server.ITestOpenIDApplication">
<allow interface="lp.testopenid.interfaces.server.ITestOpenIDApplication"/>
- </securedutility>
+ </lp:securedutility>
<class class=".adapters.openid.TestOpenIDPersistentIdentity">
<allow interface=".interfaces.server.ITestOpenIDPersistentIdentity" />
diff --git a/lib/lp/translations/configure.zcml b/lib/lp/translations/configure.zcml
index ebe5c40..976b994 100644
--- a/lib/lp/translations/configure.zcml
+++ b/lib/lp/translations/configure.zcml
@@ -37,12 +37,12 @@
<allow
interface="lp.translations.interfaces.potranslation.IPOTranslation"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.translations.model.vpoexport.VPOExportSet"
provides="lp.translations.interfaces.vpoexport.IVPOExportSet">
<allow
interface="lp.translations.interfaces.vpoexport.IVPOExportSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.vpoexport.VPOExport">
<allow
@@ -53,12 +53,12 @@
<allow
interface="lp.translations.interfaces.pomsgid.IPOMsgID"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.RosettaApplication"
provides="lp.translations.interfaces.translations.IRosettaApplication">
<allow
interface="lp.translations.interfaces.translations.IRosettaApplication"/>
- </securedutility>
+ </lp:securedutility>
<!-- TranslationsOverview -->
@@ -67,12 +67,12 @@
<allow
interface="lp.translations.interfaces.translationsoverview.ITranslationsOverview"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.translations.model.translationsoverview.TranslationsOverview"
provides="lp.translations.interfaces.translationsoverview.ITranslationsOverview">
<allow
interface="lp.translations.interfaces.translationsoverview.ITranslationsOverview"/>
- </securedutility>
+ </lp:securedutility>
<!-- ITranslationsPerson -->
@@ -94,12 +94,12 @@
<allow
interface="lp.translations.interfaces.translationcommonformat.ITranslationMessageData"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.translations.utilities.translation_export.TranslationExporter"
provides="lp.translations.interfaces.translationexporter.ITranslationExporter">
<allow
interface="lp.translations.interfaces.translationexporter.ITranslationExporter"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.utilities.translation_export.ExportedTranslationFile">
<allow
@@ -164,12 +164,12 @@
<!-- TranslatorSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.translator.TranslatorSet"
provides="lp.translations.interfaces.translator.ITranslatorSet">
<allow
interface="lp.translations.interfaces.translator.ITranslatorSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Translator -->
@@ -198,13 +198,13 @@
<!-- TranslationImportQueue -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.translationimportqueue.TranslationImportQueue"
provides="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue">
<allow
interface="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
attributes="__len__"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.pofiletranslator.POFileTranslator">
<allow
@@ -215,12 +215,12 @@
<allow
interface="lp.translations.interfaces.pofiletranslator.IPOFileTranslatorSet"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.translations.model.pofiletranslator.POFileTranslatorSet"
provides="lp.translations.interfaces.pofiletranslator.IPOFileTranslatorSet">
<allow
interface="lp.translations.interfaces.pofiletranslator.IPOFileTranslatorSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- Subscribers to registry objects -->
@@ -249,18 +249,18 @@
<!-- DistroSeriesLanguageSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.distroserieslanguage.DistroSeriesLanguageSet"
provides="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguageSet">
<allow
interface="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguageSet"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
class="lp.translations.utilities.translation_import.TranslationImporter"
provides="lp.translations.interfaces.translationimporter.ITranslationImporter">
<allow
interface="lp.translations.interfaces.translationimporter.ITranslationImporter"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.utilities.gettext_po_parser.POHeader">
<allow
@@ -328,12 +328,12 @@
<!-- POFileSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.pofile.POFileSet"
provides="lp.translations.interfaces.pofile.IPOFileSet">
<allow
interface="lp.translations.interfaces.pofile.IPOFileSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.translationtemplateitem.TranslationTemplateItem">
<allow
@@ -357,12 +357,12 @@
<!-- ProductSeriesLanguageSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.productserieslanguage.ProductSeriesLanguageSet"
provides="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguageSet">
<allow
interface="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguageSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- TranslatedLanguage -->
<class
@@ -410,12 +410,12 @@
<!-- POTemplateSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.potemplate.POTemplateSet"
provides="lp.translations.interfaces.potemplate.IPOTemplateSet">
<allow
interface="lp.translations.interfaces.potemplate.IPOTemplateSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.potemplate.POTemplateSubset">
<require
@@ -448,12 +448,12 @@
<!-- TranslationGroupSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.translationgroup.TranslationGroupSet"
provides="lp.translations.interfaces.translationgroup.ITranslationGroupSet">
<allow
interface="lp.translations.interfaces.translationgroup.ITranslationGroupSet"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.IBreadcrumb"
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
@@ -485,12 +485,12 @@
<!-- LanguagePackSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.languagepack.LanguagePackSet"
provides="lp.translations.interfaces.languagepack.ILanguagePackSet">
<allow
interface="lp.translations.interfaces.languagepack.ILanguagePackSet"/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.translationmessage.TranslationMessage">
<allow
@@ -511,20 +511,20 @@
<!-- TranslationMessageSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.translationmessage.TranslationMessageSet"
provides="lp.translations.interfaces.translationmessage.ITranslationMessageSet">
<allow
interface="lp.translations.interfaces.translationmessage.ITranslationMessageSet"/>
- </securedutility>
+ </lp:securedutility>
<!-- CurrentTranslations -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.currenttranslations.CurrentTranslations"
provides="lp.translations.interfaces.currenttranslations.ICurrentTranslations">
<allow
interface="lp.translations.interfaces.currenttranslations.ICurrentTranslations"/>
- </securedutility>
+ </lp:securedutility>
<!-- TranslationSideTraits -->
<class class="lp.translations.model.side.TranslationSideTraits">
@@ -532,12 +532,12 @@
</class>
<!-- TranslationSideTraitsSet -->
- <securedutility
+ <lp:securedutility
class="lp.translations.model.side.TranslationSideTraitsSet"
provides="lp.translations.interfaces.side.ITranslationSideTraitsSet">
<allow
interface="lp.translations.interfaces.side.ITranslationSideTraitsSet"/>
- </securedutility>
+ </lp:securedutility>
<adapter
provides="lp.services.webapp.interfaces.IBreadcrumb"
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
@@ -548,20 +548,20 @@
<allow
interface="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"/>
</class>
- <securedutility
+ <lp:securedutility
class="lp.translations.model.poexportrequest.POExportRequestSet"
provides="lp.translations.interfaces.poexportrequest.IPOExportRequestSet">
<allow
interface="lp.translations.interfaces.poexportrequest.IPOExportRequestSet"/>
- </securedutility>
+ </lp:securedutility>
- <securedutility
+ <lp:securedutility
component='lp.translations.model.translationpackagingjob.TranslationPackagingJob'
provides='lp.translations.interfaces.translationpackagingjob.ITranslationPackagingJobSource'
>
<allow
interface='lp.translations.interfaces.translationpackagingjob.ITranslationPackagingJobSource'/>
- </securedutility>
+ </lp:securedutility>
<class
class="lp.translations.model.translationpackagingjob.TranslationMergeJob">
<allow interface='lp.services.job.interfaces.job.IRunnableJob'/>
@@ -580,17 +580,17 @@
class="lp.translations.model.translationtemplatesbuild.TranslationTemplatesBuild">
<require permission="launchpad.View" interface="lp.translations.interfaces.translationtemplatesbuild.ITranslationTemplatesBuild"/>
</class>
- <securedutility
+ <lp:securedutility
component="lp.translations.model.translationtemplatesbuild.TranslationTemplatesBuild"
provides="lp.translations.interfaces.translationtemplatesbuild.ITranslationTemplatesBuildSource">
<allow interface="lp.translations.interfaces.translationtemplatesbuild.ITranslationTemplatesBuildSource"/>
- </securedutility>
- <securedutility
+ </lp:securedutility>
+ <lp:securedutility
component="lp.translations.model.translationtemplatesbuild.TranslationTemplatesBuild"
provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
name="TRANSLATIONTEMPLATESBUILD">
<allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"/>
- </securedutility>
+ </lp:securedutility>
<!-- TranslationTemplateBuildBehaviour -->
<class
diff --git a/lib/lp/translations/vocabularies.zcml b/lib/lp/translations/vocabularies.zcml
index 92b2f32..cfcc220 100644
--- a/lib/lp/translations/vocabularies.zcml
+++ b/lib/lp/translations/vocabularies.zcml
@@ -2,93 +2,95 @@
GNU Affero General Public License version 3 (see the file LICENSE).
-->
-<configure xmlns="http://namespaces.zope.org/zope";>
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:lp="http://namespaces.canonical.com/lp";>
- <securedutility
+ <lp:securedutility
name="FilteredDeltaLanguagePack"
component="lp.translations.vocabularies.FilteredDeltaLanguagePackVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.FilteredDeltaLanguagePackVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FilteredFullLanguagePack"
component="lp.translations.vocabularies.FilteredFullLanguagePackVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.FilteredFullLanguagePackVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="FilteredLanguagePack"
component="lp.translations.vocabularies.FilteredLanguagePackVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.FilteredLanguagePackVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TranslatableLanguage"
component="lp.translations.vocabularies.TranslatableLanguageVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.TranslatableLanguageVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TranslationGroup"
component="lp.translations.vocabularies.TranslationGroupVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.TranslationGroupVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TranslationMessage"
component="lp.translations.vocabularies.TranslationMessageVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.TranslationMessageVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
</class>
- <securedutility
+ <lp:securedutility
name="TranslationTemplate"
component="lp.translations.vocabularies.TranslationTemplateVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory"
>
<allow interface="zope.schema.interfaces.IVocabularyFactory"/>
- </securedutility>
+ </lp:securedutility>
<class class="lp.translations.vocabularies.TranslationTemplateVocabulary">
<allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
diff --git a/lib/lp/xmlrpc/configure.zcml b/lib/lp/xmlrpc/configure.zcml
index a0ed00d..ea1d861 100644
--- a/lib/lp/xmlrpc/configure.zcml
+++ b/lib/lp/xmlrpc/configure.zcml
@@ -4,15 +4,15 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
+ xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
>
- <securedutility
+ <lp:securedutility
class="lp.xmlrpc.application.PrivateApplication"
provides="lp.xmlrpc.interfaces.IPrivateApplication">
<allow interface="lp.xmlrpc.interfaces.IPrivateApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.services.webapp.interfaces.ILaunchpadRoot"
@@ -21,11 +21,11 @@
permission="zope.Public"
/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.ArchiveApplication"
provides="lp.soyuz.interfaces.archiveapi.IArchiveApplication">
<allow interface="lp.soyuz.interfaces.archiveapi.IArchiveApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.soyuz.interfaces.archiveapi.IArchiveApplication"
@@ -34,11 +34,11 @@
permission="zope.Public"
/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.CodehostingApplication"
provides="lp.code.interfaces.codehosting.ICodehostingApplication">
<allow interface="lp.code.interfaces.codehosting.ICodehostingApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.code.interfaces.codehosting.ICodehostingApplication"
@@ -47,11 +47,11 @@
permission="zope.Public"
/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.CodeImportSchedulerApplication"
provides="lp.code.interfaces.codeimportscheduler.ICodeImportSchedulerApplication">
<allow interface="lp.code.interfaces.codeimportscheduler.ICodeImportSchedulerApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.code.interfaces.codeimportscheduler.ICodeImportSchedulerApplication"
@@ -60,11 +60,11 @@
permission="zope.Public"
/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.GitApplication"
provides="lp.code.interfaces.gitapi.IGitApplication">
<allow interface="lp.code.interfaces.gitapi.IGitApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.code.interfaces.gitapi.IGitApplication"
@@ -73,11 +73,11 @@
permission="zope.Public"
/>
- <securedutility
+ <lp:securedutility
class="lp.systemhomes.PrivateMaloneApplication"
provides="lp.bugs.interfaces.malone.IPrivateMaloneApplication">
<allow interface="lp.bugs.interfaces.malone.IPrivateMaloneApplication"/>
- </securedutility>
+ </lp:securedutility>
<xmlrpc:view
for="lp.bugs.interfaces.malone.IPrivateMaloneApplication"
