[Checkins] SVN: z3c.layer.pagelet/trunk/ Removed dependency on ``zope.app.security`` by using the new packages ``zope.authentication`` and ``zope.principalregistry``.
Michael Howitz
mh at gocept.com
Sun Mar 15 13:27:45 EDT 2009
Log message for revision 98127:
Removed dependency on ``zope.app.security`` by using the new packages ``zope.authentication`` and ``zope.principalregistry``.
Changed:
U z3c.layer.pagelet/trunk/CHANGES.txt
U z3c.layer.pagelet/trunk/setup.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml
D z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.app.security.browser.zcml
A z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.authentication.zcml
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
-=-
Modified: z3c.layer.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/trunk/CHANGES.txt 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/CHANGES.txt 2009-03-15 17:27:44 UTC (rev 98127)
@@ -5,7 +5,8 @@
1.3.1 (unreleased)
------------------
-- Nothing changed yet.
+- Removed dependency on ``zope.app.security`` by using the new
+ packages ``zope.authentication`` and ``zope.principalregistry``.
1.3.0 (2009-03-13)
Modified: z3c.layer.pagelet/trunk/setup.py
===================================================================
--- z3c.layer.pagelet/trunk/setup.py 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/setup.py 2009-03-15 17:27:44 UTC (rev 98127)
@@ -72,10 +72,10 @@
'zope.configuration',
'zope.traversing',
'zope.app.publisher',
- 'zope.app.security',
'zope.app.exception',
'z3c.pagelet',
'zope.viewlet',
+ 'zope.authentication',
],
zip_safe = False,
)
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-03-15 17:27:44 UTC (rev 98127)
@@ -20,7 +20,7 @@
from zope.app.exception.browser.unauthorized import Unauthorized
from zope.app.exception.browser.user import UserErrorView
from zope.app.exception.browser.notfound import NotFound
-from zope.app.security.interfaces import IAuthentication
+from zope.authentication.interfaces import IAuthentication
from z3c.template.interfaces import IContentTemplate
from z3c.pagelet import browser
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml 2009-03-15 17:27:44 UTC (rev 98127)
@@ -98,6 +98,6 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
- <include file="zope.app.security.browser.zcml" />
+ <include file="zope.authentication.zcml" />
</configure>
Deleted: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.app.security.browser.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.app.security.browser.zcml 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.app.security.browser.zcml 2009-03-15 17:27:44 UTC (rev 98127)
@@ -1,170 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:z3c="http://namespaces.zope.org/z3c"
- i18n_domain="z3c">
-
- <!-- viewlets in head tag supporting login and logout
- (viewlets are defined together with the pagelets below) -->
- <browser:viewletManager
- provides=".auth.ILoginLogoutHeadViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="login-logout-head"
- class=".auth.LoginLogoutHeadViewletManager"
- permission="zope.Public"
- />
-
- <!-- viewlet manager and viewlets for login and logout links -->
- <browser:viewletManager
- provides=".auth.ILoginLogoutViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="login-logout"
- class=".auth.LoginLogoutViewletManager"
- permission="zope.Public"
- />
-
- <browser:viewlet
- manager=".auth.ILoginLogoutViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="Login"
- class=".auth.LoginViewlet"
- permission="zope.Public"
- weight="1"
- viewName="@@login.html"
- />
-
- <browser:viewlet
- manager=".auth.ILoginLogoutViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="Logout"
- class=".auth.LogoutViewlet"
- permission="zope.Public"
- weight="2"
- viewName="@@logout.html"
- />
-
- <!-- login page (executing login and redirecting user) -->
- <browser:page
- for="*"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="login.html"
- class=".auth.HTTPAuthenticationLogin"
- attribute="login"
- allowed_interface="zope.app.publisher.interfaces.http.ILogin"
- permission="zope.Public"
- />
-
- <!-- login form for session credentials -->
- <z3c:pagelet
- for="*"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="loginForm.html"
- class=".auth.SessionCredentialsLoginForm"
- permission="zope.Public"
- />
-
- <z3c:template
- for=".auth.SessionCredentialsLoginForm"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="session_cred_loginform.pt"
- />
-
- <!-- login failed -->
- <z3c:pagelet
- for=".auth.HTTPAuthenticationLogin"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="login_failed.html"
- class=".auth.LoginFailedPagelet"
- permission="zope.Public"
- />
-
- <z3c:template
- for=".auth.LoginFailedPagelet"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="login_failed.pt"
- />
-
- <!-- login success confirmation -->
- <z3c:pagelet
- for=".auth.HTTPAuthenticationLogin"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="login_success.html"
- class=".auth.LoginSuccessfulPagelet"
- permission="zope.Public"
- />
-
- <z3c:template
- for=".auth.LoginSuccessfulPagelet"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="login_success.pt"
- />
-
- <!-- logout page (executing logout and redirecting user) -->
- <browser:page
- for="*"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="logout.html"
- class=".auth.HTTPAuthenticationLogout"
- attribute="logout"
- allowed_interface="zope.app.publisher.interfaces.http.ILogout"
- permission="zope.Public"
- />
-
- <!-- redirecting logout confirmation -->
- <z3c:pagelet
- for=".auth.HTTPAuthenticationLogout"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="redirect.html"
- class=".auth.LogoutRedirectPagelet"
- permission="zope.Public"
- />
-
- <z3c:template
- for=".auth.LogoutRedirectPagelet"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="redirect.pt"
- />
-
- <browser:viewlet
- manager=".auth.ILoginLogoutHeadViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- view=".auth.LogoutRedirectPagelet"
- name="Redirect"
- template="redirect_head.pt"
- permission="zope.Public"
- />
-
- <browser:viewlet
- manager=".auth.ILoginLogoutHeadViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- view=".auth.LogoutRedirectPagelet"
- name="Logout"
- template="logout_head.pt"
- permission="zope.Public"
- />
-
- <!-- not redirecting logout confirmation -->
- <z3c:pagelet
- for=".auth.HTTPAuthenticationLogout"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- name="logout_success.html"
- class=".auth.LogoutSuccessPagelet"
- permission="zope.Public"
- />
-
- <z3c:template
- for=".auth.LogoutSuccessPagelet"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="logout.pt"
- />
-
- <browser:viewlet
- manager=".auth.ILoginLogoutHeadViewletManager"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- view=".auth.LogoutSuccessPagelet"
- name="Logout"
- template="logout_head.pt"
- permission="zope.Public"
- />
-
-</configure>
Copied: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.authentication.zcml (from rev 98123, z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.app.security.browser.zcml)
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.authentication.zcml (rev 0)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/zope.authentication.zcml 2009-03-15 17:27:44 UTC (rev 98127)
@@ -0,0 +1,170 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:z3c="http://namespaces.zope.org/z3c"
+ i18n_domain="z3c">
+
+ <!-- viewlets in head tag supporting login and logout
+ (viewlets are defined together with the pagelets below) -->
+ <browser:viewletManager
+ provides=".auth.ILoginLogoutHeadViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="login-logout-head"
+ class=".auth.LoginLogoutHeadViewletManager"
+ permission="zope.Public"
+ />
+
+ <!-- viewlet manager and viewlets for login and logout links -->
+ <browser:viewletManager
+ provides=".auth.ILoginLogoutViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="login-logout"
+ class=".auth.LoginLogoutViewletManager"
+ permission="zope.Public"
+ />
+
+ <browser:viewlet
+ manager=".auth.ILoginLogoutViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="Login"
+ class=".auth.LoginViewlet"
+ permission="zope.Public"
+ weight="1"
+ viewName="@@login.html"
+ />
+
+ <browser:viewlet
+ manager=".auth.ILoginLogoutViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="Logout"
+ class=".auth.LogoutViewlet"
+ permission="zope.Public"
+ weight="2"
+ viewName="@@logout.html"
+ />
+
+ <!-- login page (executing login and redirecting user) -->
+ <browser:page
+ for="*"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="login.html"
+ class=".auth.HTTPAuthenticationLogin"
+ attribute="login"
+ allowed_interface="zope.app.publisher.interfaces.http.ILogin"
+ permission="zope.Public"
+ />
+
+ <!-- login form for session credentials -->
+ <z3c:pagelet
+ for="*"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="loginForm.html"
+ class=".auth.SessionCredentialsLoginForm"
+ permission="zope.Public"
+ />
+
+ <z3c:template
+ for=".auth.SessionCredentialsLoginForm"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="session_cred_loginform.pt"
+ />
+
+ <!-- login failed -->
+ <z3c:pagelet
+ for=".auth.HTTPAuthenticationLogin"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="login_failed.html"
+ class=".auth.LoginFailedPagelet"
+ permission="zope.Public"
+ />
+
+ <z3c:template
+ for=".auth.LoginFailedPagelet"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="login_failed.pt"
+ />
+
+ <!-- login success confirmation -->
+ <z3c:pagelet
+ for=".auth.HTTPAuthenticationLogin"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="login_success.html"
+ class=".auth.LoginSuccessfulPagelet"
+ permission="zope.Public"
+ />
+
+ <z3c:template
+ for=".auth.LoginSuccessfulPagelet"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="login_success.pt"
+ />
+
+ <!-- logout page (executing logout and redirecting user) -->
+ <browser:page
+ for="*"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="logout.html"
+ class=".auth.HTTPAuthenticationLogout"
+ attribute="logout"
+ allowed_interface="zope.app.publisher.interfaces.http.ILogout"
+ permission="zope.Public"
+ />
+
+ <!-- redirecting logout confirmation -->
+ <z3c:pagelet
+ for=".auth.HTTPAuthenticationLogout"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="redirect.html"
+ class=".auth.LogoutRedirectPagelet"
+ permission="zope.Public"
+ />
+
+ <z3c:template
+ for=".auth.LogoutRedirectPagelet"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="redirect.pt"
+ />
+
+ <browser:viewlet
+ manager=".auth.ILoginLogoutHeadViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ view=".auth.LogoutRedirectPagelet"
+ name="Redirect"
+ template="redirect_head.pt"
+ permission="zope.Public"
+ />
+
+ <browser:viewlet
+ manager=".auth.ILoginLogoutHeadViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ view=".auth.LogoutRedirectPagelet"
+ name="Logout"
+ template="logout_head.pt"
+ permission="zope.Public"
+ />
+
+ <!-- not redirecting logout confirmation -->
+ <z3c:pagelet
+ for=".auth.HTTPAuthenticationLogout"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ name="logout_success.html"
+ class=".auth.LogoutSuccessPagelet"
+ permission="zope.Public"
+ />
+
+ <z3c:template
+ for=".auth.LogoutSuccessPagelet"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="logout.pt"
+ />
+
+ <browser:viewlet
+ manager=".auth.ILoginLogoutHeadViewletManager"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ view=".auth.LogoutSuccessPagelet"
+ name="Logout"
+ template="logout_head.pt"
+ permission="zope.Public"
+ />
+
+</configure>
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt 2009-03-15 17:27:44 UTC (rev 98127)
@@ -154,12 +154,12 @@
>>> from zope.app.testing import ztapi
>>> import zope.interface
- >>> import zope.app.security
- >>> import zope.app.security.interfaces
+ >>> import zope.authentication.logout
+ >>> import zope.authentication.interfaces
>>> ztapi.provideAdapter(
... zope.interface.Interface,
... zope.app.security.interfaces.ILogoutSupported,
- ... zope.app.security.LogoutSupported)
+ ... zope.authentication.logout.LogoutSupported)
>>> browser.reload()
>>> browser.url
'http://localhost/++skin++PageletTestSkin/container/'
@@ -267,7 +267,7 @@
To do cookie auth we have to set up a pluggable auth utility (PAU)
with a authenticator plug-in (principal folder) first:
- >>> from zope.app.security.interfaces import IAuthentication
+ >>> from zope.authentication.interfaces import IAuthentication
>>> from zope.app.authentication.interfaces import IAuthenticatorPlugin
>>> from zope.app.appsetup.bootstrap import ensureUtility
>>> from zope.app.authentication.authentication import PluggableAuthentication
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-15 16:43:22 UTC (rev 98126)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-15 17:27:44 UTC (rev 98127)
@@ -26,7 +26,7 @@
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.publisher" file="meta.zcml" />
- <include package="zope.app.security" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
@@ -38,6 +38,8 @@
<!-- zope core component -->
<include package="zope.annotation" />
+ <include package="zope.authentication" />
+ <include package="zope.principalregistry" />
<include package="zope.app.appsetup" />
<include package="zope.app.component" />
<include package="zope.container" />
@@ -46,7 +48,6 @@
<include package="zope.app.i18n" />
<include package="zope.app.publication" />
<include package="zope.app.publisher.browser" />
- <include package="zope.app.security" />
<include package="zope.app.authentication" />
<include package="zope.securitypolicy" />
<include package="zope.app.twisted" />
@@ -59,6 +60,7 @@
<include package="zope.traversing.browser" />
<include package="zope.viewlet" />
<include package="zope.session" />
+ <include package="zope.security" file="permissions.zcml" />
<!-- z3c component -->
More information about the Checkins
mailing list