Colin Watson has proposed merging ~cjwatson/launchpad:zcml-namespaces-facet into launchpad:master.
Commit message: Move ZCML facet directive to lp namespace Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/437432 As with commit 57196c1d6a220f00039e027768cc05368135f556, it makes sense to move our local `facet` directive to our own namespace rather than poking it into the Zope namespace. -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:zcml-namespaces-facet into launchpad:master.
diff --git a/lib/lp/answers/browser/configure.zcml b/lib/lp/answers/browser/configure.zcml index bdf02dc..b3ad929 100644 --- a/lib/lp/answers/browser/configure.zcml +++ b/lib/lp/answers/browser/configure.zcml @@ -8,7 +8,7 @@ xmlns:i18n="http://namespaces.zope.org/i18n"; xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> -<facet facet="answers"> +<lp:facet facet="answers"> <!-- Because of Zope issue #754, defaultView still needs to be added for specific content object that also provides @@ -500,6 +500,6 @@ name="+restricted-membership" permission="zope.Public" /> -</facet> +</lp:facet> </configure> diff --git a/lib/lp/app/browser/configure.zcml b/lib/lp/app/browser/configure.zcml index 3d335d3..9391c39 100644 --- a/lib/lp/app/browser/configure.zcml +++ b/lib/lp/app/browser/configure.zcml @@ -150,7 +150,7 @@ permission="zope.Public" /> - <facet facet="overview"> + <lp:facet facet="overview"> <!-- Common menus --> <lp:menus module="lp.app.browser.launchpad" @@ -266,7 +266,7 @@ class="lp.app.browser.launchpad.LoginStatus" permission="zope.Public" /> - </facet> + </lp:facet> <!-- Error pages --> <!-- System Errors --> diff --git a/lib/lp/blueprints/browser/configure.zcml b/lib/lp/blueprints/browser/configure.zcml index 7bd361f..acf2c40 100644 --- a/lib/lp/blueprints/browser/configure.zcml +++ b/lib/lp/blueprints/browser/configure.zcml @@ -221,7 +221,7 @@ for="lp.blueprints.interfaces.sprintattendance.ISprintAttendance" path_expression="string:${attendee/name}" attribute_to_parent="sprint"/> - <facet + <lp:facet facet="specifications"> <lp:url for="lp.blueprints.interfaces.specificationbranch.ISpecificationBranch" @@ -641,7 +641,7 @@ permission="zope.Public" name="+upcomingwork" template="../templates/person-upcomingwork.pt"/> - </facet> + </lp:facet> <browser:defaultView diff --git a/lib/lp/bugs/browser/configure.zcml b/lib/lp/bugs/browser/configure.zcml index d2bf3cf..beeef02 100644 --- a/lib/lp/bugs/browser/configure.zcml +++ b/lib/lp/bugs/browser/configure.zcml @@ -13,7 +13,7 @@ module="lp.bugs.feed.bug" classes="BugFeed BugTargetBugsFeed PersonBugsFeed SearchBugsFeed" /> - <facet + <lp:facet facet="bugs"> <browser:page for="lp.bugs.interfaces.bugtarget.IHasBugs" @@ -1166,7 +1166,7 @@ template="../templates/bugs-listing-table-without-navlinks.pt" permission="zope.Public" /> - </facet> + </lp:facet> <browser:defaultView for="lp.registry.interfaces.distribution.IDistribution" layer="lp.bugs.publisher.BugsLayer" diff --git a/lib/lp/charms/browser/configure.zcml b/lib/lp/charms/browser/configure.zcml index 4b4dbac..ab546ee 100644 --- a/lib/lp/charms/browser/configure.zcml +++ b/lib/lp/charms/browser/configure.zcml @@ -8,7 +8,7 @@ xmlns:i18n="http://namespaces.zope.org/i18n"; xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> - <facet facet="overview"> + <lp:facet facet="overview"> <lp:url for="lp.charms.interfaces.charmrecipe.ICharmRecipe" urldata="lp.charms.browser.charmrecipe.CharmRecipeURL" /> @@ -173,5 +173,5 @@ permission="launchpad.View" name="+charm-recipes" template="../templates/charmrecipe-listing.pt" /> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/code/browser/configure.zcml b/lib/lp/code/browser/configure.zcml index ba11a5f..7f7b332 100644 --- a/lib/lp/code/browser/configure.zcml +++ b/lib/lp/code/browser/configure.zcml @@ -27,7 +27,7 @@ <include package=".widgets"/> - <facet facet="branches"> + <lp:facet facet="branches"> <browser:defaultView for="lp.registry.interfaces.product.IProductSet" @@ -1469,6 +1469,6 @@ factory="lp.services.webapp.breadcrumb.TitleBreadcrumb" permission="zope.Public" /> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/coop/answersbugs/configure.zcml b/lib/lp/coop/answersbugs/configure.zcml index 701481f..58a081c 100644 --- a/lib/lp/coop/answersbugs/configure.zcml +++ b/lib/lp/coop/answersbugs/configure.zcml @@ -6,8 +6,9 @@ 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"> -<facet facet="answers"> +<lp:facet facet="answers"> <subscriber for="lp.bugs.interfaces.bugtask.IBugTask @@ -54,5 +55,5 @@ template="templates/question-unlinkbugs.pt" /> -</facet> +</lp:facet> </configure> diff --git a/lib/lp/oci/browser/configure.zcml b/lib/lp/oci/browser/configure.zcml index acfd769..f484422 100644 --- a/lib/lp/oci/browser/configure.zcml +++ b/lib/lp/oci/browser/configure.zcml @@ -8,7 +8,7 @@ xmlns:i18n="http://namespaces.zope.org/i18n"; xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> - <facet facet="overview"> + <lp:facet facet="overview"> <lp:url for="lp.oci.interfaces.ocirecipe.IOCIRecipe" path_expression="string:${oci_project/pillar/name}/+oci/${oci_project/name}/+recipe/${name}" @@ -181,5 +181,5 @@ path_expression="string:+subscription/${person/name}" attribute_to_parent="recipe" rootsite="code"/> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml index 2f477ef..fc7b805 100644 --- a/lib/lp/registry/browser/configure.zcml +++ b/lib/lp/registry/browser/configure.zcml @@ -43,7 +43,7 @@ path_expression="string:${name}" parent_utility="lp.app.interfaces.services.IServiceFactory"/> - <facet facet="overview"> + <lp:facet facet="overview"> <browser:page name="+grantee-table-view" for="lp.services.webapp.interfaces.IBatchNavigator" @@ -385,7 +385,7 @@ attribute_to_parent="person" rootsite="api" /> - <facet + <lp:facet facet="answers"> <browser:page name="+addquestion" @@ -405,7 +405,7 @@ class="lp.answers.browser.questiontarget.AskAQuestionButtonPortlet" permission="zope.Public" /> - </facet> + </lp:facet> <lp:navigation module="lp.registry.browser.project" classes=" @@ -2683,7 +2683,7 @@ rootsite="api" attribute_to_parent="owner" /> - </facet> + </lp:facet> <adapter factory="lp.registry.browser.distroseriesdifference.get_message" provides="lp.services.messages.interfaces.message.IMessage" diff --git a/lib/lp/services/oauth/browser/configure.zcml b/lib/lp/services/oauth/browser/configure.zcml index 83867d7..544d62a 100644 --- a/lib/lp/services/oauth/browser/configure.zcml +++ b/lib/lp/services/oauth/browser/configure.zcml @@ -5,9 +5,9 @@ <configure xmlns="http://namespaces.zope.org/zope"; xmlns:browser="http://namespaces.zope.org/browser"; - xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"; + xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> - <facet facet="overview"> + <lp:facet facet="overview"> <browser:page for="lp.services.webapp.interfaces.ILaunchpadApplication" name="+request-token" @@ -26,5 +26,5 @@ name="+access-token" class="lp.services.oauth.browser.OAuthAccessTokenView" permission="zope.Public" /> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/services/verification/browser/configure.zcml b/lib/lp/services/verification/browser/configure.zcml index a65e96e..2bb9e31 100644 --- a/lib/lp/services/verification/browser/configure.zcml +++ b/lib/lp/services/verification/browser/configure.zcml @@ -9,7 +9,7 @@ path_expression="string:token" parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> - <facet + <lp:facet facet="overview"> <browser:defaultView for="lp.services.verification.interfaces.logintoken.ILoginToken" @@ -69,5 +69,5 @@ module="lp.services.verification.browser.logintoken" classes=" LoginTokenSetNavigation"/> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/services/verification/configure.zcml b/lib/lp/services/verification/configure.zcml index 20378a5..9ed6254 100644 --- a/lib/lp/services/verification/configure.zcml +++ b/lib/lp/services/verification/configure.zcml @@ -5,7 +5,7 @@ i18n_domain="launchpad"> <include package=".browser"/> - <facet + <lp:facet facet="overview"> <!-- LoginToken --> @@ -30,5 +30,5 @@ <allow interface="lp.services.verification.interfaces.logintoken.ILoginTokenSet"/> </lp:securedutility> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/services/webapp/doc/zcmldirectives.rst b/lib/lp/services/webapp/doc/zcmldirectives.rst index ec7708e..28955aa 100644 --- a/lib/lp/services/webapp/doc/zcmldirectives.rst +++ b/lib/lp/services/webapp/doc/zcmldirectives.rst @@ -282,10 +282,11 @@ Next, a functional/integration test of the overridden directive. ... """ ... <configure xmlns="http://namespaces.zope.org/zope"; ... xmlns:browser="http://namespaces.zope.org/browser"; - ... package="lp.services"> + ... xmlns:lp="http://namespaces.canonical.com/lp"; + ... package="lp.services"> ... <include file="webapp/meta.zcml" /> ... <include file="webapp/meta-overrides.zcml" /> - ... <facet facet="whole-facet"> + ... <lp:facet facet="whole-facet"> ... <browser:page ... for="lp.testing.IFoo" ... name="+impliedfacet" @@ -294,7 +295,7 @@ Next, a functional/integration test of the overridden directive. ... attribute="__call__" ... layer="lp.testing.IFooLayer" ... /> - ... </facet> + ... </lp:facet> ... </configure> ... """ ... ) diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml index 80bef75..79781c5 100644 --- a/lib/lp/services/webapp/meta.zcml +++ b/lib/lp/services/webapp/meta.zcml @@ -84,7 +84,7 @@ /> <groupingDirective - namespace="http://namespaces.zope.org/zope"; + namespace="http://namespaces.canonical.com/lp"; name="facet" schema="lp.services.webapp.metazcml.IGroupingFacet" handler="lp.services.webapp.metazcml.GroupingFacet" diff --git a/lib/lp/snappy/browser/configure.zcml b/lib/lp/snappy/browser/configure.zcml index 0cae381..4275b84 100644 --- a/lib/lp/snappy/browser/configure.zcml +++ b/lib/lp/snappy/browser/configure.zcml @@ -8,7 +8,7 @@ xmlns:i18n="http://namespaces.zope.org/i18n"; xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> - <facet facet="overview"> + <lp:facet facet="overview"> <lp:url for="lp.snappy.interfaces.snap.ISnap" urldata="lp.snappy.browser.snap.SnapURL" /> @@ -238,5 +238,5 @@ permission="launchpad.View" name="+snaps" template="../templates/snap-listing.pt" /> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/soyuz/browser/configure.zcml b/lib/lp/soyuz/browser/configure.zcml index 56bcd68..d8afeaf 100644 --- a/lib/lp/soyuz/browser/configure.zcml +++ b/lib/lp/soyuz/browser/configure.zcml @@ -13,7 +13,7 @@ path_expression="string:binarypackagenames" parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot" /> - <facet + <lp:facet facet="overview"> <browser:pages for="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistory" @@ -796,5 +796,5 @@ factory="lp.services.webapp.breadcrumb.TitleBreadcrumb" permission="zope.Public" /> - </facet> + </lp:facet> </configure> diff --git a/lib/lp/translations/browser/configure.zcml b/lib/lp/translations/browser/configure.zcml index 5b74e5d..b6c8cbc 100644 --- a/lib/lp/translations/browser/configure.zcml +++ b/lib/lp/translations/browser/configure.zcml @@ -8,7 +8,7 @@ xmlns:i18n="http://namespaces.zope.org/i18n"; xmlns:lp="http://namespaces.canonical.com/lp"; i18n_domain="launchpad"> -<facet facet="translations"> +<lp:facet facet="translations"> <lp:url for="lp.translations.interfaces.translations.IRosettaApplication" path_expression="string:translations" @@ -878,7 +878,7 @@ class="lp.translations.browser.customlanguagecode.CustomLanguageCodeAddView" template="../templates/customlanguagecode-add.pt" permission="launchpad.TranslationsAdmin"/> -</facet> +</lp:facet> <!-- TranslationTemplateBuild --> <browser:defaultView
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
