Mailing List Archive

Log message for revision 40169:
Add marker interfaces to plugins, to facilitate export / import adaptation.


Changed:
U PluggableAuthService/trunk/plugins/ChallengeProtocolChooser.py
U PluggableAuthService/trunk/plugins/CookieAuthHelper.py
U PluggableAuthService/trunk/plugins/DelegatingMultiPlugin.py
U PluggableAuthService/trunk/plugins/DomainAuthHelper.py
U PluggableAuthService/trunk/plugins/DynamicGroupsPlugin.py
U PluggableAuthService/trunk/plugins/HTTPBasicAuthHelper.py
U PluggableAuthService/trunk/plugins/InlineAuthHelper.py
U PluggableAuthService/trunk/plugins/LocalRolePlugin.py
U PluggableAuthService/trunk/plugins/RecursiveGroupsPlugin.py
U PluggableAuthService/trunk/plugins/RequestTypeSniffer.py
U PluggableAuthService/trunk/plugins/ScriptablePlugin.py
U PluggableAuthService/trunk/plugins/SearchPrincipalsPlugin.py
U PluggableAuthService/trunk/plugins/SessionAuthHelper.py
U PluggableAuthService/trunk/plugins/ZODBGroupManager.py
U PluggableAuthService/trunk/plugins/ZODBRoleManager.py
U PluggableAuthService/trunk/plugins/ZODBUserManager.py
U PluggableAuthService/trunk/plugins/exportimport.py

-=-
Modified: PluggableAuthService/trunk/plugins/ChallengeProtocolChooser.py
===================================================================
--- PluggableAuthService/trunk/plugins/ChallengeProtocolChooser.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/ChallengeProtocolChooser.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -24,18 +24,29 @@

from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins \
import IRequestTypeSniffer
from Products.PluggableAuthService.interfaces.plugins \
import IChallengeProtocolChooser
from Products.PluggableAuthService.interfaces.plugins \
import IChallengePlugin
-
from Products.PluggableAuthService.interfaces.request \
- import IBrowserRequest, IWebDAVRequest, IFTPRequest, IXMLRPCRequest
+ import IBrowserRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IWebDAVRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IFTPRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IXMLRPCRequest

+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface
+
+class IChallengeProtocolChooserPlugin(Interface):
+ """ Marker interface.
+ """
+
_request_types = ()
_request_type_bmap = {}

@@ -179,7 +190,9 @@
% self.absolute_url())

classImplements(ChallengeProtocolChooser,
- IChallengeProtocolChooser)
+ IChallengeProtocolChooserPlugin,
+ IChallengeProtocolChooser,
+ )

InitializeClass(ChallengeProtocolChooser)


Modified: PluggableAuthService/trunk/plugins/CookieAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/CookieAuthHelper.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/CookieAuthHelper.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -27,13 +27,23 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate

+from Products.PluggableAuthService.interfaces.plugins import \
+ ILoginPasswordHostExtractionPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IChallengePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsUpdatePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsResetPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
- ILoginPasswordHostExtractionPlugin, IChallengePlugin, \
- ICredentialsUpdatePlugin, ICredentialsResetPlugin
+from Products.PluggableAuthService.utils import Interface


+class ICookieAuthHelper(Interface):
+ """ Marker interface.
+ """
+
manage_addCookieAuthHelperForm = PageTemplateFile(
'www/caAdd', globals(), __name__='manage_addCookieAuthHelperForm')

@@ -238,6 +248,7 @@
return response.redirect(came_from)

