Merge lp:~bac/launchpad/bug-422128 into lp:launchpad

[Brad Crittenden]

[Brad Crittenden (bac)]

= Summary =

Originally it was noted in bug 422128 that changing the ownership of a product to a
private team failed if that product had any product releases owned by the original
owner of the product. That failure was because a ProductRelease could not be owned
by a private team and the view code was changing the ownership of the ProductRelease too.

Further investigation showed that the view code was changing product releases,
product series, and translation import queue entries that were owned by the old
product owner.

== Proposed fix ==

The first fix was to get the ownership reassignment out of the view and into the
model where it belongs. Being in the view meant that changing a product's owner via
the API wouldn't do the same artifact ownership reassignment.

Once that was done, changing ProductRelease and TranslationImportQueueEntry to allow
the owner and importer, respectively, to be a private team was straightforward.

The webservice tests for registry items was moved to the proper place under lp/registry.

== Pre-implementation notes ==

None.

== Implementation details ==

As above.

== Tests ==

bin/test -t private-team-roles.txt -t xx-project-registry.txt -t doc/product.txt

== Demo and Q/A ==

On launchpad.dev change the owner of firefox and ensure it works.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/interfaces/productrelease.py
  lib/lp/registry/model/productrelease.py
  lib/lp/registry/doc/private-team-roles.txt
  lib/lp/registry/doc/product.txt
  lib/lp/registry/browser/product.py
  lib/lp/translations/model/translationimportqueue.py
  lib/lp/testing/factory.py
  lib/lp/registry/tests/test_doc.py
  lib/lp/registry/stories/webservice/xx-project-registry.txt
  lib/lp/registry/model/product.py
  lib/lp/registry/model/milestone.py
  lib/lp/translations/interfaces/translationimportqueue.py

== Pylint notices ==

lib/lp/registry/interfaces/productrelease.py
    25: [F0401] Unable to import 'lazr.enum' (No module named enum)
    34: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    35: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    36: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)

lib/lp/registry/browser/product.py
    56: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/registry/model/product.py
    29: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/translations/interfaces/translationimportqueue.py
    9: [F0401] Unable to import 'lazr.enum' (No module named enum)
    19: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    20: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    21: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-09-23 14:58:12 +0000
+++ lib/lp/registry/browser/product.py	2009-10-05 11:36:16 +0000
@@ -47,7 +47,6 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.interface import implements, Interface
 from zope.formlib import form
-from zope.security.proxy import removeSecurityProxy
 
 from z3c.ptcompat import ViewPageTemplateFile
 
@@ -65,8 +64,6 @@
 from lp.services.worlddata.interfaces.country import ICountry
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-from lp.translations.interfaces.translationimportqueue import (
-    ITranslationImportQueue)
 from canonical.launchpad.webapp.interfaces import (
     ILaunchBag, NotFoundError, UnsafeFormGetSubmissionError)
 from lp.registry.interfaces.pillar import IPillarNameSet
@@ -1709,8 +1706,6 @@
         old_owner = self.context.owner
         old_driver = self.context.driver
         self.updateContextFromData(data)
