Merge lp:~leonardr/launchpad/web-link into lp:launchpad

[Leonard Richardson]

[r=thumper][bug=316694] Add a web_link property to the JSON representation of all web service entries that correspond to some page on the Launchpad website.

Many of the objects published over the Launchpad web service correspond to some page on the Launchpad website. To take a simple example, the entry at https://api.launchpad.net/devel/~leonardr corresponds to the web page at https://launchpad.net/~leonardr.

With this branch in place, the JSON representation of https://api.launchpad.net/devel/~leonardr will include a "web_link" with a value of "https://launchpad.net/~leonardr". In other words, the web service will link to the web site, where appropriate.

This branch removes IWebBrowserOriginatingRequest and replaces it with the identically-named interface in lazr.restful. The fact that Launchpad defines an adapter between IWebServiceRequest and IWebBrowserOriginatingRequest (an adapter previously used only for the librarian) activates the lazr.restful web_link feature.

However, not *every* object published over the Launchpad web service corresponds to some page on the website. I was able to find the following exceptions: bug nominations, bug subscriptions, preview diffs, product release files, structural subscriptions, wiki names, countries, archive dependencies, archive permissions, packagesets, publishing histories, and package uploads, along with everything related to the HWDB. I annotated the interfaces of all these exceptions by adding "publish_web_link=False" to their export_as_webservice_entry calls.

It's possible that I missed more exceptions. The worst that will happen is that we'll be publishing web_links that don't work, and when someone notices we'll be able to add another exception.

I changed the <browser:url> stanzas in three places in lib/lp/bugs/browser.zcml. In all cases I set the rootsite attribute to "bugs". For ICVE and IBugWatch, I noticed that the web_link being generated started with "launchpad.dev", not "bugs.launchpad.dev". It's likely that links to CVEs and bug watches (if there are any) have been slightly wrong all this time. For IBugNomination it's not strictly necessary to set a rootsite, since bug nominations are only published in the web service (which has its own rootsite), but I set it anyway so that the URL will be correct if bug nominations are ever published on the website.

The bulk of this diff is changes to tests. These changes may look fairly pointless--I'm just adding 'web_link' to a lot of representations--but they're important, or at least they were important during implementation. They demonstrate which entries publish web_link and which don't. When I first ran the Launchpad web service tests against the new version of lazr.restful, I got a huge number of failures because web_link was everywhere and the tests didn't expect it. I had to go through each failure and determine whether or not web_link *should* be present. I changed the test if web_link should be present, and changed the interface (making the existing test work again) if web_link should not be present.

Basically, I think the changes to the tests are important. I *don't* think it's particularly important to test the specific values for web_link. We could improve readibility with very little loss of coverage by replacing all these lines:

web_link: 'http://launchpad.../foo'

with this:

web_link: '...'

IOW just verifying that there *is* a web link, since in Launchpad it's always similar to the self_link,

I thought that I would catch a lot of 'incorrect rootsite' type errors by printing out the web_link in some detail, but as I mentioned, I only caught two: ICVE and IBugSubscription.

Hopefully this branch isn't too confusing. There's a lot of details but conceptually it's pretty simple, I think.

[Tim Penhey (thumper)]

Looks good to me. Thanks for getting this working.

review: Approve

[Martin Pool (mbp)]

As this lands, please update the API developer guides and maybe mention it on the blog.

