Merge lp:~thumper/launchpad/fix-browser-zcml into lp:launchpad

[Tim Penhey]

Limit most branch and review related views to be only on the code subdomain.

This branch adds layer='...' to most of the code browser zcml. There are several places where it is kept off though, like the views needed to show merge proposal info on the bugs domain.

In order to avoid having to pass layer=CodeLayer to the create_initialized_view test helper, I updated it so it could get a rootsite string passed in instead, and it would try to work that out from the canonical url data of the context object so in most cases even that isn't needed.

tests:
  everything code related (everything passes in ec2 right now)

[Paul Hummer (rockstar)]

<mwhudson> 7 >>> canonical_url(getUtility(IBazaarApplication))
<mwhudson> 8 - u'http://launchpad.dev/+code'
<mwhudson> 9 + u'http://code.launchpad.dev/+code'
<mwhudson> the +code there is freaking odd really
<mwhudson> i wonder if it would actually be better to have the root objects be different for each publication
<thumper> mwhudson: probably
<thumper> mwhudson: but somewhat out of scope for this change
<rockstar> thumper, holy balls that's a big diff...
<mwhudson> thumper: yes
<thumper> rockstar: but boring
<rockstar> thumper, might I make a suggestion for the next time?
<thumper> yes
<thumper> rockstar: don't do them all at once?
<rockstar> thumper, yes, for the love of Odin, yes.
<thumper> :)
<rockstar> thumper, here's an example: line 1640-1641 of the diff doesn't look to be along the same lines as the rest of the changes in the branch.
<rockstar> Actually, 1635-1665...
<thumper> rockstar: :)
<thumper> yes, I removed a chunk of code that was showing bad data
<thumper> the person that wrote it thought it was showing the number of new revisions this month for that branch
<thumper> but what it was showing was the number of revisions on all branches this month
<rockstar> thumper, the change makes sense. I just think it would be better to not get lumped in with something that's supposed to be just technical debt.
<rockstar> Is there a bug filed for that change?
<thumper> no
<rockstar> thumper, I think there should be.
* thumper nods

review: Approve

=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-07-19 11:58:01 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-08-24 02:26:48 +0000
@@ -39,7 +39,7 @@
 The Bazaar homepage.
 
     >>> canonical_url(getUtility(IBazaarApplication))
-    u'http://launchpad.dev/+code'
+    u'http://code.launchpad.dev/+code'
 
 The Answer Tracker
 

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2010-01-22 22:29:42 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2010-08-24 02:26:48 +0000
@@ -103,7 +103,6 @@
 >>> check("/projectgroups/+all", auth=True)
 >>> check("/mozilla")
 >>> check("/mozilla/firefox")
->>> check("/mozilla/+branches")
 >>> check_redirect("/mozilla/+translations", status=301)
 >>> check("/mozilla/+translations", host='translations.launchpad.dev')
 
@@ -135,7 +134,6 @@
 
 >>> check_not_found("/firefox/+milestone")
 >>> check("/firefox/+milestone/1.0")
->>> check("/firefox/+branches")
 
 >>> check("/distros")
 >>> check("/distros/+add", auth=True)
@@ -378,13 +376,8 @@
 And this is for a person:
 
 >>> check("/~name16/+edit", auth=True)
->>> check("/~name16/+branches")
 >>> check_redirect("/~name12/+branch/gnome-terminal/pushed/", status=301)
 >>> check_redirect("/~name12/+branch/gnome-terminal/pushed/+edit", auth=True, status=301)
->>> check("/~name12/gnome-terminal/pushed/")
->>> check_not_found("/~name12/+branch/gnome-terminal/fubared/")
->>> check_not_found("/~name12/gnome-terminal/fubared/")
->>> check("/~name12/gnome-terminal/pushed/+edit", auth=True)
 >>> check_not_found("/~name16/+bugs/1")
 >>> check("/~name16/+reportedbugs")
 >>> check("/~name16/+assignedbugs")
@@ -408,8 +401,6 @@
 >>> check("/~mark/+packagebugs")
 >>> check("/~mark/+related-software")
 
->>> check("/+code")
-
 >>> check("/builders")
 >>> check("/builders/bob/")
 >>> check_redirect("/+builds", status=301)

=== modified file 'lib/lp/blueprints/templates/specificationbranch-status.pt'
--- lib/lp/blueprints/templates/specificationbranch-status.pt	2009-09-15 16:00:11 +0000
+++ lib/lp/blueprints/templates/specificationbranch-status.pt	2010-08-24 02:26:48 +0000
@@ -13,12 +13,6 @@
 
       <div metal:use-macro="context/@@launchpad_form/form">
 
-        <div metal:fill-slot="extra_top">
-          <ul class="branch"
-              tal:content="structure context/branch/@@+product-summary-listing"
-              />
-        </div>
-
       </div>
     </div>
   </metal:main>

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-08-24 02:26:48 +0000
@@ -943,7 +943,9 @@
             enabled = self.user.inTeam(self.context)
         text = 'Register a branch'
         summary = 'Register a new Bazaar branch'
-        return Link('+addbranch', text, summary, icon='add', enabled=enabled)
+        return Link(
+            '+addbranch', text, summary, icon='add', enabled=enabled,
+            site='code')
 
 
 class PersonProductBranchesMenu(PersonBranchesMenu):
@@ -1104,12 +1106,12 @@
     def branch_add(self):
         text = 'Register a branch'
         summary = 'Register a new Bazaar branch for this project'
-        return Link('+addbranch', text, summary, icon='add')
+        return Link('+addbranch', text, summary, icon='add', site='code')
 
     def list_branches(self):
         text = 'List branches'
         summary = 'List the branches for this project'
-        return Link('+branches', text, summary, icon='add')
+        return Link('+branches', text, summary, icon='add', site='code')
 
     @cachedproperty
     def active_review_count(self):
@@ -1122,7 +1124,7 @@
             self.active_review_count,
             'active review or unmerged proposal',
             'active reviews or unmerged proposals')
-        return Link('+activereviews', text)
+        return Link('+activereviews', text, site='code')
 
     @enabled_with_permission('launchpad.Commercial')
     def branch_visibility(self):
@@ -1131,7 +1133,7 @@
 
     def code_import(self):
         text = 'Import a branch'
-        return Link('+new-import', text, icon='add')
+        return Link('+new-import', text, icon='add', site='code')
 
 
 class ProductBranchListingView(BranchListingView):

=== modified file 'lib/lp/code/browser/branchvisibilitypolicy.py'
--- lib/lp/code/browser/branchvisibilitypolicy.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/branchvisibilitypolicy.py	2010-08-24 02:26:48 +0000
@@ -55,7 +55,7 @@
 
     @property
     def next_url(self):
-        return canonical_url(self.context) + '/+branchvisibility'
+        return canonical_url(self.context, view_name='+branchvisibility')
 
     cancel_url = next_url
 

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-08-09 19:49:03 +0000
+++ lib/lp/code/browser/configure.zcml	2010-08-24 02:26:48 +0000
@@ -37,6 +37,7 @@
       />
   <browser:page
       for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