-        self._reassignProductDependencies(
-            self.context, old_owner, self.context.owner)
         if self.context.owner != old_owner:
             self.request.response.addNotification(
                 "Successfully changed the maintainer to %s"
@@ -1733,22 +1728,3 @@
     def cancel_url(self):
         """See `LaunchpadFormView`."""
         return canonical_url(self.context)
-
-    def _reassignProductDependencies(self, product, oldOwner, newOwner):
-        """Reassign ownership of objects related to this product.
-
-        Objects related to this product includes: ProductSeries,
-        ProductReleases and TranslationImportQueueEntries that are owned
-        by oldOwner of the product.
-
-        """
-        import_queue = getUtility(ITranslationImportQueue)
-        for entry in import_queue.getAllEntries(target=product):
-            if entry.importer == oldOwner:
-                removeSecurityProxy(entry).importer = newOwner
-        for series in product.serieses:
-            if series.owner == oldOwner:
-                series.owner = newOwner
-        for release in product.releases:
-            if release.owner == oldOwner:
-                release.owner = newOwner

=== modified file 'lib/lp/registry/doc/private-team-roles.txt'
--- lib/lp/registry/doc/private-team-roles.txt	2009-08-11 12:53:54 +0000
+++ lib/lp/registry/doc/private-team-roles.txt	2009-10-05 11:36:16 +0000
@@ -332,17 +332,16 @@
 membership team cannot.
 
     >>> # The registrant must be specified or it will default to the owner.
-    >>> product = factory.makeProduct(registrant=admin_user, owner=public_team)
-    >>> product = factory.makeProduct(registrant=admin_user, owner=priv_team)
-
-    >>> product = factory.makeProduct(registrant=admin_user, owner=pm_team)
+    >>> product = factory.makeProduct(registrant=admin_user)
+    >>> product.owner = public_team
+    >>> product.owner = priv_team
+    >>> product.owner = pm_team
     Traceback (most recent call last):
     ...
     PrivatePersonLinkageError: Cannot link person
     (name=private-membership-team, visibility=PRIVATE_MEMBERSHIP) to
     <Product at...
 
-
 Driver
 ------
 
@@ -419,6 +418,55 @@
     <ProductSeries at...
 
 
+Product Release Roles
+=====================
+
+Owner
+-----
+
+A public team and a private team can be a product series owner but a
+private membership team cannot.
+
+    >>> product = factory.makeProduct(registrant=admin_user,
+    ...                               owner=public_team)
+    >>> product_series = factory.makeProductSeries(product, owner=public_team)
+    >>> product_milestone = factory.makeMilestone(
+    ...     product=product, productseries=product_series)
+    >>> product_release = factory.makeProductRelease(
+    ...     product=product, milestone=product_milestone)
+    >>> product_release.owner = public_team
+    >>> product_release.owner = priv_team
+    >>> product_release.owner = pm_team
+    Traceback (most recent call last):
+    ...
+    PrivatePersonLinkageError: Cannot link person
+    (name=private-membership-team, visibility=PRIVATE_MEMBERSHIP) to
+    <ProductRelease at...
+
+Some artifacts of a product change ownership when the product owner
+changes.  The artifacts are product series, product release, and
+translation import queue entries.
+
+    >>> product = factory.makeProduct(registrant=admin_user)
+    >>> product_series = factory.makeProductSeries(
+    ...     product=product, owner=public_team)
+    >>> product_release = factory.makeProductRelease(product=product)
+    >>> from lp.translations.interfaces.translationimportqueue import (
+    ...     ITranslationImportQueue)
+    >>> import_queue = getUtility(ITranslationImportQueue)
+    >>> entry = import_queue.addOrUpdateEntry(
+    ...     u'po/sr.po', 'foo', True, public_team,
+    ...      productseries=product_series)
+    >>> product.owner = public_team
+    >>> product.owner = priv_team
+    >>> product.owner = pm_team
+    Traceback (most recent call last):
+    ...
+    PrivatePersonLinkageError: Cannot link person
+    (name=private-membership-team, visibility=PRIVATE_MEMBERSHIP) to
+    <Product at...
+
+
 Team Membership
 ===============
 

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2009-07-23 13:44:13 +0000
+++ lib/lp/registry/doc/product.txt	2009-10-05 11:36:16 +0000
@@ -63,7 +63,7 @@
     u'a52dec'
     >>> productset['a52dec'].name
     u'a52dec'
-    
+
     >>> a52dec.setAliases(['a51dec'])
     >>> a52dec.aliases
     [u'a51dec']
@@ -654,3 +654,71 @@
     >>> for series in firefox_view.sorted_active_series_list:
     ...     print series.name
     trunk
+
+= Changing ownership =
+
+If the owner of a project changes, all series and productreleases
+owned by the old owner are transfered to the new owner.
+
+    >>> print firefox.owner.name
+    name12
+
+    >>> for series in firefox.serieses:
+    ...     print series.owner.name, series.name
+    name12 1.0
+    name12 trunk
+
+    >>> for release in firefox.releases:
+    ...     print release.owner.name, release.title
+    name16 Mozilla Firefox 0.9 "One Tree Hill"
+    name16 Mozilla Firefox 0.9.1 "One Tree Hill (v2)"
+    name16 Mozilla Firefox 0.9.2 "One (secure) Tree Hill"
+    name12 Mozilla Firefox 1.0.0 "First Stable Release"
+
+    >>> from lp.translations.interfaces.translationimportqueue import (
+    ...     ITranslationImportQueue)
+    >>> import_queue = getUtility(ITranslationImportQueue)
+    >>> entry = import_queue.addOrUpdateEntry(
+    ...     u'po/sr.po', 'foo', True, firefox.owner,
+    ...      productseries=firefox.serieses[0])
+    >>> foobar = getUtility(IPersonSet).getByEmail("[e-mail]")
+    >>> entry = import_queue.addOrUpdateEntry(
+    ...     u'po/sr.po', 'foo', True, foobar,
+    ...      productseries=firefox.serieses[1])
+    >>> for entry in import_queue.getAllEntries(target=firefox):
+    ...     print entry.importer.name
+    name12
+    name16
+
+The owner of firefox can be changed.
+
+    >>> login("[e-mail]")
+    >>> mark = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> print mark.name
+    mark
+
+    >>> firefox.owner = mark
+
+Now that the owner for firefox has changed the series and product
+releases previously owned by name12 are now owned by mark.  Those not
+owned by name12 are unchanged.
+
+    >>> print firefox.owner.name
+    mark
+
+    >>> for series in firefox.serieses:
+    ...     print series.owner.name, series.name
+    mark 1.0
+    mark trunk
+
+    >>> for release in firefox.releases:
+    ...     print release.owner.name, release.title
+    name16 Mozilla Firefox 0.9 "One Tree Hill"
+    name16 Mozilla Firefox 0.9.1 "One Tree Hill (v2)"
+    name16 Mozilla Firefox 0.9.2 "One (secure) Tree Hill"
+    mark   Mozilla Firefox 1.0.0 "First Stable Release"
+
+    >>> for entry in import_queue.getAllEntries(target=firefox):
+    ...     print entry.importer.name
+    mark
+    name16

=== modified file 'lib/lp/registry/interfaces/productrelease.py'
--- lib/lp/registry/interfaces/productrelease.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/interfaces/productrelease.py	2009-10-05 11:36:16 +0000
@@ -27,8 +27,8 @@
 from canonical.config import config
 from canonical.launchpad import _
 from canonical.launchpad.validators.version import sane_version
-from canonical.launchpad.fields import ContentNameField
-from lp.registry.interfaces.person import IPerson
+from canonical.launchpad.fields import (
+    ContentNameField, ParticipatingPersonChoice)
 from canonical.launchpad.validators import LaunchpadValidationError
 
 from lazr.restful.fields import CollectionField, Reference, ReferenceChoice
@@ -270,9 +270,13 @@
         )
 
     owner = exported(
-            Reference(title=u"The owner of this release.",
-                      schema=IPerson, required=True)
+        ParticipatingPersonChoice(
+            title=u"The owner of this release.",
+            required=True,
+            vocabulary='ValidOwner',
+            description=_("The person or team who owns  his product release.")
             )
+        )
 
     productseries = Choice(
         title=_('Release series'), readonly=True,

=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py	2009-08-24 04:03:27 +0000
+++ lib/lp/registry/model/milestone.py	2009-10-05 11:36:16 +0000
@@ -176,7 +176,7 @@
         """See `IMilestone`."""
         if self.product_release is not None:
             raise AssertionError(
-                'A milestone can only have one Productrelease.')
+                'A milestone can only have one ProductRelease.')
         return ProductRelease(
             owner=owner,
             changelog=changelog,
@@ -301,4 +301,3 @@
     def official_bug_tags(self):
         """See `IHasBugs`."""
         return self.target.official_bug_tags
-

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2009-09-16 20:08:36 +0000
+++ lib/lp/registry/model/product.py	2009-10-05 11:36:16 +0000
@@ -23,6 +23,7 @@
 from storm.locals import And, Desc, Join, SQL, Store, Unicode
 from zope.interface import implements
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.cachedproperty import cachedproperty
 from lazr.delegates import delegates
@@ -69,7 +70,7 @@
     HasSpecificationsMixin, Specification)
 from lp.blueprints.model.sprint import HasSprintsMixin
 from lp.translations.model.translationimportqueue import (
-    HasTranslationImportsMixin)
+    HasTranslationImportsMixin, ITranslationImportQueue)
 from canonical.launchpad.database.structuralsubscription import (
     StructuralSubscriptionTargetMixin)
 from canonical.launchpad.helpers import shortlist
