Merge ~jugmac00/launchpadlib:apply-inclusive-naming into launchpadlib:main

[Jürgen Gmach]

Apply inclusive naming via the `woke` `pre-commit` hook

[Jürgen Gmach (jugmac00)]

Thanks for the review! I replied to all comments, but it looks like the only thing to do is to replace the devel with the 1.0 version. Which I will do in a min.

[Jürgen Gmach (jugmac00)]

Please note - the diff is too long and needs to be reviewed on the command line (or similar).

[Colin Watson (cjwatson)]

I've only really sampled the WADL updates, but they broadly look fine to me and are clearly just bringing things up to date with Launchpad itself. The rest is OK too.

review: Approve

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c528329..fe333f3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,3 +19,7 @@ repos:
     rev: 21.9b0
     hooks:
     - id: black
+-   repo: https://github.com/get-woke/woke
+    rev: v0.17.0
+    hooks:
+    -   id: woke-from-source
diff --git a/.woke.yaml b/.woke.yaml
new file mode 100644
index 0000000..424838e
--- /dev/null
+++ b/.woke.yaml
@@ -0,0 +1,228 @@
+
+# Based on Canonical's Guidelines
+# https://docs.google.com/document/d/1mJUa1VJHOMWa723dmKmNjSKGW-nlBv9xktzGZZwacVo/edit#heading=h.5efudb237qdb
+rules:
+  - name: whitelist
+    terms:
+      - whitelist
+      - white-list
+      - whitelisted
+      - white-listed
+    alternatives:
+      - allowlist
+      - inclusion list
+    severity: warning
+    note: "The underlying assumption of the whitelist/blacklist metaphor is that white = good and black = bad. Because colors in and of themselves have no predetermined meaning, any meaning we assign to them is cultural: for example, the color red in many Southeast Asian countries is lucky, and is often associated with events like marriages, whereas the color white carries the same connotations in many European countries. In the case of whitelist/blacklist, the terms originate in the publishing industry – one dominated by the USA and England, two countries which participated in slavery and which grapple with their racist legacies to this day."
+
+  - name: blacklist
+    terms:
+      - blacklist
+      - black-list
+      - blacklisted
+      - black-listed
+    alternatives:
+      - denylist
+      - blocklist
+      - exclusion list
+    severity: warning
+    note: "The underlying assumption of the whitelist/blacklist metaphor is that white = good and black = bad. Because colors in and of themselves have no predetermined meaning, any meaning we assign to them is cultural: for example, the color red in many Southeast Asian countries is lucky, and is often associated with events like marriages, whereas the color white carries the same connotations in many European countries. In the case of whitelist/blacklist, the terms originate in the publishing industry – one dominated by the USA and England, two countries which participated in slavery and which grapple with their racist legacies to this day."
+
+  - name: master-slave
+    terms:
+      - master-slave
+      - master/slave
+    alternatives:
+      - leader/follower
+      - main/replica
+      - primary/replica
+      - primary/standby
+      - primary/secondary
+
+  - name: slave
+    terms:
+      - slave
+    alternatives:
+      - follower
+      - replica
+      - standby
+
+  - name: grandfathered
+    terms:
+      - grandfathered
+    alternatives:
+      - legacy status
+      - legacied
+      - exempted
+      - carried
+      - brought forward
+      - rolled over
+
+  - name: man-hours
+    terms:
+      - man hours
+      - man-hours
+    alternatives:
+      - person hours
+      - engineer hours
+
+  - name: sanity
+    terms:
+      - sanity
+    alternatives:
+      - confidence
+      - quick check
+      - coherence check
+
+  - name: dummy
+    terms:
+      - dummy
+    alternatives:
+      - placeholder
+      - sample
+
+  - name: guys
+    terms:
+      - guys
+    alternatives:
+      - folks
+      - people
+      - you all
+      - y'all
+      - yinz
+
+  - name: whitebox
+    terms:
+      - white-box
+      - whitebox
+      - white box
+    alternatives:
+      - open-box
+
+  - name: blackbox
+    terms:
+      - black-box
+      - blackbox
+      - black box
+    alternatives:
+      - closed-box
+
+  - name: blackhat
+    terms:
+      - blackhat
+      - black-hat
+      - black hat
+    alternatives:
+      - attacker
+      - malicious actor
+
+  - name: whitehat
+    terms:
+      - whitehat
+      - white-hat
+      - white hat
+    alternatives:
+      - researcher
+      - security specialist
+
+  - name: illegal characters
+    terms:
+      - illegal characters
+    alternatives:
+      - invalid characters
+      - unsupported characters
+      - special characters
+
+  - name: native feature
+    terms:
+      - native feature
+    alternatives:
+      - core feature
+      - built-in feature
+
+  - name: native feature
+    terms:
+      - native feature
+    alternatives:
+      - core feature
+      - built-in feature
+
+  - name: chairman/foreman
+    terms:
+      - chairman
+      - foreman
+    alternatives:
+      - chair
+      - foreperson
+
+  - name: man in the middle
+    terms:
+      - man in the middle
+      - man-in-the-middle
+    alternatives:
+      - machine-in-the-middle
+      - person-in-the-middle
+      - system-in-the-middle
+      - intermediary attack
+
+  - name: middleman
+    terms:
+      - middleman
+    alternatives:
+      - middleperson
+      - intermediary
+
+  - name: manned
+    terms:
+      - manned
+    alternatives:
+      - crewed
+      - staffed
+      - monitored
+      - human operated
+
+  - name: mom test / girlfriend test
+    terms:
+      - mom test
+      - girlfriend test
+    alternatives:
+      - user test
+      - user friendly
+
+  - name: crazy
+    terms:
+      - crazy
+    alternatives:
+      - baffling
+      - unexplained
+      - errant
+
+  - name: cripples
+    terms:
+      - cripples
+    alternatives:
+      - slows down
+      - hinders
+      - obstructs
+
+  - name: crippling 
+    terms:
+      - crippling
+    alternatives:
+      - attenuating
+      - incapacitating
+
+  - name: stonith/stomith 
+    terms:
+      - stonith
+      - stomith
+    alternatives:
+      - fence failed nodes
+      - machines
+
+  - name: demilitarized zone 
+    terms:
+      - demilitarized zone
+      - dmz
+    alternatives:
+      - perimeter network
+      - passthrough network
\ No newline at end of file
diff --git a/NEWS.rst b/NEWS.rst
index d89f010..b7c734b 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,7 @@ NEWS for launchpadlib
 - Apply ``black`` code formatter.
 - Publish documentation on Read the Docs.
 - Remove remnants of ``simplejson`` in favour of ``json``.
+- Apply inclusive naming via the ``woke`` ``pre-commit`` hook.
 
 1.10.15.1 (2021-10-27)
 ======================
diff --git a/src/launchpadlib/testing/launchpad-wadl.xml b/src/launchpadlib/testing/launchpad-wadl.xml
index 0d87ea8..f138c26 100644
--- a/src/launchpadlib/testing/launchpad-wadl.xml
+++ b/src/launchpadlib/testing/launchpad-wadl.xml
@@ -2,20 +2,14 @@
 <!DOCTYPE application [
   <!ENTITY nbsp "\&#160;">
 ]>
-<wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xmlns="http://research.sun.com/wadl/2006/10"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wadl="http://research.sun.com/wadl/2006/10"
-                  xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd">
-
-  <wadl:doc xmlns="http://www.w3.org/1999/xhtml"
-            title="About this service">The Launchpad web service allows automated
+<wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://research.sun.com/wadl/2006/10" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wadl="http://research.sun.com/wadl/2006/10" xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd">
+
+  <wadl:doc xmlns="http://www.w3.org/1999/xhtml" title="About this service">The Launchpad web service allows automated
         clients to access most of the functionality available on the
         Launchpad web site. For help getting started, see
         <a href="https://help.launchpad.net/API/">the help wiki.</a></wadl:doc>
 
-  <wadl:doc xmlns="http://www.w3.org/1999/xhtml"
-            title="About version 1.0">This version of the web service removes unnecessary
+  <wadl:doc xmlns="http://www.w3.org/1999/xhtml" title="About version 1.0">This version of the web service removes unnecessary
         named operations. It was introduced in March 2010, and its
         end-of-life date is April 2015, the same as the server version
         of the Ubuntu release "Lucid Lynx".</wadl:doc>