classImplements( CookieAuthHelper
+ , ICookieAuthHelper
, ILoginPasswordHostExtractionPlugin
, IChallengePlugin
, ICredentialsUpdatePlugin

Modified: PluggableAuthService/trunk/plugins/DelegatingMultiPlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/DelegatingMultiPlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/DelegatingMultiPlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -31,12 +31,26 @@
from AccessControl.SpecialUsers import emergency_user
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

+from Products.PluggableAuthService.interfaces.plugins import \
+ IAuthenticationPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IUserEnumerationPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IRolesPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsUpdatePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsResetPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IPropertiesPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
- IAuthenticationPlugin, IUserEnumerationPlugin, IRolesPlugin, \
- ICredentialsUpdatePlugin, ICredentialsResetPlugin, IPropertiesPlugin
+from Products.PluggableAuthService.utils import Interface

+class IDelegatingMultiPlugin(Interface):
+ """ Marker interface.
+ """
+
manage_addDelegatingMultiPluginForm = PageTemplateFile(
'www/dmpAdd', globals(), __name__='manage_addDelegatingMultiPluginForm' )

@@ -235,6 +249,7 @@
return tuple(result)

classImplements( DelegatingMultiPlugin
+ , IDelegatingMultiPlugin
, IAuthenticationPlugin
, IUserEnumerationPlugin
, IRolesPlugin

Modified: PluggableAuthService/trunk/plugins/DomainAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/DomainAuthHelper.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/DomainAuthHelper.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -29,11 +29,18 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

# PluggableAuthService imports
+from Products.PluggableAuthService.interfaces.plugins import \
+ IAuthenticationPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IRolesPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
- IAuthenticationPlugin, IRolesPlugin
+from Products.PluggableAuthService.utils import Interface

+class IDomainAuthHelper(Interface):
+ """ Marker interface.
+ """
+
_MATCH_EQUALS = 'equals'
_MATCH_ENDSWITH = 'endswith'
_MATCH_REGEX = 'regex'
@@ -292,6 +299,7 @@
return self.manage_genericmap(manage_tabs_message=msg)

classImplements( DomainAuthHelper
+ , IDomainAuthHelper
, IAuthenticationPlugin
, IRolesPlugin
)

Modified: PluggableAuthService/trunk/plugins/DynamicGroupsPlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/DynamicGroupsPlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/DynamicGroupsPlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -32,15 +32,17 @@

from Products.PluggableAuthService.interfaces.plugins \
import IGroupsPlugin
-
from Products.PluggableAuthService.interfaces.plugins \
import IGroupEnumerationPlugin
-
from Products.PluggableAuthService.permissions import ManageGroups
-
from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import createViewName
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

-from Products.PluggableAuthService.utils import createViewName, classImplements
+class IDynamicGroupsPlugin(Interface):
+ """ Marker interface.
+ """


manage_addDynamicGroupsPluginForm = PageTemplateFile(
@@ -509,6 +511,7 @@
)

classImplements( DynamicGroupsPlugin
+ , IDynamicGroupsPlugin
, IGroupsPlugin
, IGroupEnumerationPlugin
)

Modified: PluggableAuthService/trunk/plugins/HTTPBasicAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/HTTPBasicAuthHelper.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/HTTPBasicAuthHelper.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -21,19 +21,25 @@

from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import default__class_init__ as InitializeClass
+
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-
-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins import \
- ILoginPasswordHostExtractionPlugin, \
- IChallengePlugin, \
+ ILoginPasswordHostExtractionPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IChallengePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
ICredentialsResetPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import Interface
+from Products.PluggableAuthService.utils import classImplements


manage_addHTTPBasicAuthHelperForm = PageTemplateFile(
'www/hbAdd', globals(), __name__='manage_addHTTPBasicAuthHelperForm' )

+class IHTTPBasicAuthHelper(Interface):
+ """ Marker interface.
+ """

def addHTTPBasicAuthHelper( dispatcher, id, title=None, REQUEST=None ):

@@ -114,6 +120,7 @@
response.unauthorized()

classImplements( HTTPBasicAuthHelper
+ , IHTTPBasicAuthHelper
, ILoginPasswordHostExtractionPlugin
, IChallengePlugin
, ICredentialsResetPlugin

Modified: PluggableAuthService/trunk/plugins/InlineAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/InlineAuthHelper.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/InlineAuthHelper.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -26,13 +26,23 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.ZopePageTemplate import manage_addPageTemplate

+from Products.PluggableAuthService.interfaces.plugins import \
+ ILoginPasswordHostExtractionPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IChallengePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsUpdatePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsResetPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
- ILoginPasswordHostExtractionPlugin, IChallengePlugin, \
- ICredentialsUpdatePlugin, ICredentialsResetPlugin
+from Products.PluggableAuthService.utils import Interface

+class IInlineAuthHelper(Interface):
+ """ Marker interface.
+ """

+
manage_addInlineAuthHelperForm = PageTemplateFile(
'www/iaAdd', globals(), __name__='manage_addInlineAuthHelperForm')

@@ -116,6 +126,7 @@
pass

classImplements( InlineAuthHelper
+ , IInlineAuthHelper
, ILoginPasswordHostExtractionPlugin
, IChallengePlugin
)

Modified: PluggableAuthService/trunk/plugins/LocalRolePlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/LocalRolePlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/LocalRolePlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -22,11 +22,14 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin
-
from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-
from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class ILocalRolePlugin(Interface):
+ """ Marker interface.
+ """
+
manage_addLocalRolePluginForm = PageTemplateFile(
'www/lrpAdd', globals(), __name__='manage_addLocalRolePluginForm' )

@@ -69,6 +72,9 @@
return None
return local_roles.get( principal.getId() )

-classImplements( LocalRolePlugin, IRolesPlugin )
+classImplements( LocalRolePlugin
+ , ILocalRolePlugin
+ , IRolesPlugin
+ )

InitializeClass( LocalRolePlugin )

Modified: PluggableAuthService/trunk/plugins/RecursiveGroupsPlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/RecursiveGroupsPlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/RecursiveGroupsPlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -22,14 +22,19 @@
from BTrees.OOBTree import OOBTree
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.PropertiedUser import PropertiedUser
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins \
import IGroupsPlugin

+from Products.PluggableAuthService.PropertiedUser import PropertiedUser
from Products.PluggableAuthService.permissions import ManageGroups
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class IRecursiveGroupsPlugin(Interface):
+ """ Marker interface.
+ """
+
manage_addRecursiveGroupsPluginForm = PageTemplateFile(
'www/rgpAdd', globals(), __name__='manage_addRecursiveGroupsPluginForm' )

@@ -96,6 +101,9 @@

return tuple( seen )

-classImplements( RecursiveGroupsPlugin, IGroupsPlugin )
+classImplements( RecursiveGroupsPlugin
+ , IRecursiveGroupsPlugin
+ , IGroupsPlugin
+ )

InitializeClass(RecursiveGroupsPlugin)

Modified: PluggableAuthService/trunk/plugins/RequestTypeSniffer.py
===================================================================
--- PluggableAuthService/trunk/plugins/RequestTypeSniffer.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/RequestTypeSniffer.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -25,14 +25,24 @@

from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins \
import IRequestTypeSniffer
-
from Products.PluggableAuthService.interfaces.request \
- import IBrowserRequest, IWebDAVRequest, IFTPRequest, IXMLRPCRequest
+ import IBrowserRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IWebDAVRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IFTPRequest
+from Products.PluggableAuthService.interfaces.request \
+ import IXMLRPCRequest
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class IRequestTypeSnifferPlugin(Interface):
+ """ Marker interface.
+ """
+
_sniffers = ()

def registerSniffer(iface, func):
@@ -82,7 +92,9 @@
return found

classImplements(RequestTypeSniffer,
- IRequestTypeSniffer)
+ IRequestTypeSnifferPlugin,
+ IRequestTypeSniffer,
+ )

InitializeClass(RequestTypeSniffer)


Modified: PluggableAuthService/trunk/plugins/ScriptablePlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/ScriptablePlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/ScriptablePlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -23,10 +23,18 @@
from AccessControl.Permissions import manage_users as ManageUsers
from App.class_init import default__class_init__ as InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import \
- directlyProvides, classImplements, providedBy, implementedBy

+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import directlyProvides
+from Products.PluggableAuthService.utils import providedBy
+from Products.PluggableAuthService.utils import implementedBy
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface
+
+class IScriptablePlugin(Interface):
+ """ Marker interface.
+ """
+
import Products

manage_addScriptablePluginForm = PageTemplateFile(
@@ -142,10 +150,13 @@
try:
from Products.Five.bridge import fromZ2Interface
except ImportError:
- ScriptablePlugin.__implements__ = (
- Folder.__implements__ + BasePlugin.__implements__)
+ ScriptablePlugin.__implements__ = ( (IScriptablePlugin,)
+ + Folder.__implements__
+ + BasePlugin.__implements__
+ )
else:
classImplements( ScriptablePlugin
+ , IScriptablePlugin
, *(implementedBy(Folder) + implementedBy(BasePlugin))
)


Modified: PluggableAuthService/trunk/plugins/SearchPrincipalsPlugin.py
===================================================================
--- PluggableAuthService/trunk/plugins/SearchPrincipalsPlugin.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/SearchPrincipalsPlugin.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -29,11 +29,18 @@
from AccessControl.SpecialUsers import emergency_user
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

+from Products.PluggableAuthService.interfaces.plugins import \
+ IUserEnumerationPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ IGroupEnumerationPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
- IUserEnumerationPlugin, IGroupEnumerationPlugin
+from Products.PluggableAuthService.utils import Interface

+class ISearchPrincipalsPlugin(Interface):
+ """ Marker interface.
+ """
+
addSearchPrincipalsPluginForm = PageTemplateFile(
'www/sppAdd', globals(), __name__='addSearchPrincipalsPluginForm' )

@@ -127,6 +134,7 @@
, **kw )

classImplements( SearchPrincipalsPlugin
+ , ISearchPrincipalsPlugin
, IUserEnumerationPlugin
, IGroupEnumerationPlugin
)

Modified: PluggableAuthService/trunk/plugins/SessionAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/SessionAuthHelper.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/SessionAuthHelper.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -21,14 +21,21 @@
from App.class_init import default__class_init__ as InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins import \
- ILoginPasswordHostExtractionPlugin, \
- ICredentialsUpdatePlugin, \
+ ILoginPasswordHostExtractionPlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsUpdatePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
ICredentialsResetPlugin
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class ISessionAuthHelper(Interface):
+ """ Marker interface.
+ """

+
manage_addSessionAuthHelperForm = PageTemplateFile(
'www/saAdd', globals(), __name__='manage_addSessionAuthHelperForm')

@@ -101,6 +108,7 @@
request.SESSION.set('__ac_password', '')

classImplements( SessionAuthHelper
+ , ISessionAuthHelper
, ILoginPasswordHostExtractionPlugin
, ICredentialsUpdatePlugin
, ICredentialsResetPlugin

Modified: PluggableAuthService/trunk/plugins/ZODBGroupManager.py
===================================================================
--- PluggableAuthService/trunk/plugins/ZODBGroupManager.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/ZODBGroupManager.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -22,15 +22,20 @@
from BTrees.OOBTree import OOBTree
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.interfaces.plugins \
import IGroupEnumerationPlugin
from Products.PluggableAuthService.interfaces.plugins \
import IGroupsPlugin

from Products.PluggableAuthService.permissions import ManageGroups
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class IZODBGroupManager(Interface):
+ """ Marker interface.
+ """
+
manage_addZODBGroupManagerForm = PageTemplateFile(
'www/zgAdd', globals(), __name__='manage_addZODBGroupManagerForm' )

@@ -443,6 +448,7 @@
)

classImplements( ZODBGroupManager
+ , IZODBGroupManager
, IGroupEnumerationPlugin
, IGroupsPlugin
)

Modified: PluggableAuthService/trunk/plugins/ZODBRoleManager.py
===================================================================
--- PluggableAuthService/trunk/plugins/ZODBRoleManager.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/ZODBRoleManager.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -23,7 +23,6 @@

from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.utils import classImplements
from Products.PluggableAuthService.interfaces.plugins \
import IRolesPlugin
from Products.PluggableAuthService.interfaces.plugins \
@@ -32,9 +31,14 @@
import IRoleAssignerPlugin

from Products.PluggableAuthService.permissions import ManageUsers
-
from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import Interface

+class IZODBRoleManager(Interface):
+ """ Marker interface.
+ """
+
manage_addZODBRoleManagerForm = PageTemplateFile(
'www/zrAdd', globals(), __name__='manage_addZODBRoleManagerForm' )

@@ -443,6 +447,7 @@
)

classImplements( ZODBRoleManager
+ , IZODBRoleManager
, IRolesPlugin
, IRoleEnumerationPlugin
, IRoleAssignerPlugin

Modified: PluggableAuthService/trunk/plugins/ZODBUserManager.py
===================================================================
--- PluggableAuthService/trunk/plugins/ZODBUserManager.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/ZODBUserManager.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -26,8 +26,6 @@
from OFS.Cache import Cacheable
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import createViewName, classImplements
from Products.PluggableAuthService.interfaces.plugins \
import IAuthenticationPlugin
from Products.PluggableAuthService.interfaces.plugins \
@@ -37,8 +35,16 @@

from Products.PluggableAuthService.permissions import ManageUsers
from Products.PluggableAuthService.permissions import SetOwnPassword
+from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
+from Products.PluggableAuthService.utils import classImplements
+from Products.PluggableAuthService.utils import createViewName
+from Products.PluggableAuthService.utils import Interface

+class IZODBUserManager(Interface):
+ """ Marker interface.
+ """

+
manage_addZODBUserManagerForm = PageTemplateFile(
'www/zuAdd', globals(), __name__='manage_addZODBUserManagerForm' )

@@ -470,6 +476,7 @@
)

classImplements( ZODBUserManager
+ , IZODBUserManager
, IAuthenticationPlugin
, IUserEnumerationPlugin
, IUserAdderPlugin

Modified: PluggableAuthService/trunk/plugins/exportimport.py
===================================================================
--- PluggableAuthService/trunk/plugins/exportimport.py 2005-11-16 20:00:11 UTC (rev 40168)
+++ PluggableAuthService/trunk/plugins/exportimport.py 2005-11-16 20:09:11 UTC (rev 40169)
@@ -18,16 +18,16 @@

o Add export / import adapters for all stock plugin types:

- - [X] ZODBUserManager (ZODBUserManagerExportImport)
+ - [X] ChallengeProtocolChooser (TitleOnlyExportImport)

- - [X] ZODBGroupsManager (ZODBGroupManagerExportImport)
-
- - [X] ZODBRolesManager (ZODBRoleManagerExportImport)
-
- [X] CookieAuthHelper (CookieAuthHelperExportImport)

+ - [X] DelegatingMultiPlugin (DelegatePathExportImport)
+
- [X] DomainAuthHelper (DomainAuthHelperExportImport)

+ - [X] DynamicGroupsPlugin (DynamicGroupsPluginExportImport)
+
- [X] HTTPBasicAuthHelper (TitleOnlyExportImport)

- [X] InlineAuthHelper (TitleOnlyExportImport)
@@ -36,21 +36,20 @@

- [X] RecursiveGroupsPlugin (TitleOnlyExportImport)

- - [X] ChallengeProtocolChooser (TitleOnlyExportImport)
-
- [X] RequestTypeSniffer (TitleOnlyExportImport)

- - [X] SessionAuthHelper (TitleOnlyExportImport)
-
- [?] ScriptablePlugin (stock GenericSetup folderish support?)

- - [X] DelegatingMultiPlugin (DelegatePathExportImport)
-
- [X] SearchPrincipalsPlugin (DelegatePathExportImport)

- - [X] DynamicGroupsPlugin (use folderish support, w/ handler for
- DynamicGroupDefinition? or use a single XML file?)
+ - [X] SessionAuthHelper (TitleOnlyExportImport)

+ - [X] ZODBGroupsManager (ZODBGroupManagerExportImport)
+
+ - [X] ZODBRolesManager (ZODBRoleManagerExportImport)
+
+ - [X] ZODBUserManager (ZODBUserManagerExportImport)
+
o Review BasePlugin to ensure we haven't left anything out.

$Id$

_______________________________________________
Zope-CVS maillist - Zope-CVS@zope.org
http://mail.zope.org/mailman/listinfo/zope-cvs

Zope CVS instructions: http://dev.zope.org/CVS