+      layer="lp.code.publisher.CodeLayer"
       name="+recently-registered-branches"
       class="lp.code.browser.branchlisting.RecentlyRegisteredBranchesView"
       template="../templates/branch-listing-cross-product.pt"
@@ -44,6 +45,7 @@
       />
   <browser:page
       for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
+      layer="lp.code.publisher.CodeLayer"
       name="+recently-imported-branches"
       class="lp.code.browser.branchlisting.RecentlyImportedBranchesView"
       template="../templates/branch-listing-cross-product.pt"
@@ -51,6 +53,7 @@
       />
   <browser:page
       for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
+      layer="lp.code.publisher.CodeLayer"
       name="+recently-changed-branches"
       class="lp.code.browser.branchlisting.RecentlyChangedBranchesView"
       template="../templates/branch-listing-cross-product.pt"
@@ -72,6 +75,7 @@
         rootsite="code"/>
     <browser:page
         for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference"
+        layer="lp.code.publisher.CodeLayer"
         name="+reassign"
         class="lp.code.browser.codereviewvote.CodeReviewVoteReassign"
         facet="branches"
@@ -90,6 +94,7 @@
             layer="lp.code.publisher.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.codeimportmachine.CodeImportMachineView"
             name="+index"
             template="../templates/codeimport-machine-index.pt"
@@ -99,8 +104,7 @@
         facet="branches">
         <browser:navigation
             module="lp.code.browser.codeimportmachine"
-            classes="
-                CodeImportMachineSetNavigation"/>
+            classes="CodeImportMachineSetNavigation"/>
         <browser:url
             for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
             path_expression="string:+machines"
@@ -112,6 +116,7 @@
             layer="lp.code.publisher.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.codeimportmachine.CodeImportMachineSetView"
             name="+index"
             template="../templates/codeimport-machines.pt"
@@ -123,17 +128,19 @@
         attribute_to_parent="branch"/>
     <browser:navigation
         module="lp.code.browser.branchref"
-        classes="
-            BranchRefNavigation"/>
+        classes="BranchRefNavigation"/>
     <browser:url
         for="canonical.launchpad.interfaces.IBazaarApplication"
         path_expression="string:+code"
-        parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+        parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+        rootsite="code"/>
     <browser:defaultView
         for="canonical.launchpad.interfaces.IBazaarApplication"
+        layer="lp.code.publisher.CodeLayer"
         name="+index"/>
     <browser:pages
         for="canonical.launchpad.interfaces.IBazaarApplication"
+        layer="lp.code.publisher.CodeLayer"
         permission="zope.Public"
         class="lp.code.browser.bazaar.BazaarApplicationView"
         facet="branches">
@@ -143,16 +150,17 @@
     </browser:pages>
     <browser:page
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         name="+hierarchy"
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
     <browser:navigation
         module="lp.code.browser.branchmergeproposal"
-        classes="
-            BranchMergeProposalNavigation"/>
+        classes="BranchMergeProposalNavigation"/>
     <browser:defaultView
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         name="+index"/>
 
     <!-- No view needed -->
@@ -170,6 +178,7 @@
 
     <browser:pages
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalView"
         facet="branches"
         permission="launchpad.View">
@@ -197,6 +206,7 @@
       </browser:pages>
     <browser:pages
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalEditView"
         facet="branches"
         permission="launchpad.Edit">
@@ -207,6 +217,7 @@
     <browser:page
         name="+edit-commit-message"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalCommitMessageEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -214,6 +225,7 @@
     <browser:page
         name="+edit-description"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalDescriptionEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -221,6 +233,7 @@
     <browser:page
         name="+delete"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalDeleteView"
         facet="branches"
         permission="launchpad.Edit"
@@ -228,6 +241,7 @@
     <browser:page
         name="+edit-status"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalChangeStatusView"
         facet="branches"
         permission="launchpad.Edit"
@@ -235,6 +249,7 @@
     <browser:page
         name="+request-review"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalRequestReviewView"
         facet="branches"
         permission="launchpad.Edit"
@@ -242,6 +257,7 @@
     <browser:page
         name="+resubmit"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalResubmitView"
         facet="branches"
         permission="launchpad.Edit"
@@ -249,6 +265,7 @@
     <browser:page
         name="+enqueue"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalEnqueueView"
         facet="branches"
         permission="launchpad.Edit"
@@ -256,6 +273,7 @@
     <browser:page
         name="+dequeue"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalDequeueView"
         facet="branches"
         permission="launchpad.Edit"
@@ -263,6 +281,7 @@
     <browser:page
         name="+dequeue-inline"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalInlineDequeueView"
         facet="branches"
         permission="launchpad.Edit"
@@ -270,6 +289,7 @@
     <browser:page
         name="+jump-queue"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalJumpQueueView"
         facet="branches"
         permission="launchpad.Edit"
@@ -277,6 +297,7 @@
     <browser:page
         name="+merged"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalMergedView"
         facet="branches"
         permission="launchpad.Edit"
@@ -291,6 +312,7 @@
     <browser:page
         name="+pagelet-subscribers"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalSubscribersView"
         facet="branches"
         permission="launchpad.View"
@@ -298,6 +320,7 @@
     <browser:page
         name="+comment"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -305,6 +328,7 @@
     <browser:page
         name="+review"
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.BranchMergeProposalAddVoteView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -316,11 +340,13 @@
         rootsite="code"/>
     <browser:page
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalListingBatchNavigator"
+        layer="lp.code.publisher.CodeLayer"
         name="+listing"
         template="../templates/branchmergeproposal-listing.pt"
         permission="zope.Public"/>
     <browser:page
         for="*"
+        layer="lp.code.publisher.CodeLayer"
         name="+bmp-macros"
         permission="zope.Public"
         template="../templates/branchmergeproposal-macros.pt"/>
@@ -332,16 +358,19 @@
         module="lp.code.browser.branchmergeproposal"/>
     <browser:page
         for="lp.code.interfaces.branchsubscription.IBranchSubscription"
+        layer="lp.code.publisher.CodeLayer"
         name="+hierarchy"
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
     <browser:defaultView
         for="lp.code.interfaces.branchsubscription.IBranchSubscription"
+        layer="lp.code.publisher.CodeLayer"
         name="+index"/>
     <browser:page
         name="+index"
         for="lp.code.interfaces.branchsubscription.IBranchSubscription"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchsubscription.BranchSubscriptionEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -353,22 +382,24 @@
         rootsite="code"/>
     <browser:page
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         name="+hierarchy"
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
     <browser:defaultView
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         name="+index"/>
     <browser:url
         for="lp.code.interfaces.branch.IBranch"
         urldata="lp.code.browser.branch.BranchURL"/>
     <browser:navigation
         module="lp.code.browser.branch"
-        classes="
-            BranchNavigation"/>
+        classes="BranchNavigation"/>
     <browser:pages
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         facet="branches"
         permission="zope.Public"
         class="lp.code.browser.branch.BranchView">