@@ -23,7 +17,7 @@
   <!--There is one "service root" resource, located (as you'd expect)
       at the service root. This very document is the WADL
       representation of the "service root" resource.-->
-  <wadl:resources base="https://api.launchpad.net/1.0/">
+  <wadl:resources base="https://api.launchpad.test/1.0/">
     <wadl:resource path="" type="#service-root"/>
   </wadl:resources>
 
@@ -42,141 +36,153 @@
       number of links to collection-type resources.-->
   <wadl:representation mediaType="application/json" id="service-root-json">
     
-      <wadl:param style="plain"
-                  path="$['branches_collection_link']"
-                  name="branches_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#branches"/>
+      <wadl:param style="plain" name="archives_collection_link" path="$['archives_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#archives"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="branches_collection_link" path="$['branches_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#branches"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="bug_trackers_collection_link" path="$['bug_trackers_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#bug_trackers"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="bugs_collection_link" path="$['bugs_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#bugs"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="builders_collection_link" path="$['builders_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#builders"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="charm_bases_collection_link" path="$['charm_bases_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#charm_bases"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['bug_trackers_collection_link']"
-                  name="bug_trackers_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#bug_trackers"/>
+      <wadl:param style="plain" name="charm_recipes_collection_link" path="$['charm_recipes_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#charm_recipes"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['bugs_collection_link']"
-                  name="bugs_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#bugs"/>
+      <wadl:param style="plain" name="countries_collection_link" path="$['countries_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#countries"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['builders_collection_link']"
-                  name="builders_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#builders"/>
+      <wadl:param style="plain" name="cves_collection_link" path="$['cves_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#cves"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['countries_collection_link']"
-                  name="countries_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#countries"/>
+      <wadl:param style="plain" name="distributions_collection_link" path="$['distributions_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#distributions"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['cves_collection_link']"
-                  name="cves_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#cves"/>
+      <wadl:param style="plain" name="git_repositories_collection_link" path="$['git_repositories_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#git_repositories"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['distributions_collection_link']"
-                  name="distributions_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#distributions"/>
+      <wadl:param style="plain" name="languages_collection_link" path="$['languages_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#languages"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['languages_collection_link']"
-                  name="languages_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#languages"/>
+      <wadl:param style="plain" name="livefses_collection_link" path="$['livefses_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#livefses"/>
       </wadl:param>
     
     
-      <wadl:param style="plain" path="$['me_link']"
-                  name="me_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
+      <wadl:param style="plain" name="me_link" path="$['me_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['packagesets_collection_link']"
-                  name="packagesets_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#packagesets"/>
+      <wadl:param style="plain" name="packagesets_collection_link" path="$['packagesets_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#packagesets"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['people_collection_link']"
-                  name="people_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#people"/>
+      <wadl:param style="plain" name="people_collection_link" path="$['people_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#people"/>
       </wadl:param>
     
     
-      <wadl:param style="plain" path="$['pillars_link']"
-                  name="pillars_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#pillars"/>
+      <wadl:param style="plain" name="pillars_link" path="$['pillars_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#pillars"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['processor_families_collection_link']"
-                  name="processor_families_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#processor_families"/>
+      <wadl:param style="plain" name="polls_collection_link" path="$['polls_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#polls"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['processors_collection_link']"
-                  name="processors_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#processors"/>
+      <wadl:param style="plain" name="processors_collection_link" path="$['processors_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#processors"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['project_groups_collection_link']"
-                  name="project_groups_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#project_groups"/>
+      <wadl:param style="plain" name="project_groups_collection_link" path="$['project_groups_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#project_groups"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['projects_collection_link']"
-                  name="projects_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#projects"/>
+      <wadl:param style="plain" name="projects_collection_link" path="$['projects_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#projects"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['questions_collection_link']"
-                  name="questions_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#questions"/>
+      <wadl:param style="plain" name="questions_collection_link" path="$['questions_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#questions"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['temporary_blobs_collection_link']"
-                  name="temporary_blobs_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#temporary_blobs"/>
+      <wadl:param style="plain" name="services_link" path="$['services_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#service_factory"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['translation_groups_collection_link']"
-                  name="translation_groups_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#translation_groups"/>
+      <wadl:param style="plain" name="snap_bases_collection_link" path="$['snap_bases_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#snap_bases"/>
       </wadl:param>
     
     
-      <wadl:param style="plain"
-                  path="$['translation_import_queue_entries_collection_link']"
-                  name="translation_import_queue_entries_collection_link">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#translation_import_queue_entries"/>
+      <wadl:param style="plain" name="snappy_serieses_collection_link" path="$['snappy_serieses_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#snappy_serieses"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="snaps_collection_link" path="$['snaps_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#snaps"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="specifications_collection_link" path="$['specifications_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#specifications"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="temporary_blobs_collection_link" path="$['temporary_blobs_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#temporary_blobs"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="translation_groups_collection_link" path="$['translation_groups_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#translation_groups"/>
+      </wadl:param>
+    
+    
+      <wadl:param style="plain" name="translation_import_queue_entries_collection_link" path="$['translation_import_queue_entries_collection_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#translation_import_queue_entries"/>
       </wadl:param>
     
     <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
@@ -191,17 +197,29 @@
 
   <!--Begin resource_type definitions for collection resources.-->
   
+    <wadl:resource_type id="archives">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Interface for ArchiveSet
+</wadl:doc>
+      <wadl:method name="GET" id="archives-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="archives-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
     <wadl:resource_type id="branches">
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Interface representing the set of branches.
 </wadl:doc>
       <wadl:method name="GET" id="branches-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#branch-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="branches-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#branch-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="branches-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -228,12 +246,10 @@ associated branch, the URL will map to None.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByUrls">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByUrls">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="urls">
+            <wadl:param style="query" name="urls" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>A list of URLs of branches</p>
 <p>These can be URLs external to Launchpad, lp: URLs, or <a class="rst-reference external" href="http://bazaar.launchpad.net/" target="_top">http://bazaar.launchpad.net/</a> URLs, or any mix of all these different kinds.</p>
@@ -253,13 +269,10 @@ associated branch, the URL will map to None.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getByUniqueName">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByUniqueName">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="unique_name">
+            <wadl:param style="query" name="unique_name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Branch unique name
 </wadl:doc>
@@ -269,8 +282,7 @@ Branch unique name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#branch-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#branch-full"/>
         </wadl:response>
       </wadl:method>
       <wadl:method id="branches-getByUrl" name="GET">
@@ -286,12 +298,10 @@ Launchpad app, use the IBranchLookup version instead.</p>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByUrl">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByUrl">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="url">
+            <wadl:param style="query" name="url" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Branch URL
 </wadl:doc>
@@ -301,8 +311,7 @@ Branch URL
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#branch-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#branch-full"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource_type>
@@ -318,30 +327,25 @@ example, bugzilla.mozilla.org is distinct from bugzilla.gnome.org.</p>
 </wadl:doc>
       <wadl:method name="GET" id="bug_trackers-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#bug_tracker-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="bug_trackers-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#bug_tracker-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="bug_trackers-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="bug_trackers-queryByBaseURL"
-                   name="GET">
+      <wadl:method id="bug_trackers-getByName" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Return one or None BugTracker's by baseurl
+<p>Get a BugTracker by its name.</p>
+<p>If no tracker with the given name exists, return default.</p>
+
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="queryByBaseURL">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByName">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="base_url">
+            <wadl:param style="query" name="name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The base URL of the bug tracker
+The bug tracker name
 </wadl:doc>
               
             </wadl:param>
@@ -349,26 +353,21 @@ The base URL of the bug tracker
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#bug_tracker-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#bug_tracker-full"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="bug_trackers-getByName" name="GET">
+      <wadl:method id="bug_trackers-queryByBaseURL" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Get a BugTracker by its name.</p>
-<p>If no tracker with the given name exists, return default.</p>
-
+Return one or None BugTracker's by baseurl
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByName">
+            <wadl:param style="query" name="ws.op" required="true" fixed="queryByBaseURL">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="base_url" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The bug tracker name
+The base URL of the bug tracker
 </wadl:doc>
               
             </wadl:param>
@@ -376,45 +375,29 @@ The bug tracker name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#bug_tracker-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#bug_tracker-full"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="bug_trackers-ensureBugTracker"
-                   name="POST">
+      <wadl:method id="bug_trackers-ensureBugTracker" name="POST">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Make sure that there is a bugtracker for the given base url.</p>
 <p>If not, create one using the given attributes.</p>
 
 </wadl:doc>
         <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="ensureBugTracker">
+          <wadl:representation mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op" required="true" fixed="ensureBugTracker">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="name">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Name</p>
-<p>A URL-friendly name for the bug tracker, such as &quot;mozilla-bugs&quot;.</p>
-
-</wadl:doc>
-              
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="title">
+            <wadl:param style="query" name="base_url" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Title</p>
-<p>A descriptive label for this tracker to show in listings.</p>
+<p>Location</p>
+<p>The top-level URL for the bug tracker, or an upstream email address. This must be accurate so that Launchpad can link to external bug reports.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="bug_tracker_type">
+            <wadl:param style="query" name="bug_tracker_type" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Bug Tracker Type
 </wadl:doc>
@@ -430,18 +413,18 @@ Bug Tracker Type
               <wadl:option value="Savane"/>
               <wadl:option value="PHP Project Bugtracker"/>
               <wadl:option value="Google Code"/>
+              <wadl:option value="GitHub Issues"/>
+              <wadl:option value="GitLab Issues"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="base_url">
+            <wadl:param style="query" name="title" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Location</p>
-<p>The top-level URL for the bug tracker, or an upstream email address. This must be accurate so that Launchpad can link to external bug reports.</p>
+<p>Title</p>
+<p>A descriptive label for this tracker to show in listings.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="summary">
+            <wadl:param style="query" name="summary" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Summary</p>
 <p>A brief introduction or overview of this bug tracker instance.</p>
@@ -449,8 +432,7 @@ Bug Tracker Type
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="contact_details">
+            <wadl:param style="query" name="contact_details" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Contact details</p>
 <p>The contact details for the external bug tracker (so that, for example, its administrators can be contacted about a security breach).</p>
@@ -458,11 +440,19 @@ Bug Tracker Type
 </wadl:doc>
               
             </wadl:param>
+            <wadl:param style="query" name="name" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Name</p>
+<p>A URL-friendly name for the bug tracker, such as &quot;mozilla-bugs&quot;.</p>
+
+</wadl:doc>
+              
+            </wadl:param>
           </wadl:representation>
         </wadl:request>
         <wadl:response>
           <wadl:param name="Location" style="header">
-            <wadl:link resource_type="https://api.launchpad.net/1.0/#bug_tracker"/>
+            <wadl:link resource_type="https://api.launchpad.test/1.0/#bug_tracker"/>
           </wadl:param>
           
         </wadl:response>
@@ -482,11 +472,8 @@ methods that affect a single Builder should be on IBuilder.</p>
 </wadl:doc>
       <wadl:method name="GET" id="builders-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#builder-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="builders-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#builder-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="builders-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -496,12 +483,10 @@ Retrieve a builder by name
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByName">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByName">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Builder name
 </wadl:doc>
@@ -511,10 +496,39 @@ Builder name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#builder-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#builder-full"/>
+        </wadl:response>
+      </wadl:method>
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="charm_bases">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Interface representing the set of bases for charms.
+</wadl:doc>
+      <wadl:method name="GET" id="charm_bases-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#charm_base-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="charm_bases-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="charm_recipes">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+A utility to create and access charm recipes.
+</wadl:doc>
+      <wadl:method name="GET" id="charm_recipes-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#charm_recipe-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="charm_recipes-wadl"/>
         </wadl:response>
       </wadl:method>
+
     </wadl:resource_type>
 
   
@@ -525,28 +539,23 @@ A container for countries.
 </wadl:doc>
       <wadl:method name="GET" id="countries-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#country-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="countries-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#country-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="countries-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="countries-getByCode" name="GET">
+      <wadl:method id="countries-getByName" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Return a country by its code.
+Return a country by its name.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByCode">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByName">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="code">
+            <wadl:param style="query" name="name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Code
+Name
 </wadl:doc>
               
             </wadl:param>
@@ -554,24 +563,21 @@ Code
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#country-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#country-full"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="countries-getByName" name="GET">
+      <wadl:method id="countries-getByCode" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Return a country by its name.
+Return a country by its code.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByName">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByCode">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="code" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Name
+Code
 </wadl:doc>
               
             </wadl:param>
@@ -579,8 +585,7 @@ Name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#country-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#country-full"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource_type>
@@ -593,10 +598,8 @@ The set of ICve objects.
 </wadl:doc>
       <wadl:method name="GET" id="cves-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#cve-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml" id="cves-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#cve-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="cves-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -610,11 +613,23 @@ Interface for DistrosSet
 </wadl:doc>
       <wadl:method name="GET" id="distributions-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#distribution-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="distributions-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#distribution-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="distributions-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="git_repositories">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Interface representing the set of Git repositories.
+</wadl:doc>
+      <wadl:method name="GET" id="git_repositories-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#git_repository-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="git_repositories-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -632,11 +647,8 @@ the getAllLanguages method.</p>
 </wadl:doc>
       <wadl:method name="GET" id="languages-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#language-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="languages-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#language-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="languages-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -646,19 +658,31 @@ Return a result set of all ILanguages from Launchpad.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getAllLanguages">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getAllLanguages">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#language-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#language-page"/>
+        </wadl:response>
+      </wadl:method>
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="livefses">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+A utility to create and access live filesystems.
+</wadl:doc>
+      <wadl:method name="GET" id="livefses-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#livefs-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="livefses-wadl"/>
         </wadl:response>
       </wadl:method>
+
     </wadl:resource_type>
 
   
@@ -669,371 +693,321 @@ Application root for malone.
 </wadl:doc>
       <wadl:method name="GET" id="bugs-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#bug-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml" id="bugs-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#bug-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="bugs-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="bugs-createBug" name="POST">
+      <wadl:method id="bugs-searchTasks" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Create a bug (with an appropriate bugtask) and return it.</p>
+<p>Search the IBugTasks reported on this entity.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param target:</th><td class="rst-field-body">The Product, Distribution or DistributionSourcePackage
-affected by this bug.</td>
+<tr class="rst-field"><th class="rst-field-name">search_params:</th><td class="rst-field-body">a BugTaskSearchParams object</td>
 </tr>
 </tbody>
 </table>
-<p>Things to note when using this factory:</p>
-<blockquote>
-<ul class="rst-simple">
-<li>the owner will be subscribed to the bug</li>
-<li>distribution, product and package contacts (whichever ones are
-applicable based on the bug report target) will be subscribed to
-all <em>public bugs only</em></li>
-<li>for public upstreams bugs where there is no upstream bug contact,
-the product owner will be subscribed instead</li>
-</ul>
-</blockquote>
+<p>Return an iterable of matching results.</p>
+<p>Note: milestone is currently ignored for all IBugTargets
+except IProduct.</p>
 
 </wadl:doc>
         <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="createBug">
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="searchTasks">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="security_related">
+            <wadl:param style="query" name="bug_reporter" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="has_cve" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-This bug is a security vulnerability.
+Show only bugs associated with a CVE
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="target">
+            <wadl:param style="query" name="omit_targeted" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The project, distribution or source package that has this bug.
+Omit bugs targeted to a series
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#bug_target"/>
+              
+            </wadl:param>
+            <wadl:param style="query" name="bug_subscriber" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="tags">
+            <wadl:param style="query" name="status_upstream" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Tags</p>
-<p>Space-separated keywords for classifying this bug report.</p>
+<p>Status upstream</p>
+<p>Indicates the status of any remote watches associated with the bug.  Possible values include: pending_bugwatch, hide_upstream, resolved_upstream, and open_upstream.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="title">
+            <wadl:param style="query" name="tags" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Summary</p>
-<p>A one-line summary of the problem.</p>
+<p>Tags</p>
+<p>String or list of strings for tags to search. To exclude, prepend a '-', e.g. '-unwantedtag'</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="private">
+            <wadl:param style="query" name="omit_duplicates" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>This bug report should be private</p>
-<p>Private bug reports are visible only to their subscribers.</p>
-
+Omit bugs marked as duplicate,
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="description">
+            <wadl:param style="query" name="nominated_for" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
+            </wadl:param>
+            <wadl:param style="query" name="modified_since" required="false" type="xsd:dateTime">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Description</p>
-<dl class="rst-docutils">
-<dt>A detailed description of the problem,</dt>
-<dd>including the steps required to reproduce it.</dd>
-</dl>
-
+Search for bugs that have been modified since the given date.
 </wadl:doc>
               
             </wadl:param>
-          </wadl:representation>
-        </wadl:request>
-        <wadl:response>
-          <wadl:param name="Location" style="header">
-            <wadl:link resource_type="https://api.launchpad.net/1.0/#bug"/>
-          </wadl:param>
-          
-        </wadl:response>
-      </wadl:method>
-    </wadl:resource_type>
-
-  
-  
-    <wadl:resource_type id="packagesets">
-      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-An interface for multiple package sets.
-</wadl:doc>
-      <wadl:method name="GET" id="packagesets-get">
-        <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#packageset-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="packagesets-wadl"/>
-        </wadl:response>
-      </wadl:method>
-
-      <wadl:method id="packagesets-setsIncludingSource"
-                   name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Get the package sets that include this source package.</p>
-<p>Return all package sets that directly or indirectly include the
-given source package name.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the included source package name; can be
-either a string or a ISourcePackageName.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the IDistroSeries in which to look for sets.
-If omitted, matching package sets from all series will be
-returned.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_inclusion:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if this flag is set to True, then only
-package sets that directly include this source package name will
-be considered.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if a source package with the given
-name cannot be found.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A (potentially empty) sequence of IPackageset instances.</td>
-</tr>
-</tbody>
-</table>
-
+            <wadl:param style="query" name="structural_subscriber" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="owner" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="created_since" required="false" type="xsd:dateTime">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Search for bugs that have been created since the given date.
 </wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="setsIncludingSource">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+              
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="sourcepackagename">
+            <wadl:param style="query" name="has_patch" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Source package name
+Show only bugs with patches available.
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distroseries">
+            <wadl:param style="query" name="bug_commenter" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="assignee" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="status" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Distribution series</p>
-<p>The distroseries to which this package set is related.</p>
+<p>Status</p>
+<p>Show only bugs with the given status value or list of values.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="direct_inclusion">
+            <wadl:param style="query" name="affected_user" required="false">
              
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="search_text" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Bug ID or search text.
+</wadl:doc>
               
             </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#packageset-page"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method id="packagesets-getByName" name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the single package set with the given name (if any).</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">the name of the package set sought.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the distroseries to which the new packageset
-is related. Defaults to the current Ubuntu series.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">An IPackageset instance.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">raise NoSuchPackageSet:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if no package set is found.</td>
-</tr>
-</tbody>
-</table>
+            <wadl:param style="query" name="order_by" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+List of fields by which the results are ordered.
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="bug_supervisor" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="tags_combinator" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Tags combination</p>
+<p>Search for any or all of the tags specified.</p>
 
 </wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByName">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+              
+              <wadl:option value="Any"/>
+              <wadl:option value="All"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distroseries">
+            <wadl:param style="query" name="component" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Distroseries</p>
-<p>The distribution series to which the packageset is related.</p>
+<p>Component</p>
+<p>Distribution package archive grouping. E.g. main, universe, multiverse</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="importance" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Package set name
+<p>Importance</p>
+<p>Show only bugs with the given importance or list of importances.</p>
+
 </wadl:doc>
               
             </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#packageset-full"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method id="packagesets-getBySeries" name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the package sets associated with the given distroseries.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">A DistroSeries.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">An iterable collection of IPackageset instances.</td>
-</tr>
-</tbody>
-</table>
+            <wadl:param style="query" name="information_type" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Information Type</p>
+<p>Show only bugs with the given information type or list of information types.</p>
 
 </wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getBySeries">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+              
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="distroseries">
+            <wadl:param style="query" name="created_before" required="false" type="xsd:dateTime">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Distribution series</p>
-<p>The distroseries to which this package set is related.</p>
+Search for bugs that were created before the given date.
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="milestone" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Milestone</p>
+<p>Show only bug tasks targeted to this milestone.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              
+            </wadl:param>
+            <wadl:param style="query" name="linked_branches" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Search for bugs that are linked to branches or for bugs that are not linked to branches.
+</wadl:doc>
+              
+              <wadl:option value="Show all bugs"/>
+              <wadl:option value="Show only Bugs with linked Branches"/>
+              <wadl:option value="Show only Bugs without linked Branches"/>
+            </wadl:param>
+            <wadl:param style="query" name="has_no_package" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Exclude bugs with packages specified
+</wadl:doc>
+              
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#packageset-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#bug_task-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="packagesets-new" name="POST">
+      <wadl:method id="bugs-createBug" name="POST">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Create a new package set.</p>
+<p>Create a bug (with an appropriate bugtask) and return it.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">the name of the package set to be created.</td>
+<tr class="rst-field"><th class="rst-field-name">param target:</th><td class="rst-field-body">The Project, Distribution or DistributionSourcePackage
+affected by this bug.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param description:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the description for the package set to be created.</td>
+<tr class="rst-field"><th class="rst-field-name">param title:</th><td class="rst-field-body">The title shown in bug listings.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">param owner:</th><td class="rst-field-body">the owner of the package set to be created.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param description:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">The description of the issue.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the distroseries to which the new packageset
-is related. Defaults to the current Ubuntu series.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param information_type:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Set the bug's information type to one
+different from the project's default. The type must conform
+to the project's bug sharing policy. (optional)</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param related_set:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the newly created package set is to be related to
-related_set (by being placed in the same package group).</td>
+<tr class="rst-field"><th class="rst-field-name">param tags:</th><td class="rst-field-body">A list of bug tags. (optional)</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">raises DuplicatePackagesetName:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if a package set with the same name
-exists in distroseries already.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param security_related:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Is this bug's information type
+Private Security? (deprecated)</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a newly created IPackageset.</td>
+<tr class="rst-field"><th class="rst-field-name">param tags:</th><td class="rst-field-body">Is this bug's information type Private
+user data. (deprecated)</td>
 </tr>
 </tbody>
 </table>
+<p>Things to note when using this factory:</p>
+<blockquote>
+<ul class="rst-simple">
+<li>The reporter will be subscribed to the bug.</li>
+<li>Only people that the project shares with will see the bug
+when the bug's information type is Proprietary, Private, or
+Private Security.</li>
+</ul>
+</blockquote>
 
 </wadl:doc>
         <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="new">
+          <wadl:representation mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op" required="true" fixed="createBug">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="owner">
+            <wadl:param style="query" name="title" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Person</p>
-<p>The person who owns this package set.</p>
+<p>Summary</p>
+<p>A one-line summary of the problem.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
+              
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distroseries">
+            <wadl:param style="query" name="description" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Distroseries</p>
-<p>The distribution series to which the packageset is related.</p>
+<p>Description</p>
+<p>A detailed description of the problem,
+including the steps required to reproduce it.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="description">
+            <wadl:param style="query" name="tags" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Package set description
+<p>Tags</p>
+<p>Space-separated keywords for classifying this bug report.</p>
+
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="information_type" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Valid package set name
+<p>Information Type</p>
+<p>The type of information contained in this bug report.</p>
+
 </wadl:doc>
               
+              <wadl:option value="Public"/>
+              <wadl:option value="Public Security"/>
+              <wadl:option value="Private Security"/>
+              <wadl:option value="Private"/>
+              <wadl:option value="Proprietary"/>
+              <wadl:option value="Embargoed"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="related_set">
+            <wadl:param style="query" name="security_related" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Related package set</p>
-<p>The new package set will share the package set group with this one.</p>
+This bug is a security vulnerability.
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="private" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>This bug report should be private</p>
+<p>Private bug reports are visible only to their subscribers.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#packageset"/>
+              
+            </wadl:param>
+            <wadl:param style="query" name="target" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+The project, distribution or source package that has this bug.
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#bug_target"/>
             </wadl:param>
           </wadl:representation>
         </wadl:request>
         <wadl:response>
           <wadl:param name="Location" style="header">
-            <wadl:link resource_type="https://api.launchpad.net/1.0/#packageset"/>
+            <wadl:link resource_type="https://api.launchpad.test/1.0/#bug"/>
           </wadl:param>
           
         </wadl:response>
@@ -1042,66 +1016,55 @@ Valid package set name
 
   
   
-    <wadl:resource_type id="people">
+    <wadl:resource_type id="packagesets">
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The set of Persons.
+An interface for multiple package sets.
 </wadl:doc>
-      <wadl:method name="GET" id="people-get">
+      <wadl:method name="GET" id="packagesets-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#person-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="people-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#packageset-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="packagesets-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="people-findPerson" name="GET">
+      <wadl:method id="packagesets-getByName" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return all non-merged Persons with at least one email address whose
-name, displayname or email address match &lt;text&gt;.</p>
-<p>If text is an empty string, all persons with at least one email
-address will be returned.</p>
-<p>The results will be ordered using the default ordering specified in
-Person._defaultOrder.</p>
-<p>If exclude_inactive_accounts is True, any accounts whose
-account_status is any of INACTIVE_ACCOUNT_STATUSES will not be in the
-returned set.</p>
-<p>If must_have_email is True, only people with one or more email
-addresses are returned.</p>
-<p>While we don't have Full Text Indexes in the emailaddress table, we'll
-be trying to match the text only against the beginning of an email
-address.</p>
-<p>If created_before or created_after are not None, they are used to
-restrict the search to the dates provided.</p>
+<p>Return the single package set with the given name (if any).</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the distroseries to which the new packageset
+is related.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">the name of the package set sought.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">An IPackageset instance.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">raise NoSuchPackageSet:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if no package set is found.</td>
+</tr>
+</tbody>
+</table>
 
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="findPerson">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByName">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="text">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Search text
-</wadl:doc>
-              
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:dateTime"
-                        name="created_before">
+            <wadl:param style="query" name="distroseries" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Created before
+<p>Distribution series</p>
+<p>The distroseries to which this package set is related.</p>
+
 </wadl:doc>
-              
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:dateTime"
-                        name="created_after">
+            <wadl:param style="query" name="name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Created after
+Valid package set name
 </wadl:doc>
               
             </wadl:param>
@@ -1109,86 +1072,323 @@ Created after
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#person-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#packageset-full"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="people-getByEmail" name="GET">
+      <wadl:method id="packagesets-getBySeries" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the person with the given email address.</p>
-<p>Return None if there is no person with the given email address.</p>
+<p>Return the package sets associated with the given distroseries.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">A DistroSeries.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">An iterable collection of IPackageset instances.</td>
+</tr>
+</tbody>
+</table>
 
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="getByEmail">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getBySeries">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="email">
-             
-              
+            <wadl:param style="query" name="distroseries" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Distribution series</p>
+<p>The distroseries to which this package set is related.</p>
+
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#person-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#packageset-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="people-find" name="GET">
+      <wadl:method id="packagesets-setsIncludingSource" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return all non-merged Persons and Teams whose name, displayname or
-email address match &lt;text&gt;.</p>
-<p>The results will be ordered using the default ordering specified in
-Person._defaultOrder.</p>
-<p>While we don't have Full Text Indexes in the emailaddress table, we'll
-be trying to match the text only against the beginning of an email
-address.</p>
+<p>Get the package sets that include this source package.</p>
+<p>Return all package sets that directly or indirectly include the
+given source package name.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the included source package name; can be
+either a string or a ISourcePackageName.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the IDistroSeries in which to look for sets.
+If omitted, matching package sets from all series will be
+returned.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_inclusion:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if this flag is set to True, then only
+package sets that directly include this source package name will
+be considered.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if a source package with the given
+name cannot be found.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A (potentially empty) sequence of IPackageset instances.</td>
+</tr>
+</tbody>
+</table>
 
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="find">
+            <wadl:param style="query" name="ws.op" required="true" fixed="setsIncludingSource">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="text">
+            <wadl:param style="query" name="sourcepackagename" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Search text
+Source package name
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="distroseries" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Distribution series</p>
+<p>The distroseries to which this package set is related.</p>
+
 </wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
+            </wadl:param>
+            <wadl:param style="query" name="direct_inclusion" required="false">
+             
               
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#person-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#packageset-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="people-findTeam" name="GET">
+      <wadl:method id="packagesets-new" name="POST">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return all Teams whose name, displayname or email address
-match &lt;text&gt;.</p>
-<p>The results will be ordered using the default ordering specified in
-Person._defaultOrder.</p>
-<p>While we don't have Full Text Indexes in the emailaddress table, we'll
-be trying to match the text only against the beginning of an email
-address.</p>
+<p>Create a new package set.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">the name of the package set to be created.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param description:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the description for the package set to be created.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param owner:</th><td class="rst-field-body">the owner of the package set to be created.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the distroseries to which the new packageset
+is related.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param related_set:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the newly created package set is to be related to
+related_set (by being placed in the same package group).</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">raises DuplicatePackagesetName:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if a package set with the same name
+exists in distroseries already.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a newly created IPackageset.</td>
+</tr>
+</tbody>
+</table>
+
+</wadl:doc>
+        <wadl:request>
+          <wadl:representation mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op" required="true" fixed="new">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" name="description" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Package set description
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="owner" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Person</p>
+<p>The person who owns this package set.</p>
+
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="related_set" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Related package set</p>
+<p>The new package set will share the package set group with this one.</p>
+
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#packageset"/>
+            </wadl:param>
+            <wadl:param style="query" name="distroseries" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Distroseries</p>
+<p>The distribution series to which the packageset is related.</p>
+
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
+            </wadl:param>
+            <wadl:param style="query" name="name" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Valid package set name
+</wadl:doc>
+              
+            </wadl:param>
+          </wadl:representation>
+        </wadl:request>
+        <wadl:response>
+          <wadl:param name="Location" style="header">
+            <wadl:link resource_type="https://api.launchpad.test/1.0/#packageset"/>
+          </wadl:param>
+          
+        </wadl:response>
+      </wadl:method>
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="people">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Combined schema for operations on a group of Persons.
+</wadl:doc>
+      <wadl:method name="GET" id="people-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#person-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="people-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+      <wadl:method id="people-getByEmail" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return the person with the given email address.</p>
+<p>Return None if there is no person with the given email address.</p>
+
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="getByEmail">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" name="email" required="true">
+             
+              
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#person-full"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="people-findTeam" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return all Teams whose name, displayname or email address
+match &lt;text&gt;.</p>
+<p>The results will be ordered using the default ordering specified in
+Person._defaultOrder.</p>
+<p>While we don't have Full Text Indexes in the emailaddress table, we'll
+be trying to match the text only against the beginning of an email
+address.</p>
+
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="findTeam">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" name="text" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Search text
+</wadl:doc>
+              
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#person-page"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="people-findPerson" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return all non-merged Persons with at least one email address whose
+name, displayname or email address match &lt;text&gt;.</p>
+<p>If text is an empty string, all persons with at least one email
+address will be returned.</p>
+<p>The results will be ordered using the default ordering specified in
+Person._defaultOrder.</p>
+<p>If exclude_inactive_accounts is True, any accounts whose
+account_status is any of INACTIVE_ACCOUNT_STATUSES will not be in the
+returned set.</p>
+<p>If must_have_email is True, only people with one or more email
+addresses are returned.</p>
+<p>While we don't have Full Text Indexes in the emailaddress table, we'll
+be trying to match the text only against the beginning of an email
+address.</p>
+<p>If created_before or created_after are not None, they are used to
+restrict the search to the dates provided.</p>
+
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="findPerson">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" name="created_before" required="false" type="xsd:dateTime">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Created before
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="text" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Search text
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="created_after" required="false" type="xsd:dateTime">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Created after
+</wadl:doc>
+              
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#person-page"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="people-find" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return all non-merged Persons and Teams whose name, displayname or
+email address match &lt;text&gt;.</p>
+<p>The results will be ordered using the default ordering specified in
+Person._defaultOrder.</p>
+<p>While we don't have Full Text Indexes in the emailaddress table, we'll
+be trying to match the text only against the beginning of an email
+address.</p>
 
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="findTeam">
+            <wadl:param style="query" name="ws.op" required="true" fixed="find">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="text">
+            <wadl:param style="query" name="text" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Search text
 </wadl:doc>
@@ -1198,8 +1398,7 @@ Search text
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#person-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#person-page"/>
         </wadl:response>
       </wadl:method>
       <wadl:method id="people-newTeam" name="POST">
@@ -1207,14 +1406,19 @@ Search text
 Create and return a new Team with given arguments.
 </wadl:doc>
         <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="newTeam">
+          <wadl:representation mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op" required="true" fixed="newTeam">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="display_name">
+            <wadl:param style="query" name="name" required="true">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Name</p>
+<p>A short unique name, beginning with a lower-case letter or number, and containing only letters, numbers, dots, hyphens, or plus signs.</p>
+
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="display_name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Display Name</p>
 <p>Your name as you would like it displayed throughout Launchpad. Most people use their full name here.</p>
@@ -1222,17 +1426,15 @@ Create and return a new Team with given arguments.
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="team_description" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Name</p>
-<p>A short unique name, beginning with a lower-case letter or number, and containing only letters, numbers, dots, hyphens, or plus signs.</p>
+<p>Team Description</p>
+<p>Obsolete. Use description.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="default_membership_period">
+            <wadl:param style="query" name="default_membership_period" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Subscription period</p>
 <p>Number of days a new subscription lasts before expiring. You can customize the length of an individual subscription when approving it. Leave this empty or set to 0 for subscriptions to never expire.</p>
@@ -1240,28 +1442,29 @@ Create and return a new Team with given arguments.
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="team_description">
+            <wadl:param style="query" name="default_renewal_period" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Team Description</p>
-<p>Details about the team's work, highlights, goals, and how to contribute. Use plain text, paragraphs are preserved and URLs are linked in pages.</p>
+<p>Self renewal period</p>
+<p>Number of days members can renew their own membership. The number can be from 1 to 3650 (10 years).</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="default_renewal_period">
+            <wadl:param style="query" name="subscription_policy" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Renewal period</p>
-<p>Number of days a subscription lasts after being renewed. The number can be from 1 to 3650 (10 years). You can customize the lengths of individual renewals, but this is what's used for auto-renewed and user-renewed memberships.</p>
+<p>Membership policy</p>
+<p>Obsolete: use membership_policy</p>
 
 </wadl:doc>
               
+              <wadl:option value="Open Team"/>
+              <wadl:option value="Delegated Team"/>
+              <wadl:option value="Moderated Team"/>
+              <wadl:option value="Restricted Team"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="subscription_policy">
+            <wadl:param style="query" name="membership_policy" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Subscription policy
+Membership policy
 </wadl:doc>
               
               <wadl:option value="Open Team"/>
@@ -1273,7 +1476,7 @@ Subscription policy
         </wadl:request>
         <wadl:response>
           <wadl:param name="Location" style="header">
-            <wadl:link resource_type="https://api.launchpad.net/1.0/#team"/>
+            <wadl:link resource_type="https://api.launchpad.test/1.0/#team"/>
           </wadl:param>
           
         </wadl:response>
@@ -1282,17 +1485,14 @@ Subscription policy
 
   
   
-    <wadl:resource_type id="processor_families">
+    <wadl:resource_type id="polls">
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Operations related to ProcessorFamily instances.
+The set of Poll objects.
 </wadl:doc>
-      <wadl:method name="GET" id="processor_families-get">
+      <wadl:method name="GET" id="polls-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#processor_family-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="processor_families-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#poll-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="polls-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1306,11 +1506,8 @@ Operations related to Processor instances.
 </wadl:doc>
       <wadl:method name="GET" id="processors-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#processor-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="processors-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#processor-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="processors-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1322,141 +1519,83 @@ Operations related to Processor instances.
       
       <wadl:method name="GET" id="projects-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="projects-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#project-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="projects-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="projects-search" name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Search through the Registry database for products that match the
-query terms. text is a piece of text in the title / summary /
-description fields of product.</p>
-<p>This call eager loads data appropriate for web API; caution may be
-needed for other callers.</p>
-
-</wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="search">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="text">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Search text
-</wadl:doc>
-              
-            </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project-page"/>
-        </wadl:response>
-      </wadl:method>
       <wadl:method id="projects-licensing_search" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Return an iterator over products that need to be reviewed.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="licensing_search">
+            <wadl:param style="query" name="ws.op" required="true" fixed="licensing_search">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date"
-                        name="subscription_modified_after">
+            <wadl:param style="query" name="active" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Subscription modified after
+Is the project active
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="license_info_is_empty">
+            <wadl:param style="query" name="subscription_expires_before" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-License info is empty
+Subscription expired before
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="search_text">
+            <wadl:param style="query" name="has_subscription" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Search text
+Has a commercial subscription
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="project_reviewed">
+            <wadl:param style="query" name="project_reviewed" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Is the project license reviewed
+Is the project licence reviewed
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date"
-                        name="subscription_expires_after">
+            <wadl:param style="query" name="created_after" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Subscription expires after
+Created after date
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="active">
+            <wadl:param style="query" name="subscription_modified_after" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Is the project active
+Subscription modified after
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date"
-                        name="subscription_modified_before">
+            <wadl:param style="query" name="created_before" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Subscription modified before
+Created before date
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date" name="created_after">
+            <wadl:param style="query" name="subscription_modified_before" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Created after date
+Subscription modified before
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="licenses">
+            <wadl:param style="query" name="licenses" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Licenses
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date"
-                        name="subscription_expires_before">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Subscription expired before
-</wadl:doc>
-              
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:date"
-                        name="created_before">
+            <wadl:param style="query" name="search_text" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Created before date
+Search text
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="has_zero_licenses">
+            <wadl:param style="query" name="subscription_expires_after" required="false" type="xsd:date">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Has zero licenses
+Subscription expires after
 </wadl:doc>
               
             </wadl:param>
@@ -1464,13 +1603,13 @@ Has zero licenses
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#project-page"/>
         </wadl:response>
       </wadl:method>
       <wadl:method id="projects-latest" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Return the latest projects registered in Launchpad.</p>
+<p>The supplied user determines which objects are visible.</p>
 <p>If the quantity is not specified or is a value that is not 'None'
 then the set of projects returned is limited to that value (the
 default quantity is 5).  If quantity is 'None' then all projects are
@@ -1480,78 +1619,72 @@ quantity, so all projects are returned, latest first.</p>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="latest">
+            <wadl:param style="query" name="ws.op" required="true" fixed="latest">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#project-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="projects-new_project" name="POST">
+      <wadl:method id="projects-search" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Create and return a brand new Product.</p>
-<p>See IProduct for a description of the parameters.</p>
+<p>Search through the Registry database for products that match the
+query terms. text is a piece of text in the title / summary /
+description fields of product.</p>
+<p>This call eager loads data appropriate for web API; caution may be
+needed for other callers.</p>
 
 </wadl:doc>
         <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="new_project">
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="search">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="wiki_url">
+            <wadl:param style="query" name="text" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Wiki URL</p>
-<dl class="rst-docutils">
-<dt>The full URL of this project's wiki, if it has</dt>
-<dd>one. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></dd>
-</dl>
-
+Search text
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="download_url">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Download URL</p>
-<dl class="rst-docutils">
-<dt>The full URL where downloads for this project</dt>
-<dd>are located, if available. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></dd>
-</dl>
-
-</wadl:doc>
-              
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#project-page"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="projects-new_project" name="POST">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Create and return a brand new Product.</p>
+<p>See IProduct for a description of the parameters.</p>
+
+</wadl:doc>
+        <wadl:request>
+          <wadl:representation mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op" required="true" fixed="new_project">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="display_name">
+            <wadl:param style="query" name="name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Display Name</p>
-<dl class="rst-docutils">
-<dt>The name of the project as it would appear in a</dt>
-<dd>paragraph.</dd>
-</dl>
+<p>Name</p>
+<p>At least one lowercase letter or number, followed by letters, numbers, dots, hyphens or pluses. Keep this name short; it is used in URLs as shown above.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="description">
+            <wadl:param style="query" name="display_name" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Description</p>
-<p>Details about the project's work, highlights, goals, and how to contribute. Use plain text, paragraphs are preserved and URLs are linked in pages. Don't repeat the Summary.</p>
+<p>Display Name</p>
+<p>The name of the project as it would appear in a
+paragraph.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="title">
+            <wadl:param style="query" name="title" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Title</p>
 <p>The project title. Should be just a few words.</p>
@@ -1559,132 +1692,144 @@ quantity, so all projects are returned, latest first.</p>
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="project_reviewed">
+            <wadl:param style="query" name="summary" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Project reviewed</p>
-<p>Whether or not this project has been reviewed. If you looked at the project and how it uses Launchpad, you reviewed it.</p>
+<p>Summary</p>
+<p>A short paragraph to introduce the project's work.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="summary">
+            <wadl:param style="query" name="description" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Summary</p>
-<p>A short paragraph to introduce the project's work.</p>
+<p>Description</p>
+<p>Details about the project's work, highlights, goals, and how to contribute. Use plain text, paragraphs are preserved and URLs are linked in pages. Don't repeat the Summary.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="project_group">
+            <wadl:param style="query" name="project_group" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Part of</p>
 <p>Project group. This is an overarching initiative that includes several related projects. For example, the Mozilla Project produces Firefox, Thunderbird and Gecko. This information is used to group those projects in a coherent way. If you make this project part of a group, the group preferences and decisions around bug tracking, translation and security policy will apply to this project.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#project_group"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#project_group"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="licenses">
+            <wadl:param style="query" name="home_page_url" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Licenses
+<p>Homepage URL</p>
+<p>The project home page. Please include
+the <a class="rst-reference external" href="http://" target="_top">http://</a></p>
+
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="screenshots_url" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Screenshots URL</p>
+<p>The full URL for screenshots of this project,
+if available. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></p>
+
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="download_url" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Download URL</p>
+<p>The full URL where downloads for this project
+are located, if available. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></p>
+
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="freshmeat_project">
+            <wadl:param style="query" name="freshmeat_project" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Freshmeat Project</p>
-<dl class="rst-docutils">
-<dt>The Freshmeat project name for</dt>
-<dd>this project, if it is in freshmeat.</dd>
-</dl>
+<p>The Freshmeat project name for
+this project, if it is in freshmeat. [DEPRECATED]</p>
+
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="wiki_url" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Wiki URL</p>
+<p>The full URL of this project's wiki, if it has
+one. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="sourceforge_project">
+            <wadl:param style="query" name="sourceforge_project" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Sourceforge Project</p>
-<dl class="rst-docutils">
-<dt>The SourceForge project name for</dt>
-<dd>this project, if it is in sourceforge.</dd>
-</dl>
+<p>The SourceForge project name for
+this project, if it is in sourceforge.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="programming_lang">
+            <wadl:param style="query" name="programming_lang" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Programming Languages</p>
-<dl class="rst-docutils">
-<dt>A comma delimited list of programming</dt>
-<dd>languages used for this project.</dd>
-</dl>
+<p>A comma delimited list of programming
+languages used for this project.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="screenshots_url">
+            <wadl:param style="query" name="project_reviewed" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Screenshots URL</p>
-<dl class="rst-docutils">
-<dt>The full URL for screenshots of this project,</dt>
-<dd>if available. Please include the <a class="rst-reference external" href="http://" target="_top">http://</a></dd>
-</dl>
+<p>Project reviewed</p>
+<p>Whether or not this project has been reviewed. If you looked at the project and how it uses Launchpad, you reviewed it.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="license_info">
+            <wadl:param style="query" name="licenses" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Description of additional licenses</p>
-<p>Description of licenses that do not appear in the list above.</p>
-
+Licences
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="home_page_url">
+            <wadl:param style="query" name="license_info" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Homepage URL</p>
-<dl class="rst-docutils">
-<dt>The project home page. Please include</dt>
-<dd>the <a class="rst-reference external" href="http://" target="_top">http://</a></dd>
-</dl>
+<p>Description of additional licences</p>
+<p>Description of licences that do not appear in the list above.</p>
 
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="registrant">
+            <wadl:param style="query" name="registrant" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Registrant</p>
 <p>This person registered the project in Launchpad.</p>
 
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="name">
+            <wadl:param style="query" name="bug_supervisor" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Name</p>
-<p>At least one lowercase letter or number, followed by letters, numbers, dots, hyphens or pluses. Keep this name short; it is used in URLs as shown above.</p>
+<p>Bug Supervisor</p>
+<p>The Launchpad id of the person or team (preferred) responsible for bug management.</p>
 
 </wadl:doc>
-              
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+            <wadl:param style="query" name="driver" required="false">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Driver</p>
+<p>This person or team will be able to set feature goals for and approve bug targeting or backporting for ANY major series in this project. You might want to leave this blank and just appoint a team for each specific series, rather than having one project team that does it all.</p>
+
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
           </wadl:representation>
         </wadl:request>
         <wadl:response>
           <wadl:param name="Location" style="header">
-            <wadl:link resource_type="https://api.launchpad.net/1.0/#project"/>
+            <wadl:link resource_type="https://api.launchpad.test/1.0/#project"/>
           </wadl:param>
           
         </wadl:response>
@@ -1699,11 +1844,8 @@ The collection of projects.
 </wadl:doc>
       <wadl:method name="GET" id="project_groups-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project_group-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="project_groups-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#project_group-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="project_groups-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1718,12 +1860,10 @@ applications.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="search">
+            <wadl:param style="query" name="ws.op" required="true" fixed="search">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="text">
+            <wadl:param style="query" name="text" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Search text
 </wadl:doc>
@@ -1733,8 +1873,7 @@ Search text
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#project_group-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#project_group-page"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource_type>
@@ -1747,11 +1886,68 @@ A utility that contain all the questions published in Launchpad.
 </wadl:doc>
       <wadl:method name="GET" id="questions-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#question-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="questions-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#question-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="questions-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="snap_bases">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Interface representing the set of bases for snaps.
+</wadl:doc>
+      <wadl:method name="GET" id="snap_bases-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#snap_base-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="snap_bases-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="snaps">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+A utility to create and access snap packages.
+</wadl:doc>
+      <wadl:method name="GET" id="snaps-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#snap-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="snaps-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="snappy_serieses">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Interface representing the set of snappy series.
+</wadl:doc>
+      <wadl:method name="GET" id="snappy_serieses-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#snappy_series-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="snappy_serieses-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+    </wadl:resource_type>
+
+  
+  
+    <wadl:resource_type id="specifications">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+A container for specifications.
+</wadl:doc>
+      <wadl:method name="GET" id="specifications-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#specification-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="specifications-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1765,11 +1961,8 @@ A tool to create temporary blobs.
 </wadl:doc>
       <wadl:method name="GET" id="temporary_blobs-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#temporary_blob-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="temporary_blobs-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#temporary_blob-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="temporary_blobs-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1779,12 +1972,10 @@ Retrieve a TemporaryBlobStorage by uuid.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="fetch">
+            <wadl:param style="query" name="ws.op" required="true" fixed="fetch">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="token">
+            <wadl:param style="query" name="token" required="true">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 UUID
 </wadl:doc>
@@ -1804,11 +1995,8 @@ A container for translation groups.
 </wadl:doc>
       <wadl:method name="GET" id="translation_groups-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#translation_group-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="translation_groups-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#translation_group-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="translation_groups-wadl"/>
         </wadl:response>
       </wadl:method>
 
@@ -1820,19 +2008,45 @@ A container for translation groups.
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 A set of files to be imported into Rosetta.
 </wadl:doc>
-      <wadl:method name="GET"
-                   id="translation_import_queue_entries-get">
+      <wadl:method name="GET" id="translation_import_queue_entries-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#translation_import_queue_entry-page"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="translation_import_queue_entries-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#translation_import_queue_entry-page"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="translation_import_queue_entries-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method id="translation_import_queue_entries-getAllEntries"
-                   name="GET">
+      <wadl:method id="translation_import_queue_entries-getFirstEntryToImport" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return the first entry of the queue ready to be imported.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name">param target:</th><td class="rst-field-body">IPerson, IProduct, IProductSeries, IDistribution,
+IDistroSeries or ISourcePackage the import entries are attached to
+or None to get all entries available.</td>
+</tr>
+</tbody>
+</table>
+
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="getFirstEntryToImport">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" name="target" required="false">
+             
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#object_with_translation_imports"/>
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#translation_import_queue_entry-full"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="translation_import_queue_entries-getAllEntries" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Return all entries this import queue has.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
@@ -1844,10 +2058,10 @@ IDistroSeries or ISourcePackage the import entries are attached to
 or None to get all entries available.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name" colspan="2">arg import_status:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">RosettaImportStatus entry.</td>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">RosettaImportStatus entry.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name" colspan="2">arg file_extensions:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">Sequence of filename suffixes to match, usually
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Sequence of filename suffixes to match, usually
 'po' or 'pot'.</td>
 </tr>
 </tbody>
@@ -1858,13 +2072,10 @@ entries are filtered based on those values.</p>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getAllEntries">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getAllEntries">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="import_status">
+            <wadl:param style="query" name="import_status" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The status of the import.
 </wadl:doc>
@@ -1881,12 +2092,10 @@ The status of the import.
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#translation_import_queue_entry-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#translation_import_queue_entry-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="translation_import_queue_entries-getRequestTargets"
-                   name="GET">
+      <wadl:method id="translation_import_queue_entries-getRequestTargets" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>List Product`s and `DistroSeries with pending imports.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
@@ -1902,13 +2111,10 @@ The status of the import.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getRequestTargets">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getRequestTargets">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="status">
+            <wadl:param style="query" name="status" required="false">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The status of the import.
 </wadl:doc>
@@ -1925,44 +2131,7 @@ The status of the import.
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#object_with_translation_imports-page"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method id="translation_import_queue_entries-getFirstEntryToImport"
-                   name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the first entry of the queue ready to be imported.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param target:</th><td class="rst-field-body">IPerson, IProduct, IProductSeries, IDistribution,
-IDistroSeries or ISourcePackage the import entries are attached to
-or None to get all entries available.</td>
-</tr>
-</tbody>
-</table>
-
-</wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getFirstEntryToImport">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="target">
-             
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#object_with_translation_imports"/>
-            </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#translation_import_queue_entry-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#object_with_translation_imports-page"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource_type>
@@ -1973,35 +2142,27 @@ or None to get all entries available.</td>
   <!--Begin representation and resource_type definitions for entry
       resources and the collections that contain them. -->
   
-    <wadl:resource_type id="archive_dependency">
+    <wadl:resource_type id="access_token">
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-ArchiveDependency interface.
+A personal access token for the webservice API.
 </wadl:doc>
-      <wadl:method name="GET" id="archive_dependency-get">
+      <wadl:method name="GET" id="access_token-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_dependency-full"/>
-          <wadl:representation
-    mediaType="application/xhtml+xml"
-    id="archive_dependency-xhtml"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="archive_dependency-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token-full"/>
+          <wadl:representation mediaType="application/xhtml+xml" id="access_token-xhtml"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="access_token-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method name="PUT" id="archive_dependency-put">
+      <wadl:method name="PUT" id="access_token-put">
         <wadl:request>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_dependency-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token-full"/>
         </wadl:request>
       </wadl:method>
 
-      <wadl:method name="PATCH"
-                   id="archive_dependency-patch">
+      <wadl:method name="PATCH" id="access_token-patch">
         <wadl:request>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_dependency-diff"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token-diff"/>
         </wadl:request>
       </wadl:method>
 
@@ -2010,13 +2171,17 @@ ArchiveDependency interface.
     </wadl:resource_type>
 
 
-    <wadl:representation mediaType="application/json"
-                         id="archive_dependency-full">
+    <wadl:representation mediaType="application/json" id="access_token-full">
       <wadl:param style="plain" name="self_link" path="$['self_link']">
         <wadl:doc>The canonical link to this resource.</wadl:doc>
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#archive_dependency"/>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#access_token"/>
+      </wadl:param>
+      <wadl:param style="plain" name="web_link" path="$['web_link']">
+        <wadl:doc>
+          The canonical human-addressable web link to this resource.
+        </wadl:doc>
+        <wadl:link/>
       </wadl:param>
-      
       <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
         <wadl:doc>
           The link to the WADL description of this resource.
@@ -2028,78 +2193,93 @@ ArchiveDependency interface.
           The value of the HTTP ETag for this resource.
         </wadl:doc>
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['archive_link']"
-                  name="archive_link">
+      <wadl:param style="plain" required="true" name="date_created" path="$['date_created']" type="xsd:dateTime">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Target archive</p>
-<p>The archive affected by this dependecy.</p>
+<p>Creation date</p>
+<p>When the token was created.</p>
 
 </wadl:doc>
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#archive"/>
+        
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['component_name']"
-                  name="component_name">
+      <wadl:param style="plain" required="true" name="date_expires" path="$['date_expires']" type="xsd:dateTime">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Component name
+<p>Expiry date</p>
+<p>When the token should expire or was revoked.</p>
+
 </wadl:doc>
         
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['date_created']"
-                  type="xsd:dateTime" name="date_created">
+      <wadl:param style="plain" required="true" name="date_last_used" path="$['date_last_used']" type="xsd:dateTime">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Instant when the dependency was created.
+<p>Date last used</p>
+<p>When the token was last used.</p>
+
 </wadl:doc>
         
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['dependency_link']"
-                  name="dependency_link">
+      <wadl:param style="plain" required="true" name="description" path="$['description']">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The archive set as a dependency.
+<p>Description</p>
+<p>A short description of the token.</p>
+
 </wadl:doc>
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#archive"/>
+        
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['pocket']" name="pocket">
+      <wadl:param style="plain" required="true" name="owner_link" path="$['owner_link']">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Pocket
+<p>Owner</p>
+<p>The person who created the token.</p>
+
 </wadl:doc>
-        
-        <wadl:option value="Release"/>
-        <wadl:option value="Security"/>
-        <wadl:option value="Updates"/>
-        <wadl:option value="Proposed"/>
-        <wadl:option value="Backports"/>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
       </wadl:param>
-      <wadl:param style="plain" required="true"
-                  path="$['title']" name="title">
+      <wadl:param style="plain" required="true" name="revoked_by_link" path="$['revoked_by_link']">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Archive dependency title.
+<p>Revoked by</p>
+<p>The person who revoked the token, if any.</p>
+
+</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="scopes" path="$['scopes']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Scopes</p>
+<p>A list of scopes granted by the token.</p>
+
 </wadl:doc>
         
       </wadl:param>
+      <wadl:param style="plain" required="true" name="target_link" path="$['target_link']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Target</p>
+<p>The target for which the token was issued.</p>
+
+</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#access_token_target"/>
+      </wadl:param>
     </wadl:representation>
 
-    <wadl:representation mediaType="application/json"
-                         id="archive_dependency-diff">
+    <wadl:representation mediaType="application/json" id="access_token-diff">
+      <wadl:param style="plain" required="false" name="description" path="$['description']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Description</p>
+<p>A short description of the token.</p>
+
+</wadl:doc>
+        
+      </wadl:param>
     </wadl:representation>
 
     <!--Collection page for this type of entry-->
-    <wadl:resource_type id="archive_dependency-page-resource">
-      <wadl:method name="GET"
-                   id="archive_dependency-page-resource-get">
+    <wadl:resource_type id="access_token-page-resource">
+      <wadl:method name="GET" id="access_token-page-resource-get">
         <wadl:response>
-          <wadl:representation
-    href="#archive_dependency-page"/>
+          <wadl:representation href="#access_token-page"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource_type>
 
-    <wadl:representation mediaType="application/json"
-                         id="archive_dependency-page">
+    <wadl:representation mediaType="application/json" id="access_token-page">
 
       <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
         <wadl:link/>
@@ -2107,164 +2287,344 @@ Archive dependency title.
 
       
 
-      <wadl:param style="plain" name="total_size"
-                  path="$['total_size']" required="true"/>
+      <wadl:param style="plain" name="total_size" path="$['total_size']" required="true"/>
 
       
 
       <wadl:param style="plain" name="start" path="$['start']" required="true"/>
 
       <wadl:param style="plain" name="next_collection_link" path="$['next_collection_link']">
-        <wadl:link resource_type="#archive_dependency-page-resource"/>
+        <wadl:link resource_type="#access_token-page-resource"/>
       </wadl:param>
 
       <wadl:param style="plain" name="prev_collection_link" path="$['prev_collection_link']">
-        <wadl:link resource_type="#archive_dependency-page-resource"/>
+        <wadl:link resource_type="#access_token-page-resource"/>
       </wadl:param>
 
       <wadl:param style="plain" name="entries" path="$['entries']" required="true"/>
 
       <wadl:param style="plain" name="entry_links" path="$['entries'][*]['self_link']">
-        <wadl:link resource_type="https://api.launchpad.net/1.0/#archive_dependency"/>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#access_token"/>
       </wadl:param>
   </wadl:representation>
 
   
   
-    <wadl:resource_type id="archive">
+    <wadl:resource_type id="access_token_target">
       <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Main Archive interface.
+An object that can be a target for access tokens.
 </wadl:doc>
-      <wadl:method name="GET" id="archive-get">
+      <wadl:method name="GET" id="access_token_target-get">
         <wadl:response>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive-full"/>
-          <wadl:representation
-    mediaType="application/xhtml+xml" id="archive-xhtml"/>
-          <wadl:representation
-    mediaType="application/vnd.sun.wadl+xml"
-    id="archive-wadl"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token_target-full"/>
+          <wadl:representation mediaType="application/xhtml+xml" id="access_token_target-xhtml"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="access_token_target-wadl"/>
         </wadl:response>
       </wadl:method>
 
-      <wadl:method name="PUT" id="archive-put">
+      <wadl:method name="PUT" id="access_token_target-put">
         <wadl:request>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token_target-full"/>
         </wadl:request>
       </wadl:method>
 
-      <wadl:method name="PATCH" id="archive-patch">
+      <wadl:method name="PATCH" id="access_token_target-patch">
         <wadl:request>
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive-diff"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#access_token_target-diff"/>
         </wadl:request>
       </wadl:method>
 
       
 
-      <wadl:method id="archive-isSourceUploadAllowed"
-                   name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>True if the person is allowed to upload the given source package.</p>
-<dl class="rst-docutils">
-<dt>Return True if there exists a permission that combines</dt>
-<dd><ul class="rst-first rst-last rst-simple">
-<li>this archive</li>
-<li>a package set that includes the given source package name</li>
-<li>the given person or a team he is a member of</li>
-</ul>
-</dd>
-</dl>
-<p>If the source package name is included by <em>any</em> package set with
-an explicit permission then only such explicit permissions will
-be considered.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
-either a string or a ISourcePackageName.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
-package sets he has access to.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">The IDistroSeries for which to check
-permissions. If none is supplied then currentseries in
-Ubuntu is assumed.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if a source package with the
-given name could not be found.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">True if the person is allowed to upload the source package.</td>
-</tr>
-</tbody>
-</table>
+    </wadl:resource_type>
 
-</wadl:doc>
+
+    <wadl:representation mediaType="application/json" id="access_token_target-full">
+      <wadl:param style="plain" name="self_link" path="$['self_link']">
+        <wadl:doc>The canonical link to this resource.</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#access_token_target"/>
+      </wadl:param>
+      <wadl:param style="plain" name="web_link" path="$['web_link']">
+        <wadl:doc>
+          The canonical human-addressable web link to this resource.
+        </wadl:doc>
+        <wadl:link/>
+      </wadl:param>
+      <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
+        <wadl:doc>
+          The link to the WADL description of this resource.
+        </wadl:doc>
+        <wadl:link/>
+      </wadl:param>
+      <wadl:param style="plain" name="http_etag" path="$['http_etag']">
+        <wadl:doc>
+          The value of the HTTP ETag for this resource.
+        </wadl:doc>
+      </wadl:param>
+    </wadl:representation>
+
+    <wadl:representation mediaType="application/json" id="access_token_target-diff">
+    </wadl:representation>
+
+    <!--Collection page for this type of entry-->
+    <wadl:resource_type id="access_token_target-page-resource">
+      <wadl:method name="GET" id="access_token_target-page-resource-get">
+        <wadl:response>
+          <wadl:representation href="#access_token_target-page"/>
+        </wadl:response>
+      </wadl:method>
+    </wadl:resource_type>
+
+    <wadl:representation mediaType="application/json" id="access_token_target-page">
+
+      <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
+        <wadl:link/>
+      </wadl:param>
+
+      
+
+      <wadl:param style="plain" name="total_size" path="$['total_size']" required="true"/>
+
+      
+
+      <wadl:param style="plain" name="start" path="$['start']" required="true"/>
+
+      <wadl:param style="plain" name="next_collection_link" path="$['next_collection_link']">
+        <wadl:link resource_type="#access_token_target-page-resource"/>
+      </wadl:param>
+
+      <wadl:param style="plain" name="prev_collection_link" path="$['prev_collection_link']">
+        <wadl:link resource_type="#access_token_target-page-resource"/>
+      </wadl:param>
+
+      <wadl:param style="plain" name="entries" path="$['entries']" required="true"/>
+
+      <wadl:param style="plain" name="entry_links" path="$['entries'][*]['self_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#access_token_target"/>
+      </wadl:param>
+  </wadl:representation>
+
+  
+  
+    <wadl:resource_type id="archive_dependency">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+ArchiveDependency interface.
+</wadl:doc>
+      <wadl:method name="GET" id="archive_dependency-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_dependency-full"/>
+          <wadl:representation mediaType="application/xhtml+xml" id="archive_dependency-xhtml"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="archive_dependency-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+      <wadl:method name="PUT" id="archive_dependency-put">
         <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="isSourceUploadAllowed"/>
-            <wadl:param style="query" required="true"
-                        name="person">
-              
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distroseries">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The distro series
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_dependency-full"/>
+        </wadl:request>
+      </wadl:method>
+
+      <wadl:method name="PATCH" id="archive_dependency-patch">
+        <wadl:request>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_dependency-diff"/>
+        </wadl:request>
+      </wadl:method>
+
+      
+
+    </wadl:resource_type>
+
+
+    <wadl:representation mediaType="application/json" id="archive_dependency-full">
+      <wadl:param style="plain" name="self_link" path="$['self_link']">
+        <wadl:doc>The canonical link to this resource.</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#archive_dependency"/>
+      </wadl:param>
+      
+      <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
+        <wadl:doc>
+          The link to the WADL description of this resource.
+        </wadl:doc>
+        <wadl:link/>
+      </wadl:param>
+      <wadl:param style="plain" name="http_etag" path="$['http_etag']">
+        <wadl:doc>
+          The value of the HTTP ETag for this resource.
+        </wadl:doc>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="archive_link" path="$['archive_link']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Target archive</p>
+<p>The archive that has this dependency.</p>
+
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="sourcepackagename">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Source package name
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#archive"/>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="component_name" path="$['component_name']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Component name
+</wadl:doc>
+        
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="date_created" path="$['date_created']" type="xsd:dateTime">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Instant when the dependency was created.
+</wadl:doc>
+        
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="dependency_link" path="$['dependency_link']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+The archive set as a dependency.
+</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#archive"/>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="pocket" path="$['pocket']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Pocket
+</wadl:doc>
+        
+        <wadl:option value="Release"/>
+        <wadl:option value="Security"/>
+        <wadl:option value="Updates"/>
+        <wadl:option value="Proposed"/>
+        <wadl:option value="Backports"/>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="snap_base_link" path="$['snap_base_link']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Target snap base</p>
+<p>The snap base that has this dependency.</p>
+
+</wadl:doc>
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#snap_base"/>
+      </wadl:param>
+      <wadl:param style="plain" required="true" name="title" path="$['title']">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Archive dependency title.
 </wadl:doc>
-              
-            </wadl:param>
-          
-        </wadl:request>
         
+      </wadl:param>
+    </wadl:representation>
+
+    <wadl:representation mediaType="application/json" id="archive_dependency-diff">
+    </wadl:representation>
+
+    <!--Collection page for this type of entry-->
+    <wadl:resource_type id="archive_dependency-page-resource">
+      <wadl:method name="GET" id="archive_dependency-page-resource-get">
+        <wadl:response>
+          <wadl:representation href="#archive_dependency-page"/>
+        </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getBuildCounters" name="GET">
+    </wadl:resource_type>
+
+    <wadl:representation mediaType="application/json" id="archive_dependency-page">
+
+      <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
+        <wadl:link/>
+      </wadl:param>
+
+      
+
+      <wadl:param style="plain" name="total_size" path="$['total_size']" required="true"/>
+
+      
+
+      <wadl:param style="plain" name="start" path="$['start']" required="true"/>
+
+      <wadl:param style="plain" name="next_collection_link" path="$['next_collection_link']">
+        <wadl:link resource_type="#archive_dependency-page-resource"/>
+      </wadl:param>
+
+      <wadl:param style="plain" name="prev_collection_link" path="$['prev_collection_link']">
+        <wadl:link resource_type="#archive_dependency-page-resource"/>
+      </wadl:param>
+
+      <wadl:param style="plain" name="entries" path="$['entries']" required="true"/>
+
+      <wadl:param style="plain" name="entry_links" path="$['entries'][*]['self_link']">
+        <wadl:link resource_type="https://api.launchpad.test/1.0/#archive_dependency"/>
+      </wadl:param>
+  </wadl:representation>
+
+  
+  
+    <wadl:resource_type id="archive">
+      <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Main Archive interface.
+</wadl:doc>
+      <wadl:method name="GET" id="archive-get">
+        <wadl:response>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive-full"/>
+          <wadl:representation mediaType="application/xhtml+xml" id="archive-xhtml"/>
+          <wadl:representation mediaType="application/vnd.sun.wadl+xml" id="archive-wadl"/>
+        </wadl:response>
+      </wadl:method>
+
+      <wadl:method name="PUT" id="archive-put">
+        <wadl:request>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive-full"/>
+        </wadl:request>
+      </wadl:method>
+
+      <wadl:method name="PATCH" id="archive-patch">
+        <wadl:request>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive-diff"/>
+        </wadl:request>
+      </wadl:method>
+
+      
+
+      <wadl:method id="archive-getPublishedBinaries" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return a dictionary containing the build counters for an archive.</p>
-<p>This is necessary currently because the IArchive.failed_builds etc.
-counters are not in use.</p>
-<p>The returned dictionary contains the follwoing keys and values:</p>
-<blockquote>
-<ul class="rst-simple">
-<li>'total': total number of builds (includes SUPERSEDED);</li>
-<li>'pending': number of builds in BUILDING or NEEDSBUILD state;</li>
-<li>'failed': number of builds in FAILEDTOBUILD, MANUALDEPWAIT,
-CHROOTWAIT and FAILEDTOUPLOAD state;</li>
-<li>'succeeded': number of SUCCESSFULLYBUILT builds.</li>
-<li>'superseded': number of SUPERSEDED builds.</li>
-</ul>
-</blockquote>
+<p>All IBinaryPackagePublishingHistory target to this archive.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param include_needsbuild:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">Indicates whether to include builds with
-the status NEEDSBUILD in the pending and total counts. This is
-useful in situations where a build that hasn't started isn't
-considered a build by the user.</td>
+<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">binary name filter (exact match or SQL LIKE controlled
+by 'exact_match' argument).</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">type include_needsbuild:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body"><tt class="rst-docutils literal"><span class="pre">bool</span></tt></td>
+<tr class="rst-field"><th class="rst-field-name">param version:</th><td class="rst-field-body">binary version filter (always exact match).</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a dictionary with the 4 keys specified above.</td>
+<tr class="rst-field"><th class="rst-field-name">param status:</th><td class="rst-field-body">PackagePublishingStatus filter, can be a list.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroarchseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">IDistroArchSeries filter, can be a list.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">rtype:</th><td class="rst-field-body"><tt class="rst-docutils literal"><span class="pre">dict</span></tt>.</td>
+<tr class="rst-field"><th class="rst-field-name">param pocket:</th><td class="rst-field-body">PackagePublishingPocket filter.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param exact_match:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">either or not filter source names by exact
+matching.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param created_since_date:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Only return publications created on or
+after this date.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param ordered:</th><td class="rst-field-body">Normally publications are ordered by binary package
+name and then ID order (creation order).  If this parameter is
+False then the results will be unordered.  This will make the
+operation much quicker to return results if you don't care about
+ordering.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param order_by_date:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Order publications by descending creation date
+and then by descending ID.  This is suitable for applications
+that need to catch up with publications since their last run.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param include_removed:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">If True, include publications that have been
+removed from disk as well as those that have not.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param only_unpublished:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">If True, only include publications that
+have never been published to disk.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param component_name:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">component filter. Only return binaries that are
+in this component.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A collection containing BinaryPackagePublishingHistory.</td>
 </tr>
 </tbody>
 </table>