@@ -177,7 +178,7 @@
 
     project = ForeignKey(
         foreignKey="Project", dbName="project", notNull=False, default=None)
-    owner = ForeignKey(
+    _owner = ForeignKey(
         dbName="owner", foreignKey="Person",
         storm_validator=validate_person_not_private_membership,
         notNull=True)
@@ -490,6 +491,32 @@
 
     licenses = property(_getLicenses, _setLicenses)
 
+    def _getOwner(self):
+        """Get the owner."""
+        return self._owner
+
+    def _setOwner(self, new_owner):
+        """Set the owner.
+
+        Change the owner and change the ownership of related artifacts.
+        """
+        old_owner = self._owner
+        self._owner = new_owner
+        if old_owner is not None:
+            import_queue = getUtility(ITranslationImportQueue)
+            for entry in import_queue.getAllEntries(target=self):
+                if entry.importer == old_owner:
+                    removeSecurityProxy(entry).importer = new_owner
+            for series in self.serieses:
+                if series.owner == old_owner:
+                    series.owner = new_owner
+            for release in self.releases:
+                if release.owner == old_owner:
+                    release.owner = new_owner
+            Store.of(self).flush()
+
+    owner = property(_getOwner, _setOwner)
+
     def _getBugTaskContextWhereClause(self):
         """See BugTargetBase."""
         return "BugTask.product = %d" % self.id
@@ -1006,7 +1033,7 @@
         results = Product.selectBy(
             active=True, orderBy="-Product.datecreated")
         # The main product listings include owner, so we prejoin it.
-        return results.prejoin(["owner"])
+        return results.prejoin(["_owner"])
 
     def get(self, productid):
         """See `IProductSet`."""
@@ -1247,7 +1274,7 @@
             queries.append('Product.active IS TRUE')
         query = " AND ".join(queries)
         return Product.select(query, distinct=True,
-                              prejoins=["owner"],
+                              prejoins=["_owner"],
                               clauseTables=clauseTables)
 
     def getTranslatables(self):
@@ -1258,7 +1285,7 @@
             Product.id == ProductSeries.productID,
             POTemplate.productseriesID == ProductSeries.id,
             Product.official_rosetta == True,
-            Person.id == Product.ownerID
+            Person.id == Product._ownerID
             ).config(distinct=True).order_by(Product.title)
 
         # We only want Product - the other tables are just to populate