@@ -410,6 +441,7 @@
     </browser:pages>
     <browser:pages
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         permission="zope.Public">
         <browser:page
             name="+portlet-privacy"
@@ -421,6 +453,7 @@
     <browser:page
         name="+portlet-subscribers"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchSubscriptionsView"
         facet="branches"
         permission="zope.Public"
@@ -428,11 +461,13 @@
     <browser:page
         name="+branch-portlet-subscriber-content"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchsubscription.BranchPortletSubscribersContent"
         template="../templates/branch-portlet-subscribers-content.pt"
         permission="zope.Public" />
     <browser:pages
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         facet="overview"
         permission="zope.Public"
         class="lp.code.browser.branch.BranchInProductView">
@@ -442,11 +477,13 @@
     </browser:pages>
     <browser:page
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         name="+macros"
         permission="zope.Public"
         template="../templates/branch-macros.pt"/>
     <browser:page
         for="*"
+        layer="lp.code.publisher.CodeLayer"
         name="branch-form-macros"
         permission="zope.Public"
         template="../templates/branch-form-macros.pt"/>
@@ -454,12 +491,14 @@
         name="+whiteboard"
         for="lp.code.interfaces.branch.IBranch"
         class="lp.code.browser.branch.BranchEditWhiteboardView"
+        layer="lp.code.publisher.CodeLayer"
         facet="branches"
         permission="launchpad.AnyPerson"
         template="../../app/templates/generic-edit.pt"/>
     <browser:page
         name="+edit-status"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchEditStatusView"
         facet="branches"
         permission="launchpad.Edit"
@@ -467,6 +506,7 @@
     <browser:page
         name="+edit"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -474,6 +514,7 @@
     <browser:page
         name="+upgrade"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchUpgradeView"
         facet="branches"
         permission="launchpad.Edit"
@@ -481,6 +522,7 @@
     <browser:page
         name="+reviewer"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchReviewerEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -488,6 +530,7 @@
     <browser:page
         name="+edit-import"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.codeimport.CodeImportEditView"
         facet="branches"
         permission="launchpad.Edit"
@@ -495,12 +538,14 @@
     <browser:page
         name="+delete"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchDeletionView"
         facet="branches"
         permission="launchpad.Edit"
         template="../templates/branch-delete.pt"/>
     <browser:pages
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchMirrorStatusView"
         facet="branches"
         permission="launchpad.View">
@@ -514,6 +559,7 @@
     <browser:page
         name="+subscribe"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchsubscription.BranchSubscriptionAddView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -521,6 +567,7 @@
     <browser:page
         name="+register-merge"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.RegisterBranchMergeProposalView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -528,6 +575,7 @@
     <browser:page
         name="+linkbug"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.bugs.browser.bugbranch.BranchLinkToBugView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -535,6 +583,7 @@
     <browser:page
         name="+linkblueprint"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.blueprints.browser.specificationbranch.BranchLinkToSpecificationView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -542,6 +591,7 @@
     <browser:page
         name="+addsubscriber"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchsubscription.BranchSubscriptionAddOtherView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -549,24 +599,28 @@
     <browser:page
         name="+edit-subscription"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchsubscription.BranchSubscriptionEditOwnView"
         facet="branches"
         permission="launchpad.AnyPerson"
         template="../templates/branch-edit-subscription.pt"/>
     <browser:page
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchRequestImportView"
         name="+request-import"
         template="../templates/inline-form-only-buttons.pt"
         permission="launchpad.AnyPerson"/>
     <browser:page
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.TryImportAgainView"
         name="+try-again"
         template="../templates/inline-form-only-buttons.pt"
         permission="launchpad.AnyPerson"/>
     <browser:page
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposallisting.BranchActiveReviewsView"
         permission="zope.Public"
         name="+activereviews"
@@ -574,6 +628,7 @@
         template="../templates/active-reviews.pt"/>
     <browser:page
         for="lp.code.interfaces.branch.IBranchBatchNavigator"
+        layer="lp.code.publisher.CodeLayer"
         name="+branch-listing"
         template="../templates/branch-listing.pt"
         permission="zope.Public"/>
@@ -601,6 +656,7 @@
     <browser:page
         name="+spark"
         for="lp.code.interfaces.branch.IBranch"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchSparkView"
         facet="branches"
         permission="zope.Public"/>
@@ -611,6 +667,7 @@
         module="lp.code.browser.branch"/>
     <browser:page
         for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
+        layer="lp.code.publisher.CodeLayer"
         name="+hierarchy"
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
@@ -622,10 +679,12 @@
         rootsite="code"/>
     <browser:defaultView
         for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
+        layer="lp.code.publisher.CodeLayer"
         name="+index"/>
     <browser:pages
         facet="branches"
         for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
         permission="zope.Public">
         <browser:page
@@ -647,6 +706,7 @@
     <browser:pages
         facet="branches"
         for="lp.code.browser.branchmergeproposal.ICodeReviewNewRevisions"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposal.CodeReviewNewRevisionsView"
         permission="zope.Public">
         <browser:page
@@ -660,17 +720,18 @@
         name="+reply"
         facet="branches"
         for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
         permission="launchpad.AnyPerson"
         template="../templates/codereviewcomment-reply.pt"/>
     <browser:menus
-        classes="
-            CodeReviewCommentContextMenu"
+        classes="CodeReviewCommentContextMenu"
         module="lp.code.browser.codereviewcomment"/>
     <facet
         facet="branches">
         <browser:page
             for="lp.code.interfaces.codeimport.ICodeImport"
+            layer="lp.code.publisher.CodeLayer"
             name="+macros"
             permission="zope.Public"
             template="../templates/codeimport-macros.pt"/>
@@ -688,18 +749,21 @@
             layer="lp.code.publisher.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.codeimport.ICodeImportSet"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.codeimport.CodeImportSetView"
             name="+index"
             template="../templates/codeimport-list.pt"
             permission="zope.Public"/>
         <browser:page
             for="lp.code.interfaces.codeimport.ICodeImportSet"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.codeimport.CodeImportNewView"
             name="+new"
             template="../templates/codeimport-new.pt"
             permission="launchpad.AnyPerson"/>
         <browser:page
             for="lp.registry.interfaces.product.IProduct"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.codeimport.CodeImportNewView"
             name="+new-import"
             template="../templates/codeimport-new.pt"
@@ -712,14 +776,14 @@
         rootsite="code"/>
     <browser:navigation
         module="lp.code.browser.codeimport"
-        classes="
-            CodeImportSetNavigation"/>
+        classes="CodeImportSetNavigation"/>
     <browser:defaultView
         for="lp.registry.interfaces.projectgroup.IProjectGroup"
         name="+branches"
         layer="lp.code.publisher.CodeLayer"/>
     <browser:page
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.SourcePackageBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -727,6 +791,7 @@
         template="../templates/sourcepackage-branches.pt"/>
     <browser:page
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -734,6 +799,7 @@
         template="../templates/branch-count-summary.pt"/>
     <browser:page
         for="lp.registry.interfaces.distribution.IDistribution"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.DistributionBranchListingView"
         permission="zope.Public"
         facet="branches"