@@ -2272,91 +2632,162 @@ considered a build by the user.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getBuildCounters"/>
-            <wadl:param style="query" required="false"
-                        name="include_needsbuild">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPublishedBinaries"/>
+            <wadl:param style="query" name="version" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Include builds with state NEEDSBUILD
+Version
 </wadl:doc>
               
             </wadl:param>
-          
-        </wadl:request>
-        
-      </wadl:method>
-      <wadl:method id="archive-getComponentsForQueueAdmin"
-                   name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return IArchivePermission for the person's queue admin
-components.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
-</tr>
-</tbody>
-</table>
+            <wadl:param style="query" name="binary_name" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Binary Package Name
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="status" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Package Publishing Status</p>
+<p>The status of this publishing record</p>
 
 </wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getComponentsForQueueAdmin"/>
-            <wadl:param style="query" required="true"
-                        name="person">
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
+              <wadl:option value="Pending"/>
+              <wadl:option value="Published"/>
+              <wadl:option value="Superseded"/>
+              <wadl:option value="Deleted"/>
+              <wadl:option value="Obsolete"/>
             </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method id="archive-checkUpload" name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Wrapper around checkUpload for the web service API.
+            <wadl:param style="query" name="component_name" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Component name
 </wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="checkUpload"/>
-            <wadl:param style="query" required="true"
-                        name="person">
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="distroseries">
+            <wadl:param style="query" name="distro_arch_series" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-The distro series
+Distro Arch Series
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_arch_series"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="component">
+            <wadl:param style="query" name="ordered" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Component
+<p>Ordered</p>
+<p>Return ordered results by default, but specifying False will return results more quickly.</p>
+
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="strict_component">
+            <wadl:param style="query" name="pocket" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Strict component
+<p>Pocket</p>
+<p>The pocket into which this entry is published</p>
+
+</wadl:doc>
+              
+              <wadl:option value="Release"/>
+              <wadl:option value="Security"/>
+              <wadl:option value="Updates"/>
+              <wadl:option value="Proposed"/>
+              <wadl:option value="Backports"/>
+            </wadl:param>
+            <wadl:param style="query" name="created_since_date" required="false" type="xsd:dateTime">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Created Since Date</p>
+<p>Return entries whose date_created is greater than or equal to this date.</p>
+
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="exact_match" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Whether or not to filter binary names by exact matching.
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="order_by_date" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Order by creation date</p>
+<p>Return newest results first. This is recommended for applications that need to catch up with publications since their last run.</p>
+
+</wadl:doc>
+              
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#binary_package_publishing_history-page"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="archive-getBuildRecords" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return build records in the context it is implemented.</p>
+<p>It excludes build records generated by Gina (imported from a external
+repository), where IBuild.datebuilt is null and IBuild.buildstate
+is BuildStatus.FULLYBUILT.</p>
+<p>The result is simply not filtered if the optional filters are omitted
+by call sites.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param build_state:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">optional BuildStatus value for filtering build
+records;</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">optional string for filtering build source package name.
+Sub-string matching is allowed via SQL LIKE.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param pocket:</th><td class="rst-field-body">optional PackagePublishingPocket value for filtering
+build records;</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param arch_tag:</th><td class="rst-field-body">optional string for filtering build source packages
+by their architecture tag;</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">param user:</th><td class="rst-field-body">optional IPerson corresponding to the user performing
+the request. It will filter out build records for which the user
+have no 'view' permission.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param binary_only:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">optional boolean indicating whether only
+BinaryPackageBuild objects should be returned, or more general
+PackageBuild objects (which may include, for example,
+SourcePackageRecipeBuild objects.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a result set containing IPackageBuild records ordered by
+descending IPackageBuild.date_finished except when builds are
+filtered by BuildStatus.NEEDSBUILD, in this case records
+are ordered by descending BuildQueue.lastscore
+(dispatching order).</td>
+</tr>
+</tbody>
+</table>
+
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="getBuildRecords"/>
+            <wadl:param style="query" name="build_state" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Build status</p>
+<p>The status of this build record</p>
+
 </wadl:doc>
               
+              <wadl:option value="Needs building"/>
+              <wadl:option value="Successfully built"/>
+              <wadl:option value="Failed to build"/>
+              <wadl:option value="Dependency wait"/>
+              <wadl:option value="Chroot problem"/>
+              <wadl:option value="Build for superseded Source"/>
+              <wadl:option value="Currently building"/>
+              <wadl:option value="Failed to upload"/>
+              <wadl:option value="Uploading build"/>
+              <wadl:option value="Cancelling build"/>
+              <wadl:option value="Cancelled build"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="pocket">
+            <wadl:param style="query" name="pocket" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Pocket</p>
 <p>The pocket into which this entry is published</p>
@@ -2369,8 +2800,7 @@ Strict component
               <wadl:option value="Proposed"/>
               <wadl:option value="Backports"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="sourcepackagename">
+            <wadl:param style="query" name="source_name" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Source package name
 </wadl:doc>
@@ -2378,21 +2808,22 @@ Source package name
             </wadl:param>
           
         </wadl:request>
-        
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#build-page"/>
+        </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getArchiveDependency"
-                   name="GET">
+      <wadl:method id="archive-getComponentsForQueueAdmin" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the IArchiveDependency object for the given dependency.</p>
+<p>Return IArchivePermission for the person's queue admin
+components.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param dependency:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">is an IArchive object.</td>
+<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">IArchiveDependency or None if a corresponding object
-could not be found.</td>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
 </tr>
 </tbody>
 </table>
@@ -2400,55 +2831,28 @@ could not be found.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getArchiveDependency"/>
-            <wadl:param style="query" required="true"
-                        name="dependency">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getComponentsForQueueAdmin"/>
+            <wadl:param style="query" name="person" required="true">
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#archive"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_dependency-full"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getPublishedSources"
-                   name="GET">
+      <wadl:method id="archive-getPermissionsForPerson" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>All ISourcePackagePublishingHistory target to this archive.</p>
+<p>Return the IArchivePermission records applicable to the person.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">source name filter (exact match or SQL LIKE controlled
-by 'exact_match' argument).
-Name can be a single string or a list of strings.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param version:</th><td class="rst-field-body">source version filter (always exact match).</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param status:</th><td class="rst-field-body">PackagePublishingStatus filter, can be a sequence.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">IDistroSeries filter.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param pocket:</th><td class="rst-field-body">PackagePublishingPocket filter.  This may be an
-iterable of more than one pocket or a single pocket.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param exact_match:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">either or not filter source names by exact
-matching.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param created_since_date:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">Only return results whose date_created
-is greater than or equal to this date.</td>
+<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">SelectResults containing ISourcePackagePublishingHistory,
-ordered by name. If there are multiple results for the same
-name then they are sub-ordered newest first.</td>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
 </tr>
 </tbody>
 </table>