=== modified file 'lib/canonical/launchpad/browser/librarian.py'
--- lib/canonical/launchpad/browser/librarian.py	2010-12-20 17:42:47 +0000
+++ lib/canonical/launchpad/browser/librarian.py	2011-02-03 19:06:35 +0000
@@ -29,9 +29,7 @@
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
 from canonical.launchpad.layers import WebServiceLayer
 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.interfaces import (
-    IWebBrowserOriginatingRequest,
-    )
+from lazr.restful.interfaces import IWebBrowserOriginatingRequest
 from canonical.launchpad.webapp.publisher import (
     canonical_url,
     LaunchpadView,
 
=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2011-01-11 03:29:37 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2011-02-03 19:06:35 +0000
@@ -287,7 +287,7 @@
     >>> from lp.bugs.interfaces.bugnomination import IBugNominationSet
     >>> bug_nomination = getUtility(IBugNominationSet).get(1)
     >>> canonical_url(bug_nomination)
-    u'http://launchpad.dev/bugs/1/nominations/1'
+    u'http://bugs.launchpad.dev/bugs/1/nominations/1'
 
 
 == Remote Bug Trackers and Remote Bugs ==
 
=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2011-02-02 15:43:31 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2011-02-03 19:06:35 +0000
@@ -55,7 +55,7 @@
         />
     <adapter
         for="canonical.launchpad.layers.WebServiceLayer"
-        provides="canonical.launchpad.webapp.interfaces.IWebBrowserOriginatingRequest"
+        provides="lazr.restful.interfaces.IWebBrowserOriginatingRequest"
         factory="canonical.launchpad.webapp.servers.web_service_request_to_browser_request"
         />
 
 
=== modified file 'lib/canonical/launchpad/webapp/interfaces.py'
--- lib/canonical/launchpad/webapp/interfaces.py	2010-12-16 22:42:28 +0000
+++ lib/canonical/launchpad/webapp/interfaces.py	2011-02-03 19:06:35 +0000
@@ -854,14 +854,6 @@
         """
 
 
-class IWebBrowserOriginatingRequest(Interface):
-    """Marker interface for converting webservice requests into webapp ones.
-
-    It's used in the webservice domain for calculating webapp URLs, for
-    instance, `ProxiedLibraryFileAlias`.
-    """
-
-
 # XXX mars 2010-07-14 bug=598816
 #
 # We need a conditional import of the request events until the real events
 
=== modified file 'lib/lp/app/doc/tales.txt'
--- lib/lp/app/doc/tales.txt	2010-11-24 18:57:14 +0000
+++ lib/lp/app/doc/tales.txt	2011-02-03 19:06:35 +0000
@@ -806,10 +806,10 @@
 The "standard" 'url' name is supported:
 
     >>> test_tales("bugwatch/fmt:url", bugwatch=sf_bugwatch)
-    u'/bugs/12/+watch/13'
+    u'http://bugs.launchpad.dev/bugs/12/+watch/13'
 
     >>> test_tales("bugwatch/fmt:url", bugwatch=email_bugwatch)
-    u'/bugs/12/+watch/14'
+    u'http://bugs.launchpad.dev/bugs/12/+watch/14'
 
 As are 'external-link' and 'external-link-short', which help when hiding
 email addresses from users who are not logged in:
 
=== modified file 'lib/lp/blueprints/tests/test_webservice.py'
--- lib/lp/blueprints/tests/test_webservice.py	2011-01-06 15:26:14 +0000
+++ lib/lp/blueprints/tests/test_webservice.py	2011-02-03 19:06:35 +0000
@@ -52,7 +52,8 @@
         webservice = webservice_for_person(user)
         response = webservice.get(
             '/%s/+spec/%s' % (spec.product.name, spec.name))
-        expected_keys = [u'self_link', u'http_etag', u'resource_type_link']
+        expected_keys = [u'self_link', u'http_etag', u'resource_type_link',
+                         u'web_link']
         self.assertEqual(response.status, 200)
         self.assertContentEqual(expected_keys, response.jsonBody().keys())
 
 
=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2011-01-11 23:01:02 +0000
+++ lib/lp/bugs/browser/configure.zcml	2011-02-03 19:06:35 +0000
@@ -912,7 +912,8 @@
         <browser:url
             for="lp.bugs.interfaces.cve.ICve"
             path_expression="sequence"
-            parent_utility="lp.bugs.interfaces.cve.ICveSet"/>
+            parent_utility="lp.bugs.interfaces.cve.ICveSet"
+            rootsite="bugs" />
         <browser:defaultView
             for="lp.bugs.interfaces.cve.ICve"
             name="+index"/>
@@ -1121,14 +1122,16 @@
         <browser:url
             for="lp.bugs.interfaces.bugnomination.IBugNomination"
             path_expression="string:nominations/${id}"
-            attribute_to_parent="bug"/>
+            attribute_to_parent="bug"
+            rootsite="bugs" />
     </facet>
     <facet
         facet="bugs">
         <browser:url
             for="lp.bugs.interfaces.bugwatch.IBugWatch"
             path_expression="string:+watch/${id}"
-            attribute_to_parent="bug"/>
+            attribute_to_parent="bug"
+            rootsite="bugs"/>
         <browser:defaultView
             for="lp.bugs.interfaces.bugwatch.IBugWatch"
             name="+edit"/>
 
=== modified file 'lib/lp/bugs/browser/tests/buglinktarget-views.txt'
--- lib/lp/bugs/browser/tests/buglinktarget-views.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/bugs/browser/tests/buglinktarget-views.txt	2011-02-03 19:06:35 +0000
@@ -32,7 +32,7 @@
     Link a bug report
 
     >>> print view.cancel_url
-    http://launchpad.dev/bugs/cve/2005-2730
+    http://bugs.launchpad.dev/bugs/cve/2005-2730
 
 It has a simple widget to enter the bug number or nickname of the bug to link
 to. After it links the bug, it sends a ObjectModifiedEvent.
@@ -86,7 +86,7 @@
     Remove links to bug reports
 
     >>> print view.cancel_url
-    http://launchpad.dev/bugs/cve/2005-2730
+    http://bugs.launchpad.dev/bugs/cve/2005-2730
 
 After removing the bugs, it sends a SQLObjectModified event.
 
 
=== modified file 'lib/lp/bugs/interfaces/bugnomination.py'
--- lib/lp/bugs/interfaces/bugnomination.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/interfaces/bugnomination.py	2011-02-03 19:06:35 +0000
@@ -105,7 +105,7 @@
 
     A nomination can apply to an IDistroSeries or an IProductSeries.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     # We want to customize the titles and descriptions of some of the
     # attributes of our parent interfaces, so we redefine those specific
 
=== modified file 'lib/lp/bugs/interfaces/bugsubscription.py'
--- lib/lp/bugs/interfaces/bugsubscription.py	2011-01-28 10:03:12 +0000
+++ lib/lp/bugs/interfaces/bugsubscription.py	2011-02-03 19:06:35 +0000
@@ -39,7 +39,7 @@
 class IBugSubscription(Interface):
     """The relationship between a person and a bug."""
 
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Int(title=_('ID'), readonly=True, required=True)
     person = exported(PersonChoice(
 
=== modified file 'lib/lp/bugs/stories/webservice/xx-bug-tracker.txt'
--- lib/lp/bugs/stories/webservice/xx-bug-tracker.txt	2010-04-15 08:45:31 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug-tracker.txt	2011-02-03 19:06:35 +0000
@@ -28,6 +28,7 @@
     summary: u'The Mozilla.org bug tracker is the grand-daddy of ...'
     title: u'The Mozilla.org Bug Tracker'
     watches_collection_link: u'http:.../bugs/bugtrackers/mozilla.org/watches'
+    web_link: u'http://bugs.launchpad.dev/bugs/bugtrackers/mozilla.org'
     --- ...
 
 A bug tracker can be retrieved using the the bug tracker collection's
@@ -75,3 +76,4 @@
     summary: u'Wombat summary'
     title: u'Wombat title'
     watches_collection_link: u'http://.../bugs/bugtrackers/wombat/watches'
+    web_link: u'http://bugs.launchpad.dev/bugs/bugtrackers/wombat'
 
=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2011-01-28 10:03:12 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2011-02-03 19:06:35 +0000
@@ -53,6 +53,7 @@
   users_affected_with_dupes_collection_link: u'http://.../bugs/11/users_affected_with_dupes'
   users_unaffected_collection_link: u'http://.../bugs/11/users_unaffected'
   users_unaffected_count: 0
+  web_link: u'http://bugs.../bugs/11'
   who_made_private_link: None
 
 Bugs are indexed by number beneath the top-level collection.
@@ -239,6 +240,7 @@
   resource_type_link: u'http://.../#message'
   self_link: u'http://.../firefox/+bug/5/comments/0'
   subject: u'Firefox install instructions should be complete'
+  web_link: u'http://bugs.../firefox/+bug/5/comments/0'
 
 The messages are stored beneath the bug-specific collection. Their
 URLs are based on their position with respect to the
@@ -283,6 +285,7 @@
   resource_type_link: u'http://api.launchpad.dev/beta/#message'
   self_link: u'http://api.launchpad.dev/beta/firefox/+bug/5/comments/1'
   subject: u'A new message'
+  web_link: u'...'
 
 We don't have to submit a subject when we add a new message.
 
@@ -301,6 +304,7 @@
   ...
   self_link: u'http://api.launchpad.dev/beta/firefox/+bug/5/comments/2'
   subject: u'Re: Firefox install instructions should be complete'
+  web_link: u'...'
 
 
 Bug tasks
@@ -343,6 +347,7 @@
   status: u'Confirmed'
   target_link: u'http://api.../debian/+source/mozilla-firefox'
   title: u'Bug #1 in mozilla-firefox (Debian): "Firefox does not support SVG"'
+  web_link: u'http://bugs.../debian/+source/mozilla-firefox/+bug/1'
 
 The collection of bug tasks is not exposed as a resource:
 
@@ -676,6 +681,7 @@
     target_link: u'http://.../fooix/0.1'
     ---
 
+
 John cannot approve or decline the nomination.
 
     >>> nom_url = nominations['entries'][0]['self_link']
@@ -830,13 +836,14 @@
   resource_type_link: u'http://.../#bug_subscription'
   self_link: u'http://.../bugs/1/+subscription/name12'
   subscribed_by_link: u'http://.../~janitor'
-
+  <BLANKLINE>
   bug_link: u'http://.../bugs/1'
   date_created: u'2006-10-16T18:31:43.154816+00:00'
   person_link: u'http://.../~stevea'
   resource_type_link: u'http://.../#bug_subscription'
   self_link: u'http://.../bugs/1/+subscription/stevea'
   subscribed_by_link: u'http://.../~janitor'
+  <BLANKLINE>
 
 Each subscription can be accessed individually.
 
@@ -1072,6 +1079,7 @@
   self_link: u'http://.../bugs/1/+watch/2'
   title: u'The Mozilla.org Bug Tracker #2000'
   url: u'https://bugzilla.mozilla.org/show_bug.cgi?id=2000'
+  web_link: u'http://bugs.../bugs/1/+watch/2'
 
   >>> bug_watch = webservice.get(bug_watch_2000['self_link']).jsonBody()
   >>> bug_watch == bug_watch_2000
@@ -1143,7 +1151,7 @@
   self_link: u'http://.../bugs/1/+watch/13'
   title: u'The Mozilla.org Bug Tracker #9876'
   url: u'https://bugzilla.mozilla.org/show_bug.cgi?id=9876'
-
+  web_link: u'http://bugs.../bugs/1/+watch/13'
 
 Bug Trackers
 ------------
@@ -1164,6 +1172,7 @@
   summary: u'The Mozilla.org bug tracker is the grand-daddy of bugzillas...'
   title: u'The Mozilla.org Bug Tracker'
   watches_collection_link: u'http://.../bugs/bugtrackers/mozilla.org/watches'
+  web_link: u'http://bugs.../bugs/bugtrackers/mozilla.org'
 
 We can change various aspects of bug trackers.
 
@@ -1220,6 +1229,7 @@
   summary: u'Where Bob files his bugs.'
   title: u"Bob's Tracker"
   watches_collection_link: u'http://.../bugs/bugtrackers/bob/watches'
+  web_link: u'http://bugs.../bugs/bugtrackers/bob'
 
 Non-admins can't disable a bugtracker through the API.
 
@@ -1284,6 +1294,7 @@
   self_link: u'http://.../bugs/1/+attachment/1'
   title: u'numbers.txt'
   type: u'Unspecified'
+  web_link: u'http://bugs.../bugs/1/+attachment/1'
   ---
 
 The attachment can be fetched directly:
@@ -1297,6 +1308,7 @@
   self_link: u'http://.../bugs/1/+attachment/1'
   title: u'numbers.txt'
   type: u'Unspecified'
+  web_link: u'http://bugs.../bugs/1/+attachment/1'
 
 Fetching the data actually yields a redirect to the Librarian, which
 we must follow to download the data.
@@ -1340,6 +1352,7 @@
   resource_type_link: u'http://.../#message'
   self_link: u'http://.../firefox/+bug/1/comments/2'
   subject: u'Re: Firefox does not support SVG'
+  web_link: u'http://bugs.../firefox/+bug/1/comments/2'
 
 The message also links back to the attachments that were uploaded at
 the same time.
@@ -1847,6 +1860,7 @@
     status: u'Candidate'
     title: u'CVE-2005-2737 (Candidate)'
     url: u'http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2005-2737'
+    web_link: u'http://bugs.launchpad.dev/bugs/cve/2005-2737'
     ---
     ...
     self_link: u'http://.../bugs/cve/2005-2736'
@@ -1884,6 +1898,7 @@
     status: u'Entry'
     title: u'CVE-1999-8979 (Entry)'
     url: u'http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=1999-8979'
+    web_link: u'http://bugs.launchpad.dev/bugs/cve/1999-8979'
     ---
 
 For every CVE we can also look at the bugs linked to it.
 
=== modified file 'lib/lp/code/interfaces/diff.py'
--- lib/lp/code/interfaces/diff.py	2010-12-02 16:13:51 +0000
+++ lib/lp/code/interfaces/diff.py	2011-02-03 19:06:35 +0000
@@ -122,7 +122,7 @@
     trying to determine the effective changes of landing the source branch on
     the target branch.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     source_revision_id = exported(
         TextLine(
 
=== modified file 'lib/lp/code/stories/webservice/xx-branch.txt'
--- lib/lp/code/stories/webservice/xx-branch.txt	2010-10-22 13:43:50 +0000
+++ lib/lp/code/stories/webservice/xx-branch.txt	2011-02-03 19:06:35 +0000
@@ -142,9 +142,9 @@
     subscriptions_collection_link: u'http://.../~eric/fooix/trunk/subscriptions'
     unique_name: u'~eric/fooix/trunk'
     url: None
+    web_link: u'http://code.../~eric/fooix/trunk'
     whiteboard: None
 
-
 There is a branch merge proposal with Fooix trunk as the target branch, so it
 should have a branch at the endpoint of landing_candidates.
 
 
=== modified file 'lib/lp/code/stories/webservice/xx-branchmergeproposal.txt'
--- lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2010-10-26 03:06:30 +0000
+++ lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2011-02-03 19:06:35 +0000
@@ -75,6 +75,7 @@
     target_branch_link: u'http://api.launchpad.dev/devel/~...'
     votes_collection_link:
         u'http://api.launchpad.dev/devel/~.../+merge/.../votes'
+    web_link: u'http://code.../~.../+merge/...'
 
 If we try and create the merge proposal again, we should get a ValueError.
 
@@ -170,6 +171,7 @@
     supersedes_link: None
     target_branch_link: u'http://.../~target/fooix/trunk'
     votes_collection_link: u'http://.../~source/fooix/fix-it/+merge/.../votes'
+    web_link: u'http://code.../~source/fooix/fix-it/+merge/...'
 
 
 == Read the comments ==
@@ -192,6 +194,7 @@
     title: u'Comment on proposed merge of lp://dev/~source/fooix/fix-it into lp://dev/~target/fooix/trunk'
     vote: u'Approve'
     vote_tag: u'code'
+    web_link: u'http://code.../~source/fooix/fix-it/+merge/.../comments/...'
 
     >>> comment_2 = webservice.named_get(
     ...     merge_proposal['self_link'], 'getComment', id=2).jsonBody()
@@ -207,6 +210,7 @@
     title: ...
     vote: u'Abstain'
     vote_tag: None
+    web_link: u'http://code.../~source/fooix/fix-it/+merge/.../comments/...'
 
 
 == Check the votes ==
@@ -280,7 +284,7 @@
     title: ...
     vote: u'Approve'
     vote_tag: u'code'
-
+    web_link: u'http://code.../~source/fooix/fix-it/+merge/.../comments/...'
 
 In fact, now that the votes indicate approval, we might as well set the merge
 proposal status to "Approved" as well.
 
=== modified file 'lib/lp/code/stories/webservice/xx-branchsubscription.txt'
--- lib/lp/code/stories/webservice/xx-branchsubscription.txt	2010-05-27 04:35:57 +0000
+++ lib/lp/code/stories/webservice/xx-branchsubscription.txt	2011-02-03 19:06:35 +0000
@@ -39,6 +39,7 @@
     review_level: u'No email'
     self_link: u'http://.../~farmer-bob/farm/corn/+subscription/farmer-joe'
     subscribed_by_link: u'http://.../~salgado'
+    web_link: u'http://code.../~farmer-bob/farm/corn/+subscription/farmer-joe'
 
     >>> def print_subscriber_count(branch):
     ...     subscribers = webservice.get(
@@ -93,6 +94,7 @@
     review_level: u'Status changes only'
     self_link: u'http://.../~farmer-bob/farm/corn/+subscription/farmer-joe'
     subscribed_by_link: u'http://.../~salgado'
+    web_link: u'http://code.../~farmer-bob/farm/corn/+subscription/farmer-joe'
 
 
 We print the count, and even though subscribe was called again, there's still
 
=== modified file 'lib/lp/hardwaredb/interfaces/hwdb.py'
--- lib/lp/hardwaredb/interfaces/hwdb.py	2010-11-09 14:47:27 +0000
+++ lib/lp/hardwaredb/interfaces/hwdb.py	2011-02-03 19:06:35 +0000
@@ -156,7 +156,7 @@
 
     See doc/hwdb.txt for details about the attributes.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     date_created = exported(
         Datetime(
@@ -433,7 +433,7 @@
 
 class IHWDriver(Interface):
     """Information about a device driver."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = exported(
         Int(title=u'Driver ID', required=True, readonly=True))