@@ -741,6 +807,7 @@
         template="../templates/generic-branch-listing.pt"/>
     <browser:page
         for="lp.registry.interfaces.distribution.IDistribution"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -748,6 +815,7 @@
         template="../templates/branch-count-summary.pt"/>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.DistroSeriesBranchListingView"
         permission="zope.Public"
         facet="branches"
@@ -755,6 +823,7 @@
         template="../templates/generic-branch-listing.pt"/>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -762,6 +831,7 @@
         template="../templates/branch-count-summary.pt"/>
     <browser:page
         for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.DistributionSourcePackageBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -769,6 +839,7 @@
         template="../templates/generic-branch-listing.pt"/>
     <browser:page
         for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.GroupedDistributionSourcePackageBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -776,6 +847,7 @@
         template="../templates/distributionsourcepackage-branches-grouped.pt"/>
     <browser:page
         for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -783,6 +855,7 @@
         template="../templates/branch-count-summary.pt"/>
     <browser:page
         for="lp.registry.interfaces.projectgroup.IProjectGroup"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.ProjectBranchesView"
         facet="branches"
         permission="zope.Public"
@@ -790,6 +863,7 @@
         template="../templates/project-branches.pt"/>
     <browser:page
         for="lp.registry.interfaces.projectgroup.IProjectGroup"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -809,6 +883,7 @@
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
             class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
+            layer="lp.code.publisher.CodeLayer"
             permission="zope.Public"
             facet="branches"
             name="+branches"
@@ -816,6 +891,7 @@
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
             class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
+            layer="lp.code.publisher.CodeLayer"
             permission="zope.Public"
             facet="branches"
             name="+ownedbranches"
@@ -823,12 +899,14 @@
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
             class="lp.code.browser.branchlisting.PersonSubscribedBranchesView"
+            layer="lp.code.publisher.CodeLayer"
             permission="zope.Public"
             facet="branches"
             name="+subscribedbranches"
             template="../templates/person-branches.pt"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.branchlisting.PersonRegisteredBranchesView"
             permission="zope.Public"
             facet="branches"
@@ -836,6 +914,7 @@
             template="../templates/person-branches.pt"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.branchlisting.PersonCodeSummaryView"
             permission="zope.Public"
             facet="branches"
@@ -843,6 +922,7 @@
             template="../templates/person-codesummary.pt"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.branchmergeproposallisting.PersonActiveReviewsView"
             permission="zope.Public"
             facet="branches"
@@ -851,12 +931,14 @@
         <browser:page
             name="+addbranch"
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.branch.BranchAddView"
             facet="branches"
             permission="launchpad.AnyPerson"
             template="../templates/branch-add.pt"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.branchlisting.PersonTeamBranchesView"
             name="+portlet-teambranches"
             template="../templates/person-portlet-teambranches.pt"
@@ -865,6 +947,7 @@
 
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.ProductBranchesView"
         facet="branches"
         permission="zope.Public"
@@ -872,6 +955,7 @@
         template="../templates/product-branches.pt"/>
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.ProductCodeIndexView"
         facet="branches"
         permission="zope.Public"
@@ -879,6 +963,7 @@
         template="../templates/product-branches.pt"/>
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.ProductCodeIndexView"
         facet="branches"
         permission="zope.Public"
@@ -886,6 +971,7 @@
         template="../templates/product-branch-summary.pt"/>
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.summary.BranchCountSummaryView"
         facet="branches"
         permission="zope.Public"
@@ -895,6 +981,7 @@
     <browser:page
         name="+addbranch"
         for="lp.registry.interfaces.product.IProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchAddView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -903,6 +990,7 @@
     <browser:page
         name="+addbranch"
         for="lp.registry.interfaces.productseries.IProductSeries"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branch.BranchAddView"
         facet="branches"
         permission="launchpad.AnyPerson"
@@ -940,8 +1028,7 @@
 
     <browser:navigation
         module="lp.code.browser.diff"
-        classes="
-            PreviewDiffNavigation"/>
+        classes="PreviewDiffNavigation"/>
 
     <browser:page
         name="+diff"
@@ -961,6 +1048,7 @@
 
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.PersonProductOwnedBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -969,6 +1057,7 @@
         />
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.PersonProductSubscribedBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -977,6 +1066,7 @@
         />
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.PersonProductRegisteredBranchesView"
         permission="zope.Public"
         facet="branches"
@@ -985,6 +1075,7 @@
         />
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposallisting.PersonProductActiveReviewsView"
         permission="zope.Public"
         facet="branches"
@@ -993,6 +1084,7 @@
 
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.PersonProductTeamBranchesView"
         facet="branches"
         name="+portlet-teambranches"
@@ -1002,6 +1094,7 @@
 
     <browser:page
         for="lp.registry.interfaces.personproduct.IPersonProduct"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchlisting.PersonProductCodeSummaryView"
         facet="branches"
         name="+codesummary"
@@ -1011,6 +1104,7 @@
 
     <browser:page
         for="lp.code.interfaces.hasbranches.IHasMergeProposals"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposallisting.BranchMergeProposalListingView"
         facet="branches"
         permission="zope.Public"
@@ -1019,6 +1113,7 @@
 
     <browser:page
         for="lp.code.interfaces.hasbranches.IHasMergeProposals"
+        layer="lp.code.publisher.CodeLayer"
         class="lp.code.browser.branchmergeproposallisting.ActiveReviewsView"
         permission="zope.Public"
         facet="branches"
@@ -1102,12 +1197,14 @@
             layer="lp.code.publisher.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
             name="+index"
             template="../templates/sourcepackagerecipe-index.pt"
             permission="launchpad.View"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
             name="+request-builds"
             template="../templates/sourcepackagerecipe-request-builds.pt"
@@ -1120,18 +1217,21 @@
             layer="lp.code.publisher.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildView"
             name="+index"
             template="../templates/sourcepackagerecipebuild-index.pt"
             permission="launchpad.View"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildCancelView"
             name="+cancel"
             template="../../app/templates/generic-edit.pt"
             permission="launchpad.Admin"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildRescoreView"
             name="+rescore"
             template="../../app/templates/generic-edit.pt"
@@ -1144,6 +1244,7 @@
 
         <browser:page
             for="lp.code.interfaces.branch.IBranch"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
             permission="launchpad.AnyPerson"
             facet="branches"
@@ -1151,6 +1252,7 @@
             template="../../app/templates/generic-edit.pt"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
             permission="launchpad.Edit"
             facet="branches"
@@ -1158,6 +1260,7 @@
             template="../../app/templates/generic-edit.pt"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
             permission="launchpad.Edit"
             facet="branches"
@@ -1166,6 +1269,7 @@
 
         <browser:page
             for="lp.code.interfaces.branch.IBranch"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
             permission="zope.Public"
             facet="branches"