@@ -2456,48 +2860,63 @@ name then they are sub-ordered newest first.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPublishedSources"/>
-            <wadl:param style="query" required="false"
-                        name="status">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPermissionsForPerson"/>
+            <wadl:param style="query" name="person" required="true">
+              
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+          
+        </wadl:request>
+        <wadl:response>
+          
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method id="archive-getPublishedSources" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+All ISourcePackagePublishingHistory target to this archive.
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPublishedSources"/>
+            <wadl:param style="query" name="version" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Package Publishing Status</p>
-<p>The status of this publishing record</p>
-
+Version
 </wadl:doc>
               
-              <wadl:option value="Pending"/>
-              <wadl:option value="Published"/>
-              <wadl:option value="Superseded"/>
-              <wadl:option value="Deleted"/>
-              <wadl:option value="Obsolete"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="source_name">
+            <wadl:param style="query" name="source_name" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Source package name
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distro_series">
+            <wadl:param style="query" name="distro_series" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Distroseries name
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_series"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="exact_match">
+            <wadl:param style="query" name="status" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Exact Match</p>
-<p>Whether or not to filter source names by exact matching.</p>
+<p>Package Publishing Status</p>
+<p>The status of this publishing record</p>
 
 </wadl:doc>
               
+              <wadl:option value="Pending"/>
+              <wadl:option value="Published"/>
+              <wadl:option value="Superseded"/>
+              <wadl:option value="Deleted"/>
+              <wadl:option value="Obsolete"/>
+            </wadl:param>
+            <wadl:param style="query" name="component_name" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Component name
+</wadl:doc>
+              
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="pocket">
+            <wadl:param style="query" name="pocket" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Pocket</p>
 <p>The pocket into which this entry is published</p>