=== modified file 'lib/lp/registry/model/productrelease.py'
--- lib/lp/registry/model/productrelease.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/model/productrelease.py	2009-10-05 11:36:16 +0000
@@ -22,9 +22,11 @@
 
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.registry.interfaces.productrelease import (
-    IProductRelease, IProductReleaseFile, IProductReleaseSet, UpstreamFileType)
+    IProductRelease, IProductReleaseFile, IProductReleaseSet,
+    UpstreamFileType)
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-from lp.registry.interfaces.person import validate_public_person
+from lp.registry.interfaces.person import (
+    validate_person_not_private_membership, validate_public_person)
 from canonical.launchpad.webapp.interfaces import (
     DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE)
 
@@ -45,7 +47,8 @@
         dbName='datecreated', notNull=True, default=UTC_NOW)
     owner = ForeignKey(
         dbName="owner", foreignKey="Person",
-        storm_validator=validate_public_person, notNull=True)
+        storm_validator=validate_person_not_private_membership,
+        notNull=True)
     milestone = ForeignKey(dbName='milestone', foreignKey='Milestone')
 
     files = SQLMultipleJoin(

=== renamed file 'lib/canonical/launchpad/pagetests/webservice/xx-people.txt' => 'lib/lp/registry/stories/webservice/xx-people.txt'
=== renamed file 'lib/canonical/launchpad/pagetests/webservice/xx-personlocation.txt' => 'lib/lp/registry/stories/webservice/xx-personlocation.txt'
=== renamed file 'lib/canonical/launchpad/pagetests/webservice/xx-private-membership.txt' => 'lib/lp/registry/stories/webservice/xx-private-membership.txt'
=== renamed file 'lib/canonical/launchpad/pagetests/webservice/xx-project-registry.txt' => 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-project-registry.txt	2009-08-21 19:49:18 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt	2009-10-05 11:36:16 +0000
@@ -338,6 +338,47 @@
     >>> webservice.get(firefox['bug_tracker_link']).jsonBody()['self_link']
     u'http://.../bugs/bugtrackers/mozilla.org'
 
+When the owner_link is changed the ownership of some attributes is
+changed as well.
+
+    >>> # Create a product with a series and release.
+    >>> login('[e-mail]')
+    >>> test_project_owner = factory.makePerson(name='test-project-owner')
+    >>> test_project = factory.makeProduct(name='test-project', owner=test_project_owner)
+    >>> test_series = factory.makeProductSeries(
+    ...     product=test_project, name='test-series', owner=test_project_owner)
+    >>> test_milestone = factory.makeMilestone(
+    ...     product=test_project, name='test-milestone', productseries=test_series)
+    >>> test_project_release = factory.makeProductRelease(
+    ...     product=test_project, milestone=test_milestone)
+    >>> logout()
+
+    >>> test_project = webservice.get('/test-project').jsonBody()
+    >>> test_project['owner_link']
+    u'http://.../~test-project-owner'
+
+    >>> patch = {
+    ...     u'owner_link': webservice.getAbsoluteUrl('/~mark'),
+    ...     }
+    >>> print webservice.patch(
+    ...     '/test-project', 'application/json', dumps(patch))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> test_project = webservice.get('/test-project').jsonBody()
+    >>> test_project['owner_link']
+    u'http://.../~mark'
+
+    >>> test_series = webservice.get('/test-project/test-series').jsonBody()
+    >>> test_series['owner_link']
+    u'http://.../~mark'
+
+    >>> release_path = '/test-project/test-series/test-milestone'
+    >>> test_project_release = webservice.get(release_path).jsonBody()
+    >>> test_project_release['owner_link']
+    u'http://.../~mark'
+
+
 Read-only attributes, like registrant, cannot be modified via the
 webservice.patch() method.
 
@@ -424,24 +465,37 @@
     >>> project_collection['resource_type_link']
     u'http://.../#projects'
 
+The entire collection has 25 entries.
+
     >>> project_collection['total_size']
-    24
+    25
+
+But the batch has only 5.  (The batch size is 5 for testing but larger
+in production.)
+
+    >>> project_entries = project_collection['entries']
+    >>> len(project_entries)
+    5
+
+The batch size can be changed through the ws.size argument.
+
+    >>> project_collection = webservice.get("/projects?ws.size=75").jsonBody()
 
     >>> project_entries = sorted(
     ...     project_collection['entries'], key=itemgetter('display_name'))
     >>> len(project_entries)
-    5
+    25
 
     >>> project_entries[0]['self_link']
-    u'http://.../gnome-terminal'
+    u'http://.../aptoncd'
 
-    >>> for project in project_entries:
-    ...   print project['display_name']
-    GNOME Terminal
-    Mozilla Firefox
-    Redfish
-    The Landscape Project
-    Tomcat
+    >>> for project in project_entries[:5]:
+    ...   print "%s (%s)" % (project['display_name'], project['name'])
+    APTonCD (aptoncd)
+    Arch mirrors (arch-mirrors)
+    Bazaar (bazaar)
+    Bazaar (bzr)
+    Derby (derby)
 
 It's possible to search the list and get a subset of the project groups.
 
@@ -480,7 +534,7 @@
     Launchpad Translations
     Mega Money Maker
     Obsolete Junk
-    Redfish
+    Test-project
 
 There is a method for doing a query about attributes related to project
 licensing.  We can find all projects with unreviewed licenses.
@@ -726,10 +780,13 @@
 virtual host.
 
     >>> login('[e-mail]')
-    >>> babadoo = factory.makeProduct(name='babadoo')
-    >>> foobadoo = factory.makeProductSeries(product=babadoo, name='foobadoo')
+    >>> babadoo_owner = factory.makePerson(name='babadoo-owner')
+    >>> babadoo = factory.makeProduct(name='babadoo', owner=babadoo_owner)
+    >>> foobadoo = factory.makeProductSeries(
+    ...     product=babadoo, name='foobadoo', owner=babadoo_owner)
     >>> foobadoo.summary = u'Foobadoo support for Babadoo'
-    >>> fooey = factory.makeAnyBranch(product=babadoo, name='fooey')
+    >>> fooey = factory.makeAnyBranch(
+    ...     product=babadoo, name='fooey', owner=babadoo_owner)
     >>> foobadoo.branch = fooey
     >>> logout()
 
@@ -737,7 +794,7 @@
     >>> pprint_entry(babadoo_foobadoo)
     active_milestones_collection_link: u'http://.../babadoo/foobadoo/active_milestones'
     all_milestones_collection_link: u'http://.../babadoo/foobadoo/all_milestones'
-    branch_link: u'http://api.launchpad.dev/beta/~person-name12/babadoo/fooey'
+    branch_link: u'http://.../~babadoo-owner/babadoo/fooey'
     bug_reporting_guidelines: None
     date_created: u'...'
     display_name: u'foobadoo'
@@ -745,7 +802,7 @@
     drivers_collection_link: u'http://.../babadoo/foobadoo/drivers'
     name: u'foobadoo'
     official_bug_tags: []
-    owner_link: u'http://.../~person-name8'
+    owner_link: u'http://.../~babadoo-owner'
     project_link: u'http://.../babadoo'
     releases_collection_link: u'http://.../babadoo/foobadoo/releases'
     resource_type_link: u'...'
@@ -885,7 +942,7 @@
     >>> print response
     HTTP/1.1 500 Internal Server Error
     ...
-    AssertionError: A milestone can only have one Productrelease.
+    AssertionError: A milestone can only have one ProductRelease.
 
 
 Project release entries

=== modified file 'lib/lp/registry/tests/test_doc.py'
--- lib/lp/registry/tests/test_doc.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/tests/test_doc.py	2009-10-05 11:36:16 +0000
@@ -133,6 +133,18 @@
         tearDown=tearDown,
         layer=LaunchpadFunctionalLayer,
         ),