@@ -1173,6 +1277,7 @@
             template="../templates/sourcepackagerecipe-listing.pt"/>
         <browser:page
             for="lp.registry.interfaces.product.IProduct"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
             permission="zope.Public"
             facet="branches"
@@ -1180,6 +1285,7 @@
             template="../templates/sourcepackagerecipe-listing.pt"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
             permission="zope.Public"
             facet="branches"
@@ -1188,6 +1294,7 @@
 
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            layer="lp.code.publisher.CodeLayer"
             name="+hierarchy"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
             template="../../app/templates/launchpad-hierarchy.pt"

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-08-24 02:26:48 +0000
@@ -94,7 +94,8 @@
 
     @property
     def url(self):
-        return canonical_url(self.context, view_name="+recipes")
+        return canonical_url(
+            self.context, view_name="+recipes", rootsite='code')
 
 
 class SourcePackageRecipeHierarchy(Hierarchy):

=== modified file 'lib/lp/code/browser/sourcepackagerecipelisting.py'
--- lib/lp/code/browser/sourcepackagerecipelisting.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/sourcepackagerecipelisting.py	2010-08-24 02:26:48 +0000
@@ -35,7 +35,7 @@
         if not config.build_from_branch.enabled:
             enabled = False
         return Link(
-            '+recipes', text, icon='info', enabled=enabled)
+            '+recipes', text, icon='info', enabled=enabled, site='code')
 
 
 class RecipeListingView(LaunchpadView, FeedsMixin):

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2010-08-24 02:26:48 +0000
@@ -141,7 +141,8 @@
         # the current batch.
         branch_ids = set([self.branches[0].id])
 
-        view = create_initialized_view(self.barney, name="+branches")
+        view = create_initialized_view(
+            self.barney, name="+branches", rootsite='code')
         self.assertEqual(
             view.branches().branch_ids_with_bug_links,
             branch_ids)
@@ -151,7 +152,8 @@
         # the current batch.
         branch_ids = set([self.branches[1].id])
 
-        view = create_initialized_view(self.barney, name="+branches")
+        view = create_initialized_view(
+            self.barney, name="+branches", rootsite='code')
         self.assertEqual(
             view.branches().branch_ids_with_spec_links,
             branch_ids)
@@ -160,7 +162,8 @@
         # _branches_for_current_batch should return a list of all branches in
         # the current batch.
         branch_ids = set([])
-        view = create_initialized_view(self.barney, name="+branches")
+        view = create_initialized_view(
+            self.barney, name="+branches", rootsite='code')
         self.assertEqual(
             view.branches().branch_ids_with_merge_proposals,
             branch_ids)
@@ -173,7 +176,8 @@
         for branch_id in branch_ids:
             tip_revisions[branch_id] = None
 
-        view = create_initialized_view(self.barney, name="+branches")
+        view = create_initialized_view(
+            self.barney, name="+branches", rootsite='code')
         self.assertEqual(
             view.branches().tip_revisions,
             tip_revisions)
@@ -351,7 +355,8 @@
             branch.distribution.name, branch.sourcepackagename.name)
         self.assertEqual(identity, branch.bzr_identity)
         # Now confirm that we get the same through the view.
-        view = create_initialized_view(branch.distribution, name='+branches')
+        view = create_initialized_view(
+            branch.distribution, name='+branches', rootsite='code')
         # There is only one branch.
         batch = view.branches()
         [view_branch] = batch.branches

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
--- lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-08-24 02:26:48 +0000
@@ -60,11 +60,6 @@
 
     layer = DatabaseFunctionalLayer
 
-    def setUp(self):
-        # Use an admin so we don't have to worry about launchpad.Edit
-        # permissions on the merge proposals.
-        TestCaseWithFactory.setUp(self, user="[e-mail]")
-
     def testPrimaryContext(self):
         # The primary context of a merge proposal is the same as the primary
         # context of the source_branch.
@@ -84,7 +79,6 @@
             set_state=BranchMergeProposalStatus.REJECTED)
         login_person(bmp.registrant)
         menu = BranchMergeProposalContextMenu(bmp)
-        link = menu.add_comment()
         self.assertTrue(menu.add_comment().enabled)
 
 
@@ -272,9 +266,6 @@
         albert = self.factory.makePerson(name='albert')
         bob = self.factory.makePerson(name='bob')
         charles = self.factory.makePerson(name='charles')
-
-        owner = self.bmp.source_branch.owner
-
         self._createComment(albert, CodeReviewVote.APPROVE)
         self._createComment(bob, CodeReviewVote.ABSTAIN)
         self._createComment(charles, CodeReviewVote.DISAPPROVE)
@@ -290,9 +281,6 @@
         # Request three reviews.
         albert = self.factory.makePerson(name='albert')
         bob = self.factory.makePerson(name='bob')
-
-        owner = self.bmp.source_branch.owner
-
         self._createComment(albert, CodeReviewVote.ABSTAIN)
         self._createComment(bob, CodeReviewVote.APPROVE)
         self._createComment(albert, CodeReviewVote.APPROVE)
@@ -305,7 +293,6 @@
 
     def addReviewTeam(self):
         review_team = self.factory.makeTeam(name='reviewteam')
-        target_branch = self.factory.makeAnyBranch()
         self.bmp.target_branch.reviewer = review_team
 
     def test_review_team_members_trusted(self):

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposallisting.py'
--- lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2010-08-24 02:26:48 +0000
@@ -335,7 +335,8 @@
         login_person(bmp3.source_branch.owner)
         bmp3.requestReview(datetime(2009,1,1,tzinfo=pytz.UTC))
         login(ANONYMOUS)
-        view = create_initialized_view(product, name='+activereviews')
+        view = create_initialized_view(
+            product, name='+activereviews', rootsite='code')
         self.assertEqual(
             [bmp3, bmp2, bmp1],
             [item.context for item in view.review_groups[view.OTHER]])

=== modified file 'lib/lp/code/browser/tests/test_product.py'
--- lib/lp/code/browser/tests/test_product.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_product.py	2010-08-24 02:26:48 +0000
@@ -29,6 +29,7 @@
     TestCaseWithFactory,
     time_counter,
     )
+from lp.testing.views import create_initialized_view
 
 
 class TestProductCodeIndexView(TestCaseWithFactory):