@@ -2510,16 +2929,7 @@ Distroseries name
               <wadl:option value="Proposed"/>
               <wadl:option value="Backports"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="version">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Version
-</wadl:doc>
-              
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        type="xsd:dateTime"
-                        name="created_since_date">
+            <wadl:param style="query" name="created_since_date" required="false" type="xsd:dateTime">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Created Since Date</p>
 <p>Return entries whose date_created is greater than or equal to this date.</p>
@@ -2527,53 +2937,19 @@ Version
 </wadl:doc>
               
             </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#source_package_publishing_history-page"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method id="archive-getUploadersForPackageset"
-                   name="GET">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>The ArchivePermission records for uploaders to the package set.</p>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param packageset:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">An IPackageset.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_permissions:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">If True, only consider permissions granted
-directly for the package set at hand. Otherwise, include any
-uploaders for package sets that include this one.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for all the uploaders who are
-authorized to upload to the named source package set.</td>
-</tr>
-</tbody>
-</table>
-
-</wadl:doc>
-        <wadl:request>
-          
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getUploadersForPackageset"/>
-            <wadl:param style="query" required="true"
-                        name="packageset">
+            <wadl:param style="query" name="exact_match" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Package set
+<p>Exact Match</p>
+<p>Whether or not to filter source names by exact matching.</p>
+
 </wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#packageset"/>
