[Checkins] SVN: z3c.layer.pagelet/trunk/ Make progress with
z3c.layer.pagelet implementation
Roger Ineichen
roger at projekt01.ch
Fri Dec 28 19:13:00 EST 2007
Log message for revision 82511:
Make progress with z3c.layer.pagelet implementation
Note:
this version will not include zope.app.form anymore!
I guess nobody is using zope.app.form in combination with z3c.pagelet anyway.
Changed:
U z3c.layer.pagelet/trunk/buildout.cfg
U z3c.layer.pagelet/trunk/setup.py
U z3c.layer.pagelet/trunk/src/z3c/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/configure.zcml
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
D z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.form.browser.zcml
-=-
Modified: z3c.layer.pagelet/trunk/buildout.cfg
===================================================================
--- z3c.layer.pagelet/trunk/buildout.cfg 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/buildout.cfg 2007-12-29 00:13:00 UTC (rev 82511)
@@ -1,7 +1,16 @@
[buildout]
develop = .
-parts = test
+parts = test checker coverage
+
[test]
recipe = zc.recipe.testrunner
eggs = z3c.layer.pagelet [test]
+
+[checker]
+recipe = lovely.recipe:importchecker
+path = src/z3c/layer/pagelet
+
+[coverage]
+recipe = zc.recipe.egg
+eggs = z3c.coverage
Modified: z3c.layer.pagelet/trunk/setup.py
===================================================================
--- z3c.layer.pagelet/trunk/setup.py 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/setup.py 2007-12-29 00:13:00 UTC (rev 82511)
@@ -16,18 +16,27 @@
$Id:$
"""
+
+import os
from setuptools import setup, find_packages
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
setup(
name = 'z3c.layer.pagelet',
- version = '0.3.0',
- author = "Zope Community",
- author_email = "zope3-dev at zope.org",
- description = open("README.txt").read(),
- license = "ZPL 2.1",
- keywords = "pagelet layer zope zope3",
+ version = '1.0.0dev',
+ author='Zope Corporation and Contributors',
+ author_email='zope3-dev at zope.org',
+ description='Collection of Alternative Base Layers',
+ long_description=(
+ read('README.txt')
+ + '\n\n' +
+ read('CHANGES.txt')
+ ),
+ keywords = "zope3 layer",
classifiers = [
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
@@ -36,7 +45,8 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url = 'http://svn.zope.org/z3c.layer.pagelet',
+ url='http://cheeseshop.python.org/pypi/z3c.layer',
+ license='ZPL 2.1',
packages = find_packages('src'),
include_package_data = True,
package_dir = {'':'src'},
@@ -47,7 +57,10 @@
'zope.app.securitypolicy',
'zope.app.testing',
'zope.app.zcmlfiles',
+ 'zope.app.twisted',
+ 'zope.viewlet',
'z3c.pagelet',
+ 'zc.configuration',
],
),
install_requires = [
@@ -57,7 +70,6 @@
'zope.app.http',
'zope.app.publisher',
],
- dependency_links = ['http://download.zope.org/distribution'],
zip_safe = False,
)
Modified: z3c.layer.pagelet/trunk/src/z3c/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/__init__.py 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/__init__.py 2007-12-29 00:13:00 UTC (rev 82511)
@@ -1,6 +1,7 @@
+# this is a namespace package
try:
- # Declare this a namespace package if pkg_resources is available.
import pkg_resources
- pkg_resources.declare_namespace('z3c')
+ pkg_resources.declare_namespace(__name__)
except ImportError:
- pass
\ No newline at end of file
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt 2007-12-29 00:13:00 UTC (rev 82511)
@@ -11,7 +11,7 @@
Important
---------
-This layer supports the z3c.pagelet pattern. this means every page e.g. the
+This layer supports the z3c.pagelet pattern. This means every page e.g. the
error page is based on the z3c.pagelet concept.
@@ -117,7 +117,7 @@
>>> manager.open(skinURL + '/@@usererror.html')
>>> print manager.contents
- <!DOCTYPE...
+ <!DOCTYPE ...
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>TestingSkin</title>
@@ -164,10 +164,10 @@
>>> unauthorized.open(skinURL + '/@@forbidden.html')
Traceback (most recent call last):
...
- httperror_seek_wrapper: HTTP Error 401: Unauthorized
+ httperror_seek_wrapper: HTTP Error 403: Forbidden
>>> print unauthorized.contents
- <!DOCTYPE...
+ <!DOCTYPE ...
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>TestingSkin</title>
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2007-12-29 00:13:00 UTC (rev 82511)
@@ -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 import zapi
+from zope.app.security.interfaces import IAuthentication
from z3c.template.interfaces import IPageTemplate
from z3c.pagelet import browser
@@ -45,7 +45,7 @@
self.request.response.setHeader('Pragma', 'no-cache')
principal = self.request.principal
- auth = zapi.principals()
+ auth = zope.component.getUtility(IAuthentication)
auth.unauthorized(principal.id, self.request)
if self.request.response.getStatus() not in (302, 303):
template = zope.component.getMultiAdapter((self, self.request),
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/configure.zcml 2007-12-29 00:13:00 UTC (rev 82511)
@@ -12,6 +12,12 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
+ <defaultView
+ name="index.html"
+ for="zope.interface.common.interfaces.IException"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
+
<z3c:pagelet
name="index.html"
for="zope.publisher.interfaces.ITraversalException"
@@ -20,6 +26,12 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
+ <defaultView
+ name="index.html"
+ for="zope.publisher.interfaces.ITraversalException"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
+
<z3c:template
for=".SystemErrorPagelet"
template="systemerror.pt"
@@ -34,6 +46,12 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
+ <defaultView
+ name="index.html"
+ for="zope.security.interfaces.IUnauthorized"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
+
<z3c:template
for=".UnauthorizedPagelet"
template="unauthorized.pt"
@@ -48,6 +66,12 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
+ <defaultView
+ name="index.html"
+ for="zope.exceptions.interfaces.IUserError"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
+
<z3c:template
for=".UserErrorPagelet"
template="user.pt"
@@ -62,6 +86,12 @@
layer="z3c.layer.pagelet.IPageletBrowserLayer"
/>
+ <defaultView
+ name="index.html"
+ for="zope.publisher.interfaces.INotFound"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
+
<z3c:template
for=".NotFoundPagelet"
template="notfound.pt"
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/configure.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/configure.zcml 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/configure.zcml 2007-12-29 00:13:00 UTC (rev 82511)
@@ -9,7 +9,6 @@
type="zope.publisher.interfaces.browser.IBrowserSkinType"
/>
- <include file="zope.app.form.browser.zcml" />
<include file="zope.app.http.exception.zcml" />
<include file="zope.app.publication.zcml" />
<include file="zope.app.publisher.browser.zcml" />
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py 2007-12-29 00:13:00 UTC (rev 82511)
@@ -26,7 +26,7 @@
class IPageletBrowserTestingSkin(z3c.layer.pagelet.IPageletBrowserLayer):
- """The IJSABrowser testing skin."""
+ """The pagelet layer testing skin."""
class TestPage(browser.BrowserPagelet):
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2007-12-29 00:13:00 UTC (rev 82511)
@@ -1,118 +1,146 @@
-<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:z3c="http://namespaces.zope.org/z3c"
- i18n_domain="zope"
- package="z3c.layer.pagelet.tests">
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:meta="http://namespaces.zope.org/meta"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:z3c="http://namespaces.zope.org/z3c"
+ i18n_domain="zope">
- <include package="zope.app.zcmlfiles" />
+ <!-- load meta configuration for exclude -->
+ <include package="zc.configuration" file="meta.zcml" />
- <include package="zope.app.securitypolicy" file="meta.zcml" />
- <include package="zope.app.authentication" />
- <securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+ <!-- exclude will prevent from include -->
+ <exclude package="zope.app.authentication" file="ftpplugins.zcml" />
+ <exclude package="zope.app.authentication" file="groupfolder.zcml" />
+ <exclude package="zope.app.authentication" file="principalfolder.zcml" />
+ <exclude package="zope.app.authentication.browser" />
+ <exclude package="zope.app.authentication.browser" file="configure.zcml" />
+ <exclude package="zope.app.authentication.browser" file="groupfolder.zcml" />
+ <exclude package="zope.app.authentication.browser" file="httpplugins.zcml" />
+ <exclude package="zope.app.authentication.browser" file="principalfolder.zcml" />
+ <exclude package="zope.app.authentication.browser" file="session.zcml" />
+ <exclude package="zope.app.broken" file="browser.zcml" />
+ <exclude package="zope.app.container.browser" />
+ <exclude package="zope.app.error.browser" />
+ <exclude package="zope.app.folder.browser" />
+ <exclude package="zope.app.i18n.browser" />
+ <exclude package="zope.app.securitypolicy.browser" />
+ <exclude package="zope.app.session" file="browser.zcml" />
+ <exclude package="zope.dublincore.browser" />
- <include package="zope.app.securitypolicy" />
+ <!-- meta configure -->
+ <include package="zope.i18n" file="meta.zcml" />
+ <include package="zope.app.component" file="meta.zcml" />
+ <include package="zope.app.component.browser" file="meta.zcml" />
+ <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.securitypolicy" file="meta.zcml" />
- <role id="zope.Anonymous" title="Everybody"
- description="All users have this role implicitly" />
- <role id="zope.Manager" title="Site Manager" />
+ <!-- 3rd party meta configure -->
+ <include package="z3c.pagelet" file="meta.zcml" />
+ <include package="z3c.template" file="meta.zcml" />
- <principal
- id="zope.manager"
- title="Administrator"
- login="mgr"
- password="mgrpw" />
-
- <grant
- role="zope.Manager"
- principal="zope.manager"
- />
-
- <unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User" />
-
- <unauthenticatedGroup
- id="zope.Anybody"
- title="Unauthenticated Users"
- />
-
- <authenticatedGroup
- id="zope.Authenticated"
- title="Authenticated Users"
- />
-
- <everybodyGroup
- id="zope.Everybody"
- title="All Users"
- />
-
- <grantAll role="zope.Manager" />
-
- <include package="zope.app.form.browser" />
+ <!-- zope core component -->
+ <include package="zope.annotation" />
+ <include package="zope.app.appsetup" />
+ <include package="zope.app.component" />
+ <include package="zope.app.container" />
+ <include package="zope.app.error" />
<include package="zope.app.http.exception" />
+ <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.securitypolicy" />
+ <include package="zope.app.session" />
+ <include package="zope.app.twisted" />
+ <include package="zope.app.wsgi" />
+ <include package="zope.component" />
+ <include package="zope.contentprovider" />
+ <include package="zope.location" />
+ <include package="zope.publisher" />
<include package="zope.traversing" />
<include package="zope.traversing.browser" />
- <include package="zope.contentprovider" />
+ <include package="zope.viewlet" />
- <include package="z3c.template" file="meta.zcml" />
- <include package="z3c.pagelet" file="meta.zcml" />
- <include package="z3c.pagelet" />
+ <!-- security policy -->
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
- <include package="z3c.layer.pagelet" />
+ <role id="zope.Manager" title="Manager" />
+ <grantAll role="zope.Manager" />
+ <grantAll role="zope.Anonymous" />
- <interface
- interface="z3c.layer.pagelet.tests.IPageletBrowserTestingSkin"
- type="zope.publisher.interfaces.browser.IBrowserSkinType"
- name="MinimalTesting"
+ <principal
+ id="zope.manager"
+ title="Manager"
+ login="Manager"
+ password="password"
/>
- <z3c:layout
- for="*"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="template.pt"
+ <grant
+ role="zope.Manager"
+ principal="zope.manager"
/>
- <z3c:pagelet
- for="*"
- name="page.html"
- permission="zope.ManageContent"
- class=".TestPage"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- />
+ <!-- z3c component -->
+ <include package="z3c.pagelet" />
+ <include package="z3c.layer.pagelet" />
- <z3c:template
- for=".TestPage"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- template="page.pt"
- />
+ <!-- test skin -->
+ <configure package="z3c.layer.pagelet.tests">
+ <interface
+ interface="z3c.layer.pagelet.tests.IPageletBrowserTestingSkin"
+ type="zope.publisher.interfaces.browser.IBrowserSkinType"
+ name="MinimalTesting"
+ />
- <browser:page
- for="*"
- name="forbidden.html"
- permission="zope.View"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- class=".UnauthorizedPage"
- />
+ <z3c:layout
+ for="*"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="template.pt"
+ />
- <browser:page
- for="*"
- name="usererror.html"
- permission="zope.View"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- class=".UserErrorPage"
- />
+ <z3c:pagelet
+ for="*"
+ name="page.html"
+ permission="zope.ManageContent"
+ class=".TestPage"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ />
- <browser:page
- for="*"
- name="systemerror.html"
- permission="zope.View"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
- class=".SystemErrorPage"
- />
+ <z3c:template
+ for=".TestPage"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ template="page.pt"
+ />
+ <browser:page
+ for="*"
+ name="forbidden.html"
+ permission="zope.View"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ class=".UnauthorizedPage"
+ />
+
+ <browser:page
+ for="*"
+ name="usererror.html"
+ permission="zope.View"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ class=".UserErrorPage"
+ />
+
+ <browser:page
+ for="*"
+ name="systemerror.html"
+ permission="zope.View"
+ layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ class=".SystemErrorPage"
+ />
+ </configure>
+
</configure>
Deleted: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.form.browser.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.form.browser.zcml 2007-12-28 23:31:28 UTC (rev 82510)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.form.browser.zcml 2007-12-29 00:13:00 UTC (rev 82511)
@@ -1,15 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="z3c">
-
- <!-- Views for Widget Errors -->
- <view
- type="z3c.layer.pagelet.IPageletBrowserLayer"
- for="zope.app.form.interfaces.IWidgetInputError"
- provides="zope.app.form.browser.interfaces.IWidgetInputErrorView"
- factory="zope.app.form.browser.exception.WidgetInputErrorView"
- permission="zope.Public"
- />
-
-</configure>
More information about the Checkins
mailing list