@@ -560,7 +560,7 @@
 class IHWDriverName(Interface):
     """A driver name as appearing in `IHWDriver`.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     name = exported(
         TextLine(
@@ -572,7 +572,7 @@
 class IHWDriverPackageName(Interface):
     """A driver name as appearing in `IHWDriver`.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     package_name = exported(
         TextLine(
@@ -659,7 +659,7 @@
 class IHWVendorID(Interface):
     """A list of vendor IDs for different busses associated with vendor names.
     """
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
     id = exported(
         Int(title=u'The Database ID', required=True, readonly=True))
 
@@ -714,7 +714,7 @@
 
 class IHWDeviceClass(Interface):
     """The capabilities of a device."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Int(title=u'Device class ID', required=True, readonly=True)
     device = Reference(schema=Interface)
@@ -774,7 +774,7 @@
 
 class IHWDevice(Interface):
     """Core information to identify a device."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = exported(
         Int(title=u'Device ID', required=True, readonly=True))
@@ -1038,7 +1038,7 @@
 
 class IHWSubmissionDevice(Interface):
     """Link a submission to a IHWDeviceDriver row."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = exported(
         Int(title=u'HWSubmissionDevice ID', required=True, readonly=True))
@@ -1169,7 +1169,7 @@
 class IHWDBApplication(ILaunchpadApplication):
     """Hardware database application application root."""
 
-    export_as_webservice_entry('hwdb')
+    export_as_webservice_entry('hwdb', publish_web_link=False)
 
     @operation_parameters(
         bus=Choice(
 
=== modified file 'lib/lp/registry/interfaces/productrelease.py'
--- lib/lp/registry/interfaces/productrelease.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/interfaces/productrelease.py	2011-02-03 19:06:35 +0000
@@ -217,7 +217,7 @@
 class IProductReleaseFile(IProductReleaseFileEditRestricted,
                           IProductReleaseFilePublic):
     """A file associated with a ProductRelease."""
-    export_as_webservice_entry("project_release_file")
+    export_as_webservice_entry("project_release_file", publish_web_link=False)
 
 
 class IProductReleaseEditRestricted(Interface):
 
=== modified file 'lib/lp/registry/interfaces/structuralsubscription.py'
--- lib/lp/registry/interfaces/structuralsubscription.py	2011-01-13 15:12:36 +0000
+++ lib/lp/registry/interfaces/structuralsubscription.py	2011-02-03 19:06:35 +0000
@@ -146,7 +146,7 @@
     IStructuralSubscriptionPublic, IStructuralSubscriptionRestricted):
     """A subscription to a Launchpad structure."""
 
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
 
 class IStructuralSubscriptionTargetRead(Interface):
 
=== modified file 'lib/lp/registry/interfaces/wikiname.py'
--- lib/lp/registry/interfaces/wikiname.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/interfaces/wikiname.py	2011-02-03 19:06:35 +0000
@@ -26,7 +26,7 @@
 
 class IWikiName(IHasOwner):
     """Wiki for Users"""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
     id = Int(title=_("Database ID"), required=True, readonly=True)
     # schema=Interface will be overriden in person.py because of circular
     # dependencies.
 
=== modified file 'lib/lp/registry/stories/webservice/xx-distribution-mirror.txt'
--- lib/lp/registry/stories/webservice/xx-distribution-mirror.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/registry/stories/webservice/xx-distribution-mirror.txt	2011-02-03 19:06:35 +0000
@@ -32,6 +32,7 @@
     self_link: u'http://.../ubuntu/+mirror/canonical-archive'
     speed: u'100 Mbps'
     status: u'Official'
+    web_link: u'http://launchpad.../ubuntu/+mirror/canonical-archive'
     whiteboard: None
 
 And CD image mirrors:
@@ -60,6 +61,7 @@
     self_link: u'http://.../ubuntu/+mirror/canonical-releases'
     speed: u'100 Mbps'
     status: u'Official'
+    web_link: u'http://launchpad.../ubuntu/+mirror/canonical-releases'
     whiteboard: None
 
 = Security checks =
@@ -152,6 +154,7 @@
     self_link: u'http://.../ubuntu/+mirror/archive-404-mirror'
     speed: u'512 Kbps'
     status: u'Official'
+    web_link: u'http://launchpad.../ubuntu/+mirror/archive-404-mirror'
     whiteboard: None
 
 Now trying to set the owner using Sample Person's webservice is not authorized.
@@ -234,6 +237,7 @@
     self_link: u'http://.../ubuntu/+mirror/canonical-releases'
     speed: u'100 Mbps'
     status: u'Unofficial'
+    web_link: u'http://launchpad.../ubuntu/+mirror/canonical-releases'
     whiteboard: u'This mirror is too shiny to be true'
 
 = Distribution Mirror Custom Operations =
 
=== modified file 'lib/lp/registry/stories/webservice/xx-distribution-source-package.txt'
--- lib/lp/registry/stories/webservice/xx-distribution-source-package.txt	2010-06-08 13:07:44 +0000
+++ lib/lp/registry/stories/webservice/xx-distribution-source-package.txt	2011-02-03 19:06:35 +0000
@@ -19,7 +19,8 @@
      u'resource_type_link': u'http://.../#distribution_source_package',
      u'self_link': u'http://.../debian/+source/mozilla-firefox',
      u'title': u'\u201cmozilla-firefox\u201d package in Debian',
-     u'upstream_product_link': None}
+     u'upstream_product_link': None,
+     u'web_link': u'http://launchpad.../debian/+source/mozilla-firefox'}
 
 You can obtain a collection of bug tasks associated with the source
 package using the "getBugTasks" method.
 
=== modified file 'lib/lp/registry/stories/webservice/xx-distribution.txt'
--- lib/lp/registry/stories/webservice/xx-distribution.txt	2010-11-03 01:42:20 +0000
+++ lib/lp/registry/stories/webservice/xx-distribution.txt	2011-02-03 19:06:35 +0000
@@ -49,6 +49,7 @@
     series_collection_link: u'http://.../ubuntu/series'
     summary: u'Ubuntu is a new approach to Linux Distribution...'
     title: u'Ubuntu Linux'
+    web_link: u'http://launchpad.../ubuntu'
 
 
 Distribution Custom Operations
@@ -155,6 +156,7 @@
     self_link: u'http://.../ubuntu/+mirror/canonical-releases'
     speed: u'100 Mbps'
     status: u'Official'
+    web_link: u'http://launchpad.../ubuntu/+mirror/canonical-releases'
     whiteboard: None
 
 "getCountryMirror" returns the country DNS mirror for a given country;
 
=== modified file 'lib/lp/registry/stories/webservice/xx-distroseries.txt'
--- lib/lp/registry/stories/webservice/xx-distroseries.txt	2010-06-09 08:26:26 +0000
+++ lib/lp/registry/stories/webservice/xx-distroseries.txt	2011-02-03 19:06:35 +0000
@@ -84,7 +84,7 @@
     supported: False
     title: u'The Hoary Hedgehog Release'
     version: u'5.04'
-
+    web_link: u'http://launchpad.../ubuntu/hoary'
 
 Creating a milestone on the distroseries
 ----------------------------------------
 
=== modified file 'lib/lp/registry/stories/webservice/xx-person.txt'
--- lib/lp/registry/stories/webservice/xx-person.txt	2010-12-02 20:40:31 +0000
+++ lib/lp/registry/stories/webservice/xx-person.txt	2011-02-03 19:06:35 +0000
@@ -58,6 +58,7 @@
     team_owner_link: None
     time_zone: None
     visibility: u'Public'
+    web_link: u'http://launchpad.../~salgado'
     wiki_names_collection_link: u'http://.../~salgado/wiki_names'
 
     >>> ubuntu_team = webservice.get("/~ubuntu-team").jsonBody()
@@ -120,6 +121,7 @@
     team_owner_link: u'http://.../~mark'
     time_zone: None
     visibility: u'Public'
+    web_link: u'http://launchpad.../~ubuntu-team'
     wiki_names_collection_link: u'http://.../~ubuntu-team/wiki_names'
 
     >>> sorted(set(ubuntu_team.keys()).difference(salgado.keys()))
@@ -292,7 +294,8 @@
     >>> sorted(salgado_landscape)
     [u'date_expires', u'date_joined', u'http_etag',
      u'last_change_comment', u'last_changed_by_link', u'member_link',
-     u'resource_type_link', u'self_link', u'status', u'team_link']
+     u'resource_type_link', u'self_link', u'status', u'team_link',
+     u'web_link']
 
 Each team membership links to the person who approved the link.
 
@@ -699,6 +702,7 @@
     self_link: u'...'
     title: u'...'
     upstream_product_link: None
+    web_link: u'...'
     ---
 
 
 
=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/lp/registry/stories/webservice/xx-project-registry.txt	2010-12-22 14:50:08 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt	2011-02-03 19:06:35 +0000
@@ -88,6 +88,7 @@
     sourceforge_project: None
     summary: u'The Mozilla Project...'
     title: u'The Mozilla Project'
+    web_link: u'http://launchpad.../mozilla'
     wiki_url: None
 
 The milestones can be accessed through the
@@ -192,6 +193,7 @@
     summary: u'The Mozilla Firefox web browser'
     title: u'Mozilla Firefox'
     translation_focus_link: None
+    web_link: u'http://launchpad.../firefox'
     wiki_url: None
 
 In Launchpad project names may not have uppercase letters in their
@@ -255,6 +257,7 @@
     summary: u'The Mozilla Firefox web browser'
     title: u'Mozilla Firefox'
     translation_focus_link: None
+    web_link: u'http://launchpad.../firefox'
     wiki_url: None
 
 The milestones can be accessed through the
@@ -499,7 +502,8 @@
                    u'resource_type_link': u'.../#timeline_project_series',
                    u'self_link': u'http://.../firefox/trunk',
                    u'status': u'Obsolete',
-                   u'uri': u'/firefox/trunk'},
+                   u'uri': u'/firefox/trunk',
+                   u'web_link': u'http://launchpad.../firefox/trunk'},
                   {u'http_etag': ...
                    u'is_development_focus': False,
                    u'landmarks': [{u'code_name': u'First Stable Release',
@@ -512,7 +516,8 @@
                    u'resource_type_link': u'.../#timeline_project_series',
                    u'self_link': u'http://.../firefox/1.0',
                    u'status': u'Active Development',
-                   u'uri': u'/firefox/1.0'},
+                   u'uri': u'/firefox/1.0',
+                   u'web_link': u'http://launchpad.../firefox/1.0'},
                   {u'http_etag': ...
                    u'is_development_focus': False,
                    u'landmarks': [],
@@ -521,7 +526,8 @@
                    u'resource_type_link': u'.../#timeline_project_series',
                    u'self_link': u'http://.../firefox/experimental',
                    u'status': u'Active Development',
-                   u'uri': u'/firefox/experimental'}],
+                   u'uri': u'/firefox/experimental',
+                   u'web_link': u'http://launchpad.../firefox/experimental'}],
      u'start': 0,
      u'total_size': 3}
 
@@ -879,6 +885,7 @@
     status: u'Active Development'
     summary: u'Foobadoo support for Babadoo'
     title: u'Babadoo foobadoo series'
+    web_link: u'http://launchpad.../babadoo/foobadoo'
 
 "get_timeline" returns a lightweight representation of the series'
 milestones and releases.
@@ -894,7 +901,8 @@
      u'resource_type_link': u'http://.../#timeline_project_series',
      u'self_link': u'http://.../babadoo/foobadoo',
      u'status': u'Active Development',
-     u'uri': u'/babadoo/foobadoo'}
+     u'uri': u'/babadoo/foobadoo',
+     u'web_link': u'http://launchpad.../babadoo/foobadoo'}
 
 
 Creating a milestone on the product series
@@ -982,6 +990,7 @@
     self_link: u'http://.../firefox/1.0/1.0.0'
     title: u'Mozilla Firefox 1.0.0 "First Stable Release"'
     version: u'1.0.0'
+    web_link: u'http://launchpad.../firefox/1.0/1.0.0'
 
 The createProductRelease method is called by sending
 "ws.op=createProductRelease" as a request variable along with the
@@ -1059,6 +1068,7 @@
     summary: None
     target_link: u'http://.../firefox'
     title: u'Mozilla Firefox 1.0'
+    web_link: u'http://launchpad.../firefox/+milestone/1.0'
 
 The milestone entry has a link to its release if it has one.
 
 
=== modified file 'lib/lp/services/worlddata/interfaces/country.py'
--- lib/lp/services/worlddata/interfaces/country.py	2010-08-20 20:31:18 +0000
+++ lib/lp/services/worlddata/interfaces/country.py	2011-02-03 19:06:35 +0000
@@ -41,7 +41,8 @@
 
 class ICountry(Interface):
     """The country description."""
-    export_as_webservice_entry(plural_name='countries')
+    export_as_webservice_entry(
+        plural_name='countries', publish_web_link=False)
 
     id = Int(
         title=_('Country ID'), required=True, readonly=True,
 
=== modified file 'lib/lp/soyuz/interfaces/archivedependency.py'
--- lib/lp/soyuz/interfaces/archivedependency.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/archivedependency.py	2011-02-03 19:06:35 +0000
@@ -31,7 +31,7 @@
 
 class IArchiveDependency(Interface):
     """ArchiveDependency interface."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Int(title=_("The archive ID."), readonly=True)
 
 
=== modified file 'lib/lp/soyuz/interfaces/archivepermission.py'
--- lib/lp/soyuz/interfaces/archivepermission.py	2010-08-23 17:16:35 +0000
+++ lib/lp/soyuz/interfaces/archivepermission.py	2011-02-03 19:06:35 +0000
@@ -41,7 +41,7 @@
 
 class IArchivePermission(Interface):
     """The interface for `ArchivePermission`."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Attribute("The archive permission ID.")
 
 
=== modified file 'lib/lp/soyuz/interfaces/packageset.py'
--- lib/lp/soyuz/interfaces/packageset.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/packageset.py	2011-02-03 19:06:35 +0000
@@ -62,7 +62,7 @@
 
 class IPackagesetViewOnly(IHasOwner):
     """A read-only interface for package sets."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Int(title=_('ID'), required=True, readonly=True)
 
@@ -244,7 +244,7 @@
 
 class IPackagesetEdit(Interface):
     """A writeable interface for package sets."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     def add(data):
         """Add source package names or other package sets to this one.
@@ -349,7 +349,7 @@
 
 class IPackageset(IPackagesetViewOnly, IPackagesetEdit):
     """An interface for package sets."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
 
 class IPackagesetSet(Interface):
 
=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2011-01-11 04:07:35 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2011-02-03 19:06:35 +0000
@@ -635,7 +635,7 @@
 class ISourcePackagePublishingHistory(ISourcePackagePublishingHistoryPublic,
                                       IPublishingEdit):
     """A source package publishing history record."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
 
 #
@@ -855,7 +855,7 @@
 class IBinaryPackagePublishingHistory(IBinaryPackagePublishingHistoryPublic,
                                       IPublishingEdit):
     """A binary package publishing record."""
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
 
 class IPublishingSet(Interface):
 
=== modified file 'lib/lp/soyuz/interfaces/queue.py'
--- lib/lp/soyuz/interfaces/queue.py	2010-08-24 15:51:02 +0000
+++ lib/lp/soyuz/interfaces/queue.py	2011-02-03 19:06:35 +0000
@@ -99,7 +99,7 @@
 class IPackageUpload(Interface):
     """A Queue item for the archive uploader."""
 
-    export_as_webservice_entry()
+    export_as_webservice_entry(publish_web_link=False)
 
     id = Int(
             title=_("ID"), required=True, readonly=True,
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2011-02-03 19:06:35 +0000
@@ -28,6 +28,7 @@
     resource_type_link: u'http://.../#archive'
     self_link: u'http://.../~cprov/+archive/ppa'
     signing_key_fingerprint: None
+    web_link: u'http://launchpad.../~cprov/+archive/ppa'
 
 While the Archive signing key is being generated its
 'signing_key_fingerprint' attribute is None.
@@ -93,6 +94,7 @@
     resource_type_link: u'http://.../#archive'
     self_link: u'http://.../ubuntutest/+archive/primary'
     signing_key_fingerprint: None
+    web_link: u'http://launchpad.../ubuntutest/+archive/primary'
 
 A distribution can also provide a list of all its archives:
 
@@ -833,6 +835,7 @@
     resource_type_link: u'http://.../#archive'
     self_link: u'http://.../~cprov/+archive/p3a'
     signing_key_fingerprint: u'tag:launchpad.net:2008:redacted'
+    web_link: u'http://launchpad.../~cprov/+archive/p3a'
 
     >>> pprint_entry(cprov_webservice.get("/~cprov/+archive/p3a").jsonBody())
     commercial: False
@@ -847,6 +850,7 @@
     resource_type_link: u'http://.../#archive'
     self_link: u'http://.../~cprov/+archive/p3a'
     signing_key_fingerprint: u'ABCDEF0123456789ABCDDCBA0000111112345678'
+    web_link: u'http://launchpad.../~cprov/+archive/p3a'
 
 == Creating subscriptions to a (private) archive ==
 
@@ -904,6 +908,7 @@
     self_link: u'http://api.../~cprov/+archive/p3a/+subscriptions/mark'
     status: u'Active'
     subscriber_link: u'http://api.launchpad.dev/beta/~mark'
+    web_link: u'http://launchpad.../~cprov/+archive/p3a/+subscriptions/mark'
 
 Other webservice users cannot view the subscription.
 
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2011-01-18 23:43:48 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2011-02-03 19:06:35 +0000
@@ -54,11 +54,12 @@
     log_url: u'http://.../~cprov/+archive/ppa/+buildjob/26/+files/netapplet-1.0.0.tar.gz'
     pocket: u'Release'
     resource_type_link: u'http://api.launchpad.dev/beta/#build'
-    score: None 
+    score: None
     self_link: u'http://api.launchpad.dev/beta/~cprov/+archive/ppa/+buildjob/26'
     status: u'Failed to build'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
+    web_link: u'http://launchpad.../~cprov/+archive/ppa/+buildjob/26'
 
 Whereas the 1.0 webservice for builds maintains the old property names
 (without underscores):
@@ -85,6 +86,7 @@
     self_link: u'http://.../~cprov/+archive/ppa/+buildjob/26'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
+    web_link: u'http://launchpad.../~cprov/+archive/ppa/+buildjob/26'
 
 For testing purposes we will set 'buildlog' and 'upload_log' to the
 same library file, so both can be verified.
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt'
--- lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt	2011-01-19 00:32:50 +0000
+++ lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt	2011-02-03 19:06:35 +0000
@@ -46,4 +46,4 @@
     self_link: u'http://.../ubuntu/hoary/i386'
     supports_virtualized: True
     title: u'The Hoary Hedgehog Release for i386 (x86)'
-
+    web_link: u'http://launchpad.../ubuntu/hoary/i386'
 
=== modified file 'lib/lp/translations/stories/webservice/xx-potemplate.txt'
--- lib/lp/translations/stories/webservice/xx-potemplate.txt	2010-07-14 06:36:24 +0000
+++ lib/lp/translations/stories/webservice/xx-potemplate.txt	2011-02-03 19:06:35 +0000
@@ -28,6 +28,7 @@
     translation_domain: u'pmount'
     translation_files_collection_link:
         u'http://.../pmount/+pots/pmount/translation_files'
+    web_link: u'http://translations.launchpad.../ubuntu/hoary/+source/pmount/+pots/pmount'
 
 "translation_files" will list all POFiles associated with this template.
 
 
=== modified file 'versions.cfg'
--- versions.cfg	2011-02-02 09:14:02 +0000
+++ versions.cfg	2011-02-03 19:06:35 +0000
@@ -33,8 +33,8 @@
 lazr.delegates = 1.2.0
 lazr.enum = 1.1.2
 lazr.lifecycle = 1.1
-lazr.restful = 0.15.4
-lazr.restfulclient = 0.11.1
+lazr.restful = 0.16.0
+lazr.restfulclient = 0.11.2
 lazr.smtptest = 1.1
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2
@@ -75,7 +75,7 @@
 Twisted = 10.2.0-4395fix-1
 uuid = 1.30
 van.testing = 2.0.1
-wadllib = 1.1.5
+wadllib = 1.2.0
 webunit = 1.3.8
 # r1579 of lp:windmill, with a fix for the 512k bug.
 # Built from lp:~launchpad/windmill/512k-bug-fix.