+              
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="direct_permissions">
+            <wadl:param style="query" name="order_by_date" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Ignore package set hierarchy
+<p>Order by creation date</p>
+<p>Return newest results first. This is recommended for applications that need to catch up with publications since their last run. If not specified, results are ordered by source package name (lexicographically), then by descending version and then descending ID.</p>
+
 </wadl:doc>
               
             </wadl:param>
@@ -2581,37 +2957,46 @@ Ignore package set hierarchy
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#source_package_publishing_history-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getPackagesetsForSource"
-                   name="GET">
+      <wadl:method id="archive-getPackagesetsForSourceUploader" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>All package set based permissions for the given source.</p>
-<p>This method is meant to aid the process of &quot;debugging&quot; package set
-based archive permission since It allows the listing of permissions
-for the given source package in this archive (irrespective of the
-principal).</p>
+<p>The package set based permissions for a given source and uploader.</p>
+<dl class="rst-docutils">
+<dt>Return the IArchivePermission records that</dt>
+<dd><ul class="rst-first rst-last rst-simple">
+<li>apply to this archive</li>
+<li><dl class="rst-first rst-docutils">
+<dt>relate to</dt>
+<dd><ul class="rst-first rst-last">
+<li>package sets that include the given source package name</li>
+<li>the given person</li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+</dd>
+</dl>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
 <tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
 either a string or a ISourcePackageName.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_permissions:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">If set only package sets that directly
