[Checkins] SVN: zope.app.authentication/trunk/ Now using the new principalregistries.zcml from zope.pluggableauth.

[Souheil CHELFOUH]

Log message for revision 108929:
  Now using the new principalregistries.zcml from zope.pluggableauth.
  

Changed:
  U   zope.app.authentication/trunk/CHANGES.txt
  U   zope.app.authentication/trunk/setup.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml

-=-
Modified: zope.app.authentication/trunk/CHANGES.txt
===================================================================
--- zope.app.authentication/trunk/CHANGES.txt	2010-02-11 18:18:10 UTC (rev 108928)
+++ zope.app.authentication/trunk/CHANGES.txt	2010-02-11 18:20:32 UTC (rev 108929)
@@ -5,7 +5,8 @@
 3.7.1 (unreleased)
 ------------------
 
-* ...
+* Using the new `principalfactories.zcml` file, from zope.pluggableauth,
+  to avoid duplication errors, in the adapters registration.
 
 
 3.7.0 (2010-02-08)

Modified: zope.app.authentication/trunk/setup.py
===================================================================
--- zope.app.authentication/trunk/setup.py	2010-02-11 18:18:10 UTC (rev 108928)
+++ zope.app.authentication/trunk/setup.py	2010-02-11 18:20:32 UTC (rev 108929)
@@ -93,7 +93,7 @@
           'zope.interface',
           'zope.location',
           'zope.password>=3.5.1',
-          'zope.pluggableauth',
+          'zope.pluggableauth>=1.0.1dev',
           'zope.schema',
           'zope.security',
           'zope.traversing',

Modified: zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml	2010-02-11 18:18:10 UTC (rev 108928)
+++ zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml	2010-02-11 18:20:32 UTC (rev 108929)
@@ -1,13 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope" i18n_domain="zope">
 
-  <adapter
-      factory="zope.pluggableauth.factories.FoundPrincipalFactory"
-      />
+  <include package="zope.pluggableauth" file="principalregistries.zcml" />
 
-  <adapter
-      factory="zope.pluggableauth.factories.AuthenticatedPrincipalFactory"
-      />
-
   <class class=".principalfolder.InternalPrincipal">
     <require
         permission="zope.ManageServices"