@@ -53,7 +54,6 @@
 
         :raises Something: if the branch is not found.
         """
-        url = canonical_url(product, rootsite='code')
         browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
         return browser.getLink('browse the source code')
 
@@ -92,30 +92,25 @@
         # +code-index page.
         product, branch = self.makeProductAndDevelopmentFocusBranch(
             private=True)
-        url = canonical_url(product, rootsite='code')
         self.factory.makeProductBranch(product=product)
         # This is just "assertNotRaises"
         self.getUserBrowser(canonical_url(product, rootsite='code'))
 
     def test_initial_branches_contains_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch()
-        view = getMultiAdapter(
-            (product, LaunchpadTestRequest()), name='+code-index')
-        view.initialize()
+        view = create_initialized_view(product, '+code-index', rootsite='code')
         self.assertIn(branch, view.initial_branches)
 
     def test_initial_branches_does_not_contain_private_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch(
             private=True)
-        view = getMultiAdapter(
-            (product, LaunchpadTestRequest()), name='+code-index')
-        view.initialize()
+        view = create_initialized_view(product, '+code-index', rootsite='code')
         self.assertNotIn(branch, view.initial_branches)
 
     def test_committer_count_with_revision_authors(self):
         # Test that the code pathing for calling committer_count with
         # valid revision authors is truly tested.
-        cthulu = self.factory.makePerson(email='[e-mail]')
+        self.factory.makePerson(email='[e-mail]')
         product, branch = self.makeProductAndDevelopmentFocusBranch()
         date_generator = time_counter(
             datetime.now(pytz.UTC) - timedelta(days=30),
@@ -125,9 +120,7 @@
             date_generator=date_generator)
         getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
 
-        view = getMultiAdapter(
-            (product, LaunchpadTestRequest()), name='+code-index')
-        view.initialize()
+        view = create_initialized_view(product, '+code-index', rootsite='code')
         self.assertEqual(view.committer_count, 1)
 
     def test_committers_count_private_branch(self):
@@ -145,9 +138,7 @@
             date_generator=date_generator)
         getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
 
-        view = getMultiAdapter(
-            (product, LaunchpadTestRequest()), name='+code-index')
-        view.initialize()
+        view = create_initialized_view(product, '+code-index', rootsite='code')
         self.assertEqual(view.committer_count, 1)
 
 

=== modified file 'lib/lp/code/stories/branches/xx-branch-edit.txt'
--- lib/lp/code/stories/branches/xx-branch-edit.txt	2010-05-30 04:06:48 +0000
+++ lib/lp/code/stories/branches/xx-branch-edit.txt	2010-08-24 02:26:48 +0000
@@ -17,26 +17,26 @@
 Launchpad administrators or members of the Bazaar Experts team.
 
     >>> admin_browser.open(
-    ...     'http://launchpad.dev/~name12/gnome-terminal/klingon')
+    ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> link = admin_browser.getLink('Change branch details')
 
     >>> bazaar_expert_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
     >>> bazaar_expert_browser.open(
-    ...     'http://launchpad.dev/~name12/gnome-terminal/klingon')
+    ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> link = bazaar_expert_browser.getLink('Change branch details')
 
     >>> nopriv_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
     >>> nopriv_browser.open(
-    ...     'http://launchpad.dev/~name12/gnome-terminal/klingon')
+    ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> link = nopriv_browser.getLink('Change branch details')
     Traceback (most recent call last):
     LinkNotFoundError
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open(
-    ...     'http://launchpad.dev/~name12/gnome-terminal/klingon')
+    ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> browser.getLink('Change branch details').click()
     >>> browser.url
     'http://code.launchpad.dev/~name12/gnome-terminal/klingon/+edit'
@@ -84,7 +84,7 @@
 
 To change the branch status, the +edit page is also used:
 
-    >>> browser.open('http://launchpad.dev'
+    >>> browser.open('http://code.launchpad.dev'
     ...     '/~name12/gnome-terminal/klingon/+edit')
 
 The form displays the branch current status.
@@ -112,7 +112,7 @@
 
 Set the branch status back to its initial state.
 
-    >>> browser.open('http://launchpad.dev'
+    >>> browser.open('http://code.launchpad.dev'
     ...     '/~name12/gnome-terminal/klingon/+edit')
     >>> browser.getControl('Experimental').click()
     >>> browser.getControl('Change Branch').click()
@@ -162,12 +162,12 @@
 Let's try to change the name of the branch to the name of some branch we
 already own in the same product.
 
-    >>> browser.open('http://launchpad.dev'
+    >>> browser.open('http://code.launchpad.dev'
     ...     '/~name12/gnome-terminal/main/+edit')
     >>> browser.getControl('Name').value = '2.6'
     >>> browser.getControl('Change Branch').click()
     >>> browser.url
-    'http://launchpad.dev/%7Ename12/gnome-terminal/main/+edit'
+    'http://code.launchpad.dev/%7Ename12/gnome-terminal/main/+edit'
     >>> for msg in get_feedback_messages(browser.contents):
     ...     print msg
     There is 1 error.
@@ -178,7 +178,7 @@
 
 Edit forms do the same URL validation checks as the add forms.
 
-    >>> browser.open('http://launchpad.dev/~name12/gnome-terminal/main')
+    >>> browser.open('http://code.launchpad.dev/~name12/gnome-terminal/main')
     >>> browser.getLink('Change branch details').click()
     >>> browser.getControl('Branch URL').value = (
     ...     'http://bazaar.launchpad.dev/~foo/bar/baz')
@@ -192,7 +192,8 @@
 
 Check that when editing a hosted branch the URL field is not shown.
 
-    >>> browser.open('http://launchpad.dev/~name12/gnome-terminal/scanned')
+    >>> browser.open(
+    ...     'http://code.launchpad.dev/~name12/gnome-terminal/scanned')
     >>> browser.getLink('Change branch details').click()
     >>> browser.getControl('Branch URL').value = (
     ...     'http://acme.example.com/~foo/bar/baz')
@@ -227,7 +228,7 @@
     >>> logout()
 
     >>> nopriv_browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> nopriv_browser.open('http://launchpad.dev'
+    >>> nopriv_browser.open('http://code.launchpad.dev'
     ...     '/~name12/foogoo/foogoo-svn')
     >>> whiteboard_tag = find_tag_by_id(
     ...     nopriv_browser.contents, 'branch-whiteboard-value')
@@ -280,7 +281,7 @@
 The user is able to change the owner of the branch using the edit details
 page.
 
-    >>> browser.open('http://launchpad.dev/~name12/gnome-terminal/main')
+    >>> browser.open('http://code.launchpad.dev/~name12/gnome-terminal/main')
     >>> browser.getLink('Change branch details').click()
     >>> browser.getControl('Owner').displayValue = ['Landscape Developers']
     >>> browser.getControl('Change Branch').click()
@@ -297,7 +298,7 @@
 Bazaar Experts and Launchpad administrators are able to reassign a branch
 to any valid person or team.
 
-    >>> admin_browser.open('http://launchpad.dev/~name12/firefox/main')
+    >>> admin_browser.open('http://code.launchpad.dev/~name12/firefox/main')
     >>> admin_browser.getLink('Change branch details').click()
     >>> admin_browser.getControl('Owner').value = 'mark'
     >>> admin_browser.getControl('Change Branch').click()

=== modified file 'lib/lp/code/stories/branches/xx-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-branch-listings.txt	2010-04-11 22:45:09 +0000
+++ lib/lp/code/stories/branches/xx-branch-listings.txt	2010-08-24 02:26:48 +0000
@@ -154,7 +154,7 @@
 status value, it will default to current branches.
 
     >>> browser.open(
-    ...  'http://launchpad.dev/~name12/+branches?field.lifecycle=Fubar')
+    ...  'http://code.launchpad.dev/~name12/+branches?field.lifecycle=Fubar')
     >>> browser.getControl(name='field.lifecycle').displayValue
     ['Any active status']
     >>> table = find_tag_by_id(browser.contents, 'branchtable')

=== modified file 'lib/lp/code/stories/branches/xx-branch-url-validation.txt'
--- lib/lp/code/stories/branches/xx-branch-url-validation.txt	2009-06-02 08:20:49 +0000
+++ lib/lp/code/stories/branches/xx-branch-url-validation.txt	2010-08-24 02:26:48 +0000
@@ -3,7 +3,8 @@
 First, let's define a helper to post to the Person +addbranch form.
 
     >>> def add_branch(url):
-    ...     user_browser.open('http://launchpad.dev/~lifeless/+addbranch')
+    ...     user_browser.open(
+    ...         'http://code.launchpad.dev/~lifeless/+addbranch')
     ...     user_browser.getControl('Name').value = 'pyresources'
     ...     user_browser.getControl('Branch URL').value = url
     ...     user_browser.getControl('Register Branch').click()
@@ -57,7 +58,7 @@
     There is 1 error.
     Branch URLs are required for Mirrored branches.
 
-Try to create a branch using the bzr+ssh URL scheme. Bug 76854 (see also 5573)
+Try to create a branch using the bzr+ssh URL scheme.
 
     >>> add_branch('bzr+ssh://example.com/code/branch')
     >>> print user_browser.url

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2010-05-13 16:22:19 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2010-08-24 02:26:48 +0000
@@ -125,7 +125,7 @@
 
 Now, post the branch creation form for the product.
 
-    >>> user_browser.open('http://launchpad.dev/applets/+addbranch')
+    >>> user_browser.open('http://code.launchpad.dev/applets/+addbranch')
 
 The specified URL has a trailing slash. In the next test, we will check that it
 has been stripped.
@@ -175,7 +175,7 @@
     >>> browser.open('http://launchpad.dev/gnome-terminal/trunk')
     >>> browser.getLink('registering a mirrored branch').click()
     >>> print browser.title
-    Register a branch : GNOME Terminal
+    Register a branch : Code : GNOME Terminal
 
 The user sees that he is registering a branch for the series' project.
 
@@ -241,7 +241,7 @@
 
 Try a adding a conflicting branch from the product/+addbranch form.
 
-    >>> browser.open('http://launchpad.dev/gnome-terminal/+addbranch')
+    >>> browser.open('http://code.launchpad.dev/gnome-terminal/+addbranch')
     >>> browser.getControl('Branch URL').value = (
     ...     'http://example.com/gnome-terminal/main-dup')
 
@@ -249,7 +249,7 @@
 
     >>> browser.getControl('Register Branch').click()
     >>> browser.url
-    'http://launchpad.dev/gnome-terminal/+addbranch'
+    'http://code.launchpad.dev/gnome-terminal/+addbranch'
 
 Now, complete the form, but give a name that is alredy in use for that owner
 and product.
@@ -260,7 +260,7 @@
 That should give us the form back with an error message.
 
     >>> browser.url
-    'http://launchpad.dev/gnome-terminal/+addbranch'
+    'http://code.launchpad.dev/gnome-terminal/+addbranch'
     >>> for message in get_feedback_messages(browser.contents):
     ...     print extract_text(message)
     There is 1 error.
@@ -269,7 +269,7 @@
 If the user is trying to add a branch for a team that conflicts,
 then the team name is given in the error message.
 
-    >>> browser.open('http://launchpad.dev/gnome-terminal/+addbranch')
+    >>> browser.open('http://code.launchpad.dev/gnome-terminal/+addbranch')
     >>> browser.getControl('Owner').displayValue = [
     ...     'Landscape Developers']
     >>> browser.getControl('Name').value = 'main'
@@ -282,7 +282,7 @@
 
 Now registering again with the same name.
 
-    >>> browser.open('http://launchpad.dev/gnome-terminal/+addbranch')
+    >>> browser.open('http://code.launchpad.dev/gnome-terminal/+addbranch')
     >>> browser.getControl('Owner').displayValue = [
     ...     'Landscape Developers']
     >>> browser.getControl('Name').value = 'main'

=== modified file 'lib/lp/code/stories/branches/xx-source-package-branches-listing.txt'
--- lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2010-04-12 16:02:18 +0000
+++ lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2010-08-24 02:26:48 +0000
@@ -60,7 +60,7 @@
     ...     distribution=distro, sourcepackagename=branch1.sourcepackagename)
     >>> transaction.commit()
     >>> distro_source_package_listing = canonical_url(
-    ...     distro_source_package, view_name="+branches")
+    ...     distro_source_package, view_name="+branches", rootsite='code')
     >>> logout()
 
     >>> browser.open(distro_source_package_listing)

=== modified file 'lib/lp/code/stories/branches/xx-subscribing-branches.txt'
--- lib/lp/code/stories/branches/xx-subscribing-branches.txt	2010-05-27 04:44:39 +0000
+++ lib/lp/code/stories/branches/xx-subscribing-branches.txt	2010-08-24 02:26:48 +0000
@@ -36,7 +36,7 @@
 link "Subscribe" from a branch's page.
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> browser.open('http://launchpad.dev/~name12/gnome-terminal/main')
+    >>> browser.open('http://code.launchpad.dev/~name12/gnome-terminal/main')
 
 Initially there should be no subscribers.
 
@@ -149,7 +149,7 @@
 
 Any logged in user is able to subscribe others to a branch.
 
-    >>> browser.open('http://launchpad.dev/~name12/gnome-terminal/main')
+    >>> browser.open('http://code.launchpad.dev/~name12/gnome-terminal/main')
     >>> browser.getLink('Subscribe someone else').click()
 
 The process of subscribing others is the same as subscribing the

=== modified file 'lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt'
--- lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2010-06-15 19:53:21 +0000
+++ lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2010-08-24 02:26:48 +0000
@@ -86,7 +86,7 @@
     >>> nopriv_browser.open(product_url)
     >>> nopriv_browser.getLink('View source package recipes').click()
     >>> print nopriv_browser.url
-    http://launchpad.dev/product-name.../+recipes
+    http://code.launchpad.dev/product-name.../+recipes
 
     >>> print_recipe_listing_head(nopriv_browser)
     Name
@@ -119,7 +119,7 @@
     >>> nopriv_browser.open(person_url)
     >>> nopriv_browser.getLink('View source package recipes').click()
     >>> print nopriv_browser.url
-    http://launchpad.dev/~person-name.../+recipes
+    http://code.launchpad.dev/~person-name.../+recipes
 
 The "Owner" section should be missing.
 

=== modified file 'lib/lp/code/templates/branch-summary-listing.pt'
--- lib/lp/code/templates/branch-summary-listing.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/code/templates/branch-summary-listing.pt	2010-08-24 02:26:48 +0000
@@ -4,10 +4,10 @@
        tal:content="context/bzr_identity"
        class="sprite branch" >Mozilla Thunderbird 0.9.1</a>
     <tal:person-link condition="view/show_person_link">
-      - <a tal:replace="structure context/owner/fmt:link/+ownedbranches" />
+      - <a tal:replace="structure context/owner/fmt:link:code/+ownedbranches" />
     </tal:person-link>
     <tal:product-link condition="view/show_product_link">
-      - <a tal:attributes="href string:${context/product/fmt:url}/+branches"
+      - <a tal:attributes="href context/product/fmt:url:code/+branches"
          tal:content="context/product/displayname"
          class="sprite product">Project</a>
     </tal:product-link>

=== modified file 'lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt'
--- lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2009-09-17 02:17:15 +0000
+++ lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2010-08-24 02:26:48 +0000
@@ -85,7 +85,7 @@
         </li>
       </tal:series-branches>
     </tal:distro-series>
-    <li><a tal:attributes="href context/fmt:url/+branches">
+    <li><a tal:attributes="href context/fmt:url:code/+branches">
       All branches for the <tal:name replace="context/title"/>
     </a></li>
     </ul>

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-08-23 03:25:20 +0000
+++ lib/lp/registry/browser/product.py	2010-08-24 02:26:48 +0000
@@ -671,7 +671,7 @@
     def branch_add(self):
         text = 'Register a branch'
         summary = "Register a new Bazaar branch for this project"
-        return Link('+addbranch', text, summary, icon='add')
+        return Link('+addbranch', text, summary, icon='add', site='code')
 
 
 class ProductBugsMenu(PillarBugsMenu,

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/browser/productseries.py	2010-08-24 02:26:48 +0000
@@ -428,7 +428,8 @@
     @property
     def request_import_link(self):
         """A link to the page for requesting a new code import."""
-        return canonical_url(self.context.product, view_name='+new-import')
+        return canonical_url(
+            self.context.product, view_name='+new-import', rootsite='code')
 
     @property
     def user_branch_visible(self):

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-07-30 20:00:59 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-08-24 02:26:48 +0000
@@ -158,7 +158,7 @@
 The view also provides a link to register a new code import.
 
     >>> print view.request_import_link
-    http://launchpad.dev/firefox/+new-import
+    http://code.launchpad.dev/firefox/+new-import
 
 
 Edit ProductSeries

=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt	2009-10-06 21:58:56 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt	2010-08-24 02:26:48 +0000
@@ -61,7 +61,7 @@
 
     >>> revisions = find_tag_by_id(sample_browser.contents, 'branch-revision-details')
     >>> print extract_text(revisions)
-    15 revisions, 5 in the past month.
+    15 revisions.
 
 A helpful informational message is also shown to the user.
 

=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2010-04-12 23:10:39 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2010-08-24 02:26:48 +0000
@@ -84,13 +84,12 @@
     <a id="series-branch" class="sprite branch"
       tal:attributes="href context/branch/fmt:url"
       tal:content="context/branch/bzr_identity">Mozilla Thunderbird 0.9.1</a>
-    - <a tal:replace="structure context/branch/owner/fmt:link/+ownedbranches" />
+    - <a tal:replace="structure context/branch/owner/fmt:link:code/+ownedbranches" />
     <a
       tal:replace="structure context/menu:overview/link_branch/fmt:icon" />
   </div>
   <div id="branch-revision-details" tal:condition="context/branch/revision_count">
-    <span tal:replace="context/branch/revision_count">35</span> revisions,
-    <span tal:replace="context/branch/@@+product-summary-listing/recent_revision_count">31</span> in the past month.
+    <span tal:replace="context/branch/revision_count">35</span> revisions.
   </div>
 </tal:block>
 

=== modified file 'lib/lp/testing/menu.py'
--- lib/lp/testing/menu.py	2010-08-20 20:31:18 +0000
+++ lib/lp/testing/menu.py	2010-08-24 02:26:48 +0000
@@ -5,10 +5,7 @@
 
 __metaclass__ = type
 
-from zope.component import getMultiAdapter
-
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.lazr.testing.menus import make_fake_request
 
 
 def check_menu_links(menu):
@@ -21,10 +18,10 @@
             view_name, _args = link.target.split('?')
         else:
             view_name = link.target
-        url = canonical_url(context, view_name=view_name)
-        request = make_fake_request(url)
+        if view_name == '':
+            view_name = None
         try:
-            view = getMultiAdapter((context, request), name=view_name)
+            canonical_url(context, view_name=view_name, rootsite=link.site)
         except:
-            return 'Bad link %s: %s' % (link.name, url)
+            return 'Bad link %s: %s' % (link.name, canonical_url(context))
     return True

=== modified file 'lib/lp/testing/views.py'
--- lib/lp/testing/views.py	2010-08-20 20:31:18 +0000
+++ lib/lp/testing/views.py	2010-08-24 02:26:48 +0000
@@ -23,14 +23,19 @@
 
 from canonical.config import config
 from canonical.launchpad.layers import setFirstLayer
-from canonical.launchpad.webapp.interfaces import IPlacelessAuthUtility
+from canonical.launchpad.webapp.interfaces import (
+    ICanonicalUrlData,
+    IPlacelessAuthUtility,
+    )
+from canonical.launchpad.webapp.publisher import layer_for_rootsite
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.lazr import ExportedFolder
 
 
 def create_view(context, name, form=None, layer=None, server_url=None,
                 method='GET', principal=None, query_string='', cookie='',
-                request=None, path_info='/', current_request=False, **kwargs):
+                request=None, path_info='/', current_request=False,
+                rootsite=None, **kwargs):
     """Return a view based on the given arguments.
 
     :param context: The context for the view.
@@ -59,6 +64,16 @@
     else:
         request.setPrincipal(
             getUtility(IPlacelessAuthUtility).unauthenticatedPrincipal())
+    if layer is None:
+        # If a layer hasn't been specified, try to get the layer for the
+        # rootsite.
+        if rootsite is None:
+            # If we haven't been told a site, try to get it from the canonical
+            # url data of the object.
+            obj_urldata = ICanonicalUrlData(context, None)
+            if obj_urldata is not None:
+                rootsite = obj_urldata.rootsite
+        layer = layer_for_rootsite(rootsite)
     if layer is not None:
         setFirstLayer(request, layer)
     if current_request:
@@ -70,7 +85,7 @@
 def create_initialized_view(context, name, form=None, layer=None,
                             server_url=None, method=None, principal=None,
                             query_string=None, cookie=None, request=None,
-                            path_info='/'):
+                            path_info='/', rootsite=None):
     """Return a view that has already been initialized."""
     if method is None:
         if form is None:
@@ -79,7 +94,7 @@
             method = 'POST'
     view = create_view(
         context, name, form, layer, server_url, method, principal,
-        query_string, cookie, request, path_info)
+        query_string, cookie, request, path_info, rootsite=rootsite)
     view.initialize()
     return view