-include the given source will be considered.</td>
+<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
+package sets they have access to.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if a source package with the
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if a source package with the
 given name could not be found.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for the package sets that
-include the given source package name and apply to the
-archive in question.</td>
+include the given source package name and to which the given
+person may upload.</td>
 </tr>
 </tbody>
 </table>
@@ -2619,71 +3004,36 @@ archive in question.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPackagesetsForSource"/>
-            <wadl:param style="query" required="true"
-                        name="sourcepackagename">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPackagesetsForSourceUploader"/>
+            <wadl:param style="query" name="sourcepackagename" required="true">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Source package name
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="direct_permissions">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Ignore package set hierarchy
-</wadl:doc>
+            <wadl:param style="query" name="person" required="true">
               
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getBuildRecords" name="GET">
+      <wadl:method id="archive-getArchiveDependency" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return build records in the context it is implemented.</p>
-<p>It excludes build records generated by Gina (imported from a external
-repository), where IBuild.datebuilt is null and IBuild.buildstate
-is BuildStatus.FULLYBUILT.</p>
-<p>The result is simply not filtered if the optional filters are omitted
-by call sites.</p>
+<p>Return the IArchiveDependency object for the given dependency.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param build_state:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">optional BuildStatus value for filtering build
-records;</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param name:</th><td class="rst-field-body">optional string for filtering build source package name.
-Sub-string matching is allowed via SQL LIKE.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param pocket:</th><td class="rst-field-body">optional PackagePublishingPocket value for filtering
-build records;</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param arch_tag:</th><td class="rst-field-body">optional string for filtering build source packages
-by their architecture tag;</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param user:</th><td class="rst-field-body">optional IPerson corresponding to the user performing
-the request. It will filter out build records for which the user
-have no 'view' permission.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param binary_only:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">optional boolean indicating whether only
-BinaryPackageBuild objects should be returned, or more general
-PackageBuild objects (which may include, for example,
-SourcePackageRecipeBuild objects.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param dependency:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">is an IArchive object.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a result set containing IPackageBuild records ordered by
-descending IPackageBuild.date_finished except when builds are
-filtered by BuildStatus.NEEDSBUILD, in this case records
-are ordered by descending BuildQueue.lastscore
-(dispatching order).</td>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">IArchiveDependency or None if a corresponding object
+could not be found.</td>
 </tr>
 </tbody>
 </table>
@@ -2691,79 +3041,54 @@ are ordered by descending BuildQueue.lastscore
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getBuildRecords"/>
-            <wadl:param style="query" required="false"
-                        name="pocket">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Pocket</p>
-<p>The pocket into which this entry is published</p>
-
-</wadl:doc>
-              
-              <wadl:option value="Release"/>
-              <wadl:option value="Security"/>
-              <wadl:option value="Updates"/>
-              <wadl:option value="Proposed"/>
-              <wadl:option value="Backports"/>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="build_state">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Build status</p>
-<p>The status of this build record</p>
-
-</wadl:doc>
-              
-              <wadl:option value="Needs building"/>
-              <wadl:option value="Successfully built"/>
-              <wadl:option value="Failed to build"/>
-              <wadl:option value="Dependency wait"/>
-              <wadl:option value="Chroot problem"/>
-              <wadl:option value="Build for superseded Source"/>
-              <wadl:option value="Currently building"/>
-              <wadl:option value="Failed to upload"/>
-              <wadl:option value="Uploading build"/>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="source_name">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Source package name
-</wadl:doc>
+            <wadl:param style="query" name="ws.op" required="true" fixed="getArchiveDependency"/>
+            <wadl:param style="query" name="dependency" required="true">
               
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#archive"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#build-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_dependency-full"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getPublishedBinaries"
-                   name="GET">
+      <wadl:method id="archive-isSourceUploadAllowed" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>All IBinaryPackagePublishingHistory target to this archive.</p>
+<p>True if the person is allowed to upload the given source package.</p>
+<dl class="rst-docutils">
+<dt>Return True if there exists a permission that combines</dt>
+<dd><ul class="rst-first rst-last rst-simple">
+<li>this archive</li>
+<li>a package set that includes the given source package name</li>
+<li>the given person or a team they are a member of</li>
+</ul>
+</dd>
+</dl>
+<p>If the source package name is included by <em>any</em> package set with
+an explicit permission then only such explicit permissions will
+be considered.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">name: binary name filter (exact match or SQL LIKE controlled
-by 'exact_match' argument).</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">version: binary version filter (always exact match).</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">status: PackagePublishingStatus filter, can be a list.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
+either a string or a ISourcePackageName.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">distroarchseries: IDistroArchSeries filter, can be a list.</td>
+<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
+package sets they have access to.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">pocket: PackagePublishingPocket filter.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param distroseries:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">The IDistroSeries for which to check
+permissions. If none is supplied then currentseries in
+the archive's distribution is assumed.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">param:</th><td class="rst-field-body">exact_match: either or not filter source names by exact
-matching.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if a source package with the
+given name could not be found.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A collection containing BinaryPackagePublishingHistory.</td>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">True if the person is allowed to upload the source package.</td>
 </tr>
 </tbody>
 </table>