+    'product.txt': LayeredDocFileSuite(
+        '../doc/product.txt',
+        setUp=setUp,
+        tearDown=tearDown,
+        layer=LaunchpadFunctionalLayer,
+        ),
+    'private-team-roles.txt': LayeredDocFileSuite(
+        '../doc/private-team-roles.txt',
+        setUp=setUp,
+        tearDown=tearDown,
+        layer=LaunchpadFunctionalLayer,
+        ),
     'productrelease.txt': LayeredDocFileSuite(
         '../doc/productrelease.txt',
         setUp=setUp,

=== modified file 'lib/lp/services/database/precache.py'
--- lib/lp/services/database/precache.py	2009-08-05 18:52:52 +0000
+++ lib/lp/services/database/precache.py	2009-10-05 11:36:16 +0000
@@ -27,7 +27,7 @@
 
     >>> results = store.find(Product).precache(
     ...     (Person, EmailAddress),
-    ...     Product.ownerID == Person.id,
+    ...     Product._ownerID == Person.id,
     ...     EmailAddress.personID == Person.id)
     """
     delegates(IResultSet, context='result_set')

=== modified file 'lib/lp/services/database/tests/test_precache.py'
--- lib/lp/services/database/tests/test_precache.py	2009-07-17 02:25:09 +0000
+++ lib/lp/services/database/tests/test_precache.py	2009-10-05 11:36:16 +0000
@@ -33,7 +33,7 @@
         # to hide this from callsites.
         self.unwrapped_result = self.store.find(
             (Product, Person),
-            Product.ownerID == Person.id).order_by(Product.name)
+            Product._ownerID == Person.id).order_by(Product.name)
         self.precache_result = precache(self.unwrapped_result)
 
     def verify(self, precached, normal):
@@ -87,7 +87,7 @@
         standard_result = self.store.find(Product, Product.name == 'firefox')
         precache_result = precache(self.store.find(
             (Product, Person),
-            Person.id == Product.ownerID,
+            Person.id == Product._ownerID,
             Product.name == 'firefox'))
         self.assertEqual(standard_result.one(), precache_result.one())
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2009-09-19 04:06:14 +0000
+++ lib/lp/testing/factory.py	2009-10-05 11:36:16 +0000
@@ -76,7 +76,6 @@
     CodeImportResultStatus, CodeReviewNotificationLevel,
     RevisionControlSystems)
 from lp.code.interfaces.branch import UnknownBranchTypeError
-from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.branchmergequeue import IBranchMergeQueueSet
 from lp.code.interfaces.branchnamespace import get_branch_namespace
 from lp.code.interfaces.codeimport import ICodeImportSet
@@ -509,9 +508,9 @@
                          productseries=productseries,
                          name=name)
 
-    def makeProductRelease(self, milestone=None):
+    def makeProductRelease(self, milestone=None, product=None):
         if milestone is None:
-            milestone = self.makeMilestone()
+            milestone = self.makeMilestone(product=product)
         return milestone.createProductRelease(
             milestone.product.owner, datetime.now(pytz.UTC))
 

=== modified file 'lib/lp/translations/interfaces/translationimportqueue.py'
--- lib/lp/translations/interfaces/translationimportqueue.py	2009-09-18 07:39:51 +0000
+++ lib/lp/translations/interfaces/translationimportqueue.py	2009-10-05 11:36:16 +0000
@@ -9,15 +9,15 @@
 from lazr.enum import DBEnumeratedType, DBItem, EnumeratedType, Item
 
 from canonical.launchpad import _
+from canonical.launchpad.fields import ParticipatingPersonChoice
 from lp.registry.interfaces.sourcepackage import ISourcePackage
 from lp.translations.interfaces.translationfileformat import (
     TranslationFileFormat)
 from lp.registry.interfaces.distroseries import IDistroSeries
-from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.productseries import IProductSeries
 
 from lazr.restful.interface import copy_field
-from lazr.restful.fields import Reference, ReferenceChoice
+from lazr.restful.fields import Reference
 from lazr.restful.declarations import (
     collection_default_content, exported, export_as_webservice_collection,
     export_as_webservice_entry, export_read_operation, operation_parameters,
@@ -152,9 +152,8 @@
             required=True))
 
     importer = exported(
-        ReferenceChoice(
+        ParticipatingPersonChoice(
             title=_("Uploader"),
-            schema=IPerson,
             required=True,
             readonly=True,
             description=_(

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2009-09-28 09:46:27 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2009-10-05 11:36:16 +0000
@@ -38,7 +38,8 @@
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distroseries import (
     IDistroSeries, DistroSeriesStatus)
-from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.person import (
+    IPerson, validate_person_not_private_membership)
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.sourcepackage import ISourcePackage
@@ -61,7 +62,6 @@
 from lp.translations.utilities.gettext_po_importer import (
     GettextPOImporter)
 from canonical.librarian.interfaces import ILibrarianClient
-from lp.registry.interfaces.person import validate_public_person
 
 
 # Period to wait before entries with terminal statuses are removed from
@@ -120,7 +120,8 @@
         notNull=False)
     importer = ForeignKey(
         dbName='importer', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
+        storm_validator=validate_person_not_private_membership,
+        notNull=True)
     dateimported = UtcDateTimeCol(dbName='dateimported', notNull=True,
         default=DEFAULT)
     sourcepackagename_id = Int(name='sourcepackagename', allow_none=True)