[Checkins] SVN: zamplugin.sitemanager/trunk/ Move sample app
configuration from buildout.cfg to app.zcml
Roger Ineichen
roger at projekt01.ch
Sun Apr 13 21:41:19 EDT 2008
Log message for revision 85351:
Move sample app configuration from buildout.cfg to app.zcml
Adjust svn:externals
Adjust setup and buildout configuration
Added more tests
Changed:
U zamplugin.sitemanager/trunk/buildout.cfg
U zamplugin.sitemanager/trunk/setup.py
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt
A zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/app.zcml
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/navigation.zcml
U zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/registration.zcml
-=-
Modified: zamplugin.sitemanager/trunk/buildout.cfg
===================================================================
--- zamplugin.sitemanager/trunk/buildout.cfg 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/buildout.cfg 2008-04-14 01:41:18 UTC (rev 85351)
@@ -1,21 +1,16 @@
[buildout]
develop = .
- externals/z3c.contents
externals/z3c.jsonrpcproxy
externals/z3c.jsontree
- externals/z3c.menu.ready2go
- externals/z3c.table
externals/z3c.xmlhttp
- externals/zam.api
- externals/zam.skin
+parts = logs app var test checker coverage-test coverage-report
-parts = logs app var test checker coverage
-
[test]
recipe = zc.recipe.testrunner
-eggs = zamplugin.sitemanager [test]
+eggs = zam.skin [app]
+ zamplugin.sitemanager [test]
[checker]
@@ -23,9 +18,18 @@
path = src/zamplugin/sitemanager
-[coverage]
+[coverage-test]
+recipe = zc.recipe.testrunner
+eggs = zam.skin [app]
+ zamplugin.sitemanager [test]
+defaults = ['--coverage', '../../coverage']
+
+
+[coverage-report]
recipe = zc.recipe.egg
eggs = z3c.coverage
+scripts = coverage=coverage-report
+arguments = ('coverage', 'coverage/report')
[logs]
@@ -35,7 +39,8 @@
[app]
recipe = z3c.recipe.dev:app
-eggs = zamplugin.sitemanager
+eggs = zam.skin [app]
+ zamplugin.sitemanager
server = zserver
zope.conf =
${var:zconfig}
@@ -78,16 +83,12 @@
<!-- Turn on the devmode -->
<meta:provides feature="devmode" />
- <!-- use app configuration from zam.skin -->
+ <!-- use app configuration from zam.api -->
<include package="zam.skin" file="app.zcml" />
- <!-- load 3rd party configuration -->
- <include package="z3c.contents" />
+ <!-- use app configuration from zamplugin.sitemanager -->
+ <include package="zamplugin.sitemanager" file="app.zcml" />
- <!-- zamplugin configuration -->
- <include package="zamplugin.sitemanager" />
-
-
<!-- load other zcml files -->
<include file="securitypolicy.zcml" />
<include file="principals.zcml" />
Modified: zamplugin.sitemanager/trunk/setup.py
===================================================================
--- zamplugin.sitemanager/trunk/setup.py 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/setup.py 2008-04-14 01:41:18 UTC (rev 85351)
@@ -23,7 +23,7 @@
setup (
name='zamplugin.sitemanager',
- version='0.5.0',
+ version='0.5.0dev',
author = "Roger Ineichen and the Zope Community",
author_email = "zope3-dev at zope.org",
description = "Site manager support for Zope Application Management",
@@ -91,7 +91,6 @@
'z3c.xmlhttp',
'z3c.zrtresource',
'zam.api',
- 'zam.skin',
'zc.configuration',
'zope.app.component',
'zope.app.http',
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt 2008-04-14 01:41:18 UTC (rev 85351)
@@ -3,21 +3,121 @@
======
This package contains the site manager part for the Zope Application
-Management.
+Management. The zam.skin is used as basic skin for this test.
-Login as manager first:
+First login as manager:
>>> from zope.testbrowser.testing import Browser
- >>> manager = Browser()
- >>> manager.addHeader('Authorization', 'Basic mgr:mgrpw')
+ >>> mgr = Browser()
+ >>> mgr.addHeader('Authorization', 'Basic mgr:mgrpw')
-Check if we can access the page.html view which is registred in the
-ftesting.zcml file with our skin:
+And go to the plugins page at the site root:
- >>> manager = Browser()
- >>> manager.handleErrors = False
- >>> manager.addHeader('Authorization', 'Basic mgr:mgrpw')
- >>> skinURL = 'http://localhost/++skin++ZAM/index.html'
- >>> manager.open(skinURL)
- >>> manager.url
- 'http://localhost/++skin++ZAM/index.html'
+ >>> rootURL = 'http://localhost/++skin++ZAM'
+ >>> mgr.open(rootURL + '/plugins.html')
+ >>> mgr.url
+ 'http://localhost/++skin++ZAM/plugins.html'
+
+and install the error plugins:
+
+ >>> mgr.getControl(name='zamplugin.sitemanager.buttons.install').click()
+ >>> print mgr.contents
+ <!DOCTYPE ...
+ ...
+ <h1>ZAM Plugin Management</h1>
+ <fieldset id="pluginManagement">
+ <strong class="installedPlugin">Site management</strong>
+ <div class="description">ZAM Site Manager.</div>
+ ...
+
+Now you can see that we can access the contents.html page for our site
+management container at the site root:
+
+ >>> mgr.open(rootURL + '/++etc++site/default/@@contents.html')
+ >>> print mgr.contents
+ <!DOCTYPE ...
+ ...
+ <div id="content">
+ <form action="http://localhost/++skin++ZAM/++etc++site/default/@@contents.html"
+ method="post" enctype="multipart/form-data"
+ class="edit-form" name="contents" id="contents">
+ <div class="viewspace">
+ <div class="required-info">
+ <span class="required">*</span>
+ – required
+ </div>
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input type="text" id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field" value="" />
+ </td>
+ <td class="action">
+ <input type="submit" id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table class="contents">
+ <thead>
+ <tr>
+ <th>X</th>
+ <th><a href="?contents-sortOn=contents-renameColumn-1&contents-sortOrder=descending" title="Sort">Name</a></th>
+ <th><a href="?contents-sortOn=contents-createdColumn-2&contents-sortOrder=ascending" title="Sort">Created</a></th>
+ <th><a href="?contents-sortOn=contents-modifiedColumn-3&contents-sortOrder=ascending" title="Sort">Modified</a></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr class="even">
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="CookieClientIdManager" /></td>
+ <td><a href="http://localhost/++skin++ZAM/++etc++site/default/CookieClientIdManager">CookieClientIdManager</a></td>
+ <td>None</td>
+ <td>None</td>
+ </tr>
+ <tr class="odd">
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="PersistentSessionDataContainer" /></td>
+ <td><a href="http://localhost/++skin++ZAM/++etc++site/default/PersistentSessionDataContainer">PersistentSessionDataContainer</a></td>
+ <td>None</td>
+ <td>None</td>
+ </tr>
+ <tr class="even">
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="PrincipalAnnotation" /></td>
+ <td><a href="http://localhost/++skin++ZAM/++etc++site/default/PrincipalAnnotation">PrincipalAnnotation</a></td>
+ <td>None</td>
+ <td>None</td>
+ </tr>
+ <tr class="odd">
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="RootErrorReportingUtility" /></td>
+ <td><a href="http://localhost/++skin++ZAM/++etc++site/default/RootErrorReportingUtility">RootErrorReportingUtility</a></td>
+ <td>None</td>
+ <td>None</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div>
+ <div class="buttons">
+ <input type="submit" id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy" />
+ <input type="submit" id="contents-buttons-cut"
+ name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut" />
+ <input type="submit" id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete" />
+ <input type="submit" id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename" />
+ </div>
+ </div>
+ </form>
+ ...
Added: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/app.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/app.zcml (rev 0)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/app.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -0,0 +1,12 @@
+<configure
+ xmlns:meta="http://namespaces.zope.org/meta"
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="zope">
+
+ <!-- use app configuration from zam.api -->
+ <include package="zam.skin" file="app.zcml" />
+
+ <!-- zam plugin configuration -->
+ <include package="zamplugin.sitemanager" />
+
+</configure>
Property changes on: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/app.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -2,6 +2,14 @@
xmlns="http://namespaces.zope.org/zope"
i18n_domain="zam">
+ <!-- z3c configuration if not already configured-->
+ <include package="z3c.xmlhttp" />
+ <include package="z3c.json" />
+ <include package="z3c.jsonrpc" file="meta.zcml" />
+ <include package="z3c.jsonrpc" />
+ <include package="z3c.jsonrpcproxy" />
+ <include package="z3c.jsontree" />
+
<include file="plugin.zcml" />
<!-- plugin management for ISiteManagerPluginLayer -->
@@ -14,18 +22,20 @@
/>
<registerIn registry="zamplugin.sitemanager.plugin.SiteManagerBaseRegistry">
+
<view
name="etc"
type="zam.api.layer.ISiteManagerPluginLayer"
provides="zope.traversing.interfaces.ITraversable" for="*"
factory="zope.traversing.namespace.etc"
/>
-
+
<include file="browser.zcml" />
- <include file="navigation.zcml" />
<include file="menu.zcml" />
<include file="registration.zcml" />
+ <include file="navigation.zcml" />
</registerIn>
+
</configure>
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -1,16 +1,15 @@
<configure
+ xmlns:meta="http://namespaces.zope.org/meta"
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:z3c="http://namespaces.zope.org/z3c"
i18n_domain="zope">
+ <!-- Turn on the devmode -->
+ <meta:provides feature="devmode" />
+
<!-- use ftesting configuration from zam.api -->
<include package="zam.skin" file="ftesting.zcml" />
- <!-- load 3rd party configuration -->
- <include package="z3c.contents" />
+ <!-- load app configuration -->
+ <include package="zamplugin.sitemanager" file="app.zcml" />
- <!-- zamplugin configuration -->
- <include package="zamplugin.sitemanager" />
-
</configure>
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -62,6 +62,4 @@
permission="zope.ManageServices"
/>
-
-
</configure>
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/navigation.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/navigation.zcml 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/navigation.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -10,7 +10,7 @@
file="js/z3c.xmlhttp-0.5.0.js"
layer="zam.api.layer.ISiteManagerPluginLayer"
/>
-
+
<viewlet
name="z3c.xmlhttp.js"
for="*"
Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/registration.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/registration.zcml 2008-04-14 01:40:52 UTC (rev 85350)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/registration.zcml 2008-04-14 01:41:18 UTC (rev 85351)
@@ -17,8 +17,8 @@
template="registration.pt"
layer="zam.api.layer.ISiteManagerPluginLayer"
/>
-
+
<z3c:pagelet
for="*"
name="addRegistration.html"
More information about the Checkins
mailing list