@@ -2771,86 +3096,86 @@ matching.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPublishedBinaries"/>
-            <wadl:param style="query" required="false"
-                        name="status">
+            <wadl:param style="query" name="ws.op" required="true" fixed="isSourceUploadAllowed"/>
+            <wadl:param style="query" name="distroseries" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Package Publishing Status</p>
-<p>The status of this publishing record</p>
-
+The distro series
 </wadl:doc>
-              
-              <wadl:option value="Pending"/>
-              <wadl:option value="Published"/>
-              <wadl:option value="Superseded"/>
-              <wadl:option value="Deleted"/>
-              <wadl:option value="Obsolete"/>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="binary_name">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Binary Package Name
-</wadl:doc>
+            <wadl:param style="query" name="person" required="true">
               
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="exact_match">
+            <wadl:param style="query" name="sourcepackagename" required="true">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Whether or not to filter binary names by exact matching.
+Source package name
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="pocket">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Pocket</p>
-<p>The pocket into which this entry is published</p>
+          
+        </wadl:request>
+        
+      </wadl:method>
+      <wadl:method id="archive-getUploadersForComponent" name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Return IArchivePermission records for the component's uploaders.</p>
+<table class="rst-docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param component_name:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">An IComponent or textual name for the
+component.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
+</tr>
+</tbody>
+</table>
 
 </wadl:doc>
-              
-              <wadl:option value="Release"/>
-              <wadl:option value="Security"/>
-              <wadl:option value="Updates"/>
-              <wadl:option value="Proposed"/>
-              <wadl:option value="Backports"/>
-            </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="version">
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op" required="true" fixed="getUploadersForComponent"/>
+            <wadl:param style="query" name="component_name" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Version
+Component Name
 </wadl:doc>
               
             </wadl:param>
-            <wadl:param style="query" required="false"
-                        name="distro_arch_series">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Distro Arch Series
-</wadl:doc>
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#distro_arch_series"/>
-            </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#binary_package_publishing_history-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getUploadersForComponent"
-                   name="GET">
+      <wadl:method id="archive-getPackagesetsForSource" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return IArchivePermission records for the component's uploaders.</p>
+<p>All package set based permissions for the given source.</p>
+<p>This method is meant to aid the process of &quot;debugging&quot; package set
+based archive permission since It allows the listing of permissions
+for the given source package in this archive (irrespective of the
+principal).</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param component_name:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">An IComponent or textual name for the
-component.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
+either a string or a ISourcePackageName.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_permissions:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">If set only package sets that directly
+include the given source will be considered.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">if a source package with the
+given name could not be found.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for the package sets that
+include the given source package name and apply to the
+archive in question.</td>
 </tr>
 </tbody>
 </table>
@@ -2858,13 +3183,16 @@ component.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getUploadersForComponent"/>
-            <wadl:param style="query" required="false"
-                        name="component_name">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPackagesetsForSource"/>
+            <wadl:param style="query" name="sourcepackagename" required="true">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Component Name
+Source package name
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="direct_permissions" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Ignore package set hierarchy
 </wadl:doc>
               
             </wadl:param>
@@ -2872,23 +3200,26 @@ Component Name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getUploadersForPackage"
-                   name="GET">
+      <wadl:method id="archive-getUploadersForPackageset" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return IArchivePermission records for the package's uploaders.</p>
+<p>The ArchivePermission records for uploaders to the package set.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param source_package_name:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">An ISourcePackageName or textual name
-for the source package.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param packageset:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">An IPackageset.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param direct_permissions:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">If True, only consider permissions granted
+directly for the package set at hand. Otherwise, include any
+uploaders for package sets that include this one.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for all the uploaders who are
+authorized to upload to the named source package set.</td>
 </tr>
 </tbody>
 </table>
@@ -2896,13 +3227,16 @@ for the source package.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getUploadersForPackage"/>
-            <wadl:param style="query" required="true"
-                        name="source_package_name">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getUploadersForPackageset"/>
+            <wadl:param style="query" name="packageset" required="true">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Source Package Name
+Package set
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#packageset"/>
+            </wadl:param>
+            <wadl:param style="query" name="direct_permissions" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Ignore package set hierarchy
 </wadl:doc>
               
             </wadl:param>
@@ -2910,12 +3244,10 @@ Source Package Name
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getBuildSummariesForSourceIds"
-                   name="GET">
+      <wadl:method id="archive-getBuildSummariesForSourceIds" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 <p>Return a dictionary containing a summary of the build statuses.</p>
 <p>Only information for sources belonging to the current archive will
@@ -2927,10 +3259,10 @@ details.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="rst-field"><th class="rst-field-name" colspan="2">param source_ids:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">A list of source publishing history record ids.</td>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">A list of source publishing history record ids.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name" colspan="2">type source_ids:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body"><tt class="rst-docutils literal"><span class="pre">list</span></tt></td>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body"><tt class="rst-docutils literal">list</tt></td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A dict consisting of the overall status summaries for the
 given ids that belong in the archive.</td>
@@ -2941,11 +3273,8 @@ given ids that belong in the archive.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getBuildSummariesForSourceIds"/>
-            <wadl:param style="query" required="true"
-                        name="source_ids">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getBuildSummariesForSourceIds"/>
+            <wadl:param style="query" name="source_ids" required="true">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 A list of source publishing history record ids.
 </wadl:doc>
@@ -2955,19 +3284,18 @@ A list of source publishing history record ids.
         </wadl:request>
         
       </wadl:method>
-      <wadl:method id="archive-getQueueAdminsForComponent"
-                   name="GET">
+      <wadl:method id="archive-getPackagesetsForUploader" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return IArchivePermission records for authorised queue admins.</p>
+<p>The ArchivePermission records for the person's package sets.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param component_name:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">An IComponent or textual name for the
-component.</td>
+<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
+package sets they have access to.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for all the package sets that
+'person' is allowed to upload to.</td>
 </tr>
 </tbody>
 </table>
@@ -2975,33 +3303,28 @@ component.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getQueueAdminsForComponent"/>
-            <wadl:param style="query" required="true"
-                        name="component_name">
-              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Component Name
-</wadl:doc>
+            <wadl:param style="query" name="ws.op" required="true" fixed="getPackagesetsForUploader"/>
+            <wadl:param style="query" name="person" required="true">
               
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getPermissionsForPerson"
-                   name="GET">
+      <wadl:method id="archive-getUploadersForPackage" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>Return the IArchivePermission records applicable to the person.</p>
+<p>Return IArchivePermission records for the package's uploaders.</p>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param source_package_name:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">An ISourcePackageName or textual name
+for the source package.</td>
 </tr>
 <tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">A list of IArchivePermission records.</td>
 </tr>
@@ -3011,104 +3334,104 @@ Component Name
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPermissionsForPerson"/>
-            <wadl:param style="query" required="true"
-                        name="person">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getUploadersForPackage"/>
+            <wadl:param style="query" name="source_package_name" required="true">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Source Package Name
+</wadl:doc>
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
             </wadl:param>
           
         </wadl:request>
         <wadl:response>
           
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
+          <wadl:representation href="https://api.launchpad.test/1.0/#archive_permission-page"/>
         </wadl:response>
       </wadl:method>
-      <wadl:method id="archive-getPackagesetsForSourceUploader"
-                   name="GET">
+      <wadl:method id="archive-checkUpload" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>The package set based permissions for a given source and uploader.</p>
-<dl class="rst-docutils">
-<dt>Return the IArchivePermission records that</dt>
-<dd><ul class="rst-first rst-last">
-<li><p class="rst-first">apply to this archive</p>
-</li>
-<li><dl class="rst-first rst-docutils">
-<dt>relate to</dt>
-<dd><ul class="rst-first rst-last rst-simple">
-<li>package sets that include the given source package name</li>
-<li>the given person</li>
-</ul>
-</dd>
-</dl>
-</li>
-</ul>
-</dd>
-</dl>
-<table class="rst-docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name" colspan="2">param sourcepackagename:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">the source package name; can be
-either a string or a ISourcePackageName.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
-package sets he has access to.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name" colspan="2">raises NoSuchSourcePackageName:</th></tr>
-<tr><td>&nbsp;</td><td class="rst-field-body">if a source package with the
-given name could not be found.</td>
-</tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for the package sets that
-include the given source package name and to which the given
-person may upload.</td>
-</tr>
-</tbody>
-</table>
-
+Wrapper around checkUpload for the web service API.
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPackagesetsForSourceUploader"/>
-            <wadl:param style="query" required="true"
-                        name="person">
+            <wadl:param style="query" name="ws.op" required="true" fixed="checkUpload"/>
+            <wadl:param style="query" name="distroseries" required="true">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+The distro series
+</wadl:doc>
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#distro_series"/>
+            </wadl:param>
+            <wadl:param style="query" name="component" required="true">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Component
+</wadl:doc>
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
             </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="sourcepackagename">
+            <wadl:param style="query" name="strict_component" required="false">
               <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Source package name
+Strict component
 </wadl:doc>
               
             </wadl:param>
-          
-        </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
-        </wadl:response>
+            <wadl:param style="query" name="pocket" required="true">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+<p>Pocket</p>
+<p>The pocket into which this entry is published</p>
+
+</wadl:doc>
+              
+              <wadl:option value="Release"/>
+              <wadl:option value="Security"/>
+              <wadl:option value="Updates"/>
+              <wadl:option value="Proposed"/>
+              <wadl:option value="Backports"/>
+            </wadl:param>
+            <wadl:param style="query" name="sourcepackagename" required="true">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Source package name
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" name="person" required="true">
+              
+              <wadl:link resource_type="https://api.launchpad.test/1.0/#person"/>
+            </wadl:param>
+          
+        </wadl:request>
+        
       </wadl:method>
-      <wadl:method id="archive-getPackagesetsForUploader"
-                   name="GET">
+      <wadl:method id="archive-getBuildCounters" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-<p>The ArchivePermission records for the person's package sets.</p>
+<p>Return a dictionary containing the build counters for an archive.</p>
+<p>This is necessary currently because the IArchive.failed_builds etc.
+counters are not in use.</p>
+<p>The returned dictionary contains the follwoing keys and values:</p>
+<blockquote>
+<ul class="rst-simple">
+<li>'total': total number of builds (includes SUPERSEDED);</li>
+<li>'pending': number of builds in BUILDING or NEEDSBUILD state;</li>
+<li>'failed': number of builds in FAILEDTOBUILD, MANUALDEPWAIT,
+CHROOTWAIT and FAILEDTOUPLOAD state;</li>
+<li>'succeeded': number of SUCCESSFULLYBUILT builds.</li>
+<li>'superseded': number of SUPERSEDED builds.</li>
+</ul>
+</blockquote>
 <table class="rst-docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="rst-field"><th class="rst-field-name">param person:</th><td class="rst-field-body">An IPerson for whom you want to find out which
-package sets he has access to.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">param include_needsbuild:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body">Indicates whether to include builds with
+the status NEEDSBUILD in the pending and total counts. This is
+useful in situations where a build that hasn't started isn't
+considered a build by the user.</td>
 </tr>
-<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">ArchivePermission records for all the package sets that
-'person' is allowed to upload to.</td>
+<tr class="rst-field"><th class="rst-field-name" colspan="2">type include_needsbuild:</th></tr>
+<tr class="rst-field"><td>&nbsp;</td><td class="rst-field-body"><tt class="rst-docutils literal">bool</tt></td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">return:</th><td class="rst-field-body">a dictionary with the 4 keys specified above.</td>
+</tr>
+<tr class="rst-field"><th class="rst-field-name">rtype:</th><td class="rst-field-body"><tt class="rst-docutils literal">dict</tt>.</td>
 </tr>
 </tbody>
 </table>
@@ -3116,118 +3439,49 @@ package sets he has access to.</td>
 </wadl:doc>
         <wadl:request>
           
-            <wadl:param style="query" name="ws.op"
-                        required="true"
-                        fixed="getPackagesetsForUploader"/>
-            <wadl:param style="query" required="true"
-                        name="person">
+            <wadl:param style="query" name="ws.op" required="true" fixed="getBuildCounters"/>
+            <wadl:param style="query" name="include_needsbuild" required="false">
+              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Include builds with state NEEDSBUILD
+</wadl:doc>
               
-              <wadl:link resource_type="https://api.launchpad.net/1.0/#person"/>
             </wadl:param>
           
         </wadl:request>
-        <wadl:response>
-          
-          <wadl:representation
-    href="https://api.launchpad.net/1.0/#archive_permission-page"/>
-        </wadl:response>
+        
       </wadl:method>
-      <wadl:method id="archive-syncSource" name="POST">
+      <wadl:method id="archive-getQueueAdminsForComponent" name="GET">