[Checkins] SVN: zamplugin.sitemanager/trunk/ - Updated tests to run with ``z3c.form`` >= 2.1, thus requiring at least this

Michael Howitz mh at gocept.com
Fri Jan 28 02:58:50 EST 2011


Log message for revision 119986:
  - Updated tests to run with ``z3c.form`` >= 2.1, thus requiring at least this
    version.
  
  - Updated tests and demo application to run with ZTK 1.0, requiring at least
    ``zam.api`` 0.7.
  
  

Changed:
  U   zamplugin.sitemanager/trunk/CHANGES.txt
  U   zamplugin.sitemanager/trunk/buildout.cfg
  U   zamplugin.sitemanager/trunk/setup.py
  U   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt
  U   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml

-=-
Modified: zamplugin.sitemanager/trunk/CHANGES.txt
===================================================================
--- zamplugin.sitemanager/trunk/CHANGES.txt	2011-01-28 07:37:25 UTC (rev 119985)
+++ zamplugin.sitemanager/trunk/CHANGES.txt	2011-01-28 07:58:49 UTC (rev 119986)
@@ -6,9 +6,16 @@
 -----------------------------
 
 - Removed zc.configuration package from dependency list since this is a part
-  of zope.configuration
+  of zope.configuration.
 
-Version 0.5.0 (2008-04-16)
--------------------------
+- Updated tests to run with ``z3c.form`` >= 2.1, thus requiring at least this
+  version.
 
-- Initial Release
+- Updated tests and demo application to run with ZTK 1.0, requiring at least
+  ``zam.api`` 0.7.
+
+
+0.5.0 (2008-04-16)
+------------------
+
+- Initial release.

Modified: zamplugin.sitemanager/trunk/buildout.cfg
===================================================================
--- zamplugin.sitemanager/trunk/buildout.cfg	2011-01-28 07:37:25 UTC (rev 119985)
+++ zamplugin.sitemanager/trunk/buildout.cfg	2011-01-28 07:58:49 UTC (rev 119986)
@@ -91,7 +91,7 @@
 
   </configure>
 
-principals.zcml = 
+principals.zcml =
   <unauthenticatedPrincipal
       id="lovelybooks.anybody"
       title="Unauthenticated User"
@@ -125,7 +125,7 @@
       />
 
 securitypolicy.zcml =
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
@@ -141,7 +141,7 @@
       role="zope.Anonymous"
       />
   <grant
-      permission="zope.app.dublincore.view"
+      permission="zope.dublincore.view"
       role="zope.Anonymous"
       />
 

Modified: zamplugin.sitemanager/trunk/setup.py
===================================================================
--- zamplugin.sitemanager/trunk/setup.py	2011-01-28 07:37:25 UTC (rev 119985)
+++ zamplugin.sitemanager/trunk/setup.py	2011-01-28 07:58:49 UTC (rev 119986)
@@ -25,8 +25,8 @@
     name='zamplugin.sitemanager',
     version='0.5.1dev',
     author = "Roger Ineichen and the Zope Community",
-    author_email = "zope3-dev at zope.org",
-    description = "Site manager support for Zope Application Management",
+    author_email = "zope-dev at zope.org",
+    description = "Site manager support for ZAM (Zope Application Management)",
     long_description=(
         read('README.txt')
         + '\n\n' +
@@ -44,7 +44,7 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url = 'http://cheeseshop.python.org/pypi/zamplugin.sitemanager',
+    url = 'http://pypi.python.org/pypi/zamplugin.sitemanager',
     packages = find_packages('src'),
     include_package_data = True,
     package_dir = {'':'src'},
@@ -69,6 +69,7 @@
             'zope.session',
             'zope.testing',
             'zope.testbrowser',
+            'zope.app.principalannotation',
             ],
         ),
     install_requires = [
@@ -77,8 +78,8 @@
         'z3c.batching',
         'z3c.batching',
         'z3c.contents',
-        'z3c.form',
-        'z3c.formui',
+        'z3c.form >= 2.1',
+        'z3c.formui >= 2.1',
         'z3c.json',
         'z3c.jsonrpc',
         'z3c.jsontree',
@@ -90,7 +91,7 @@
         'z3c.table',
         'z3c.xmlhttp',
         'z3c.zrtresource',
-        'zam.api',
+        'zam.api >= 0.7',
         'zope.app.component',
         'zope.app.http',
         'zope.app.intid',

Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt	2011-01-28 07:37:25 UTC (rev 119985)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/README.txt	2011-01-28 07:58:49 UTC (rev 119986)
@@ -2,7 +2,7 @@
 README
 ======
 
-This package contains the site manager part for the Zope Application 
+This package contains the site manager part for the Zope Application
 Management. The zam.skin is used as basic skin for this test.
 
 First login as manager:
@@ -30,22 +30,18 @@
       <div class="description">ZAM Site Manager.</div>
   ...
 
-Now you can see that we can access the contents.html page for our site 
+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"
+      <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>
-           &ndash; required
-        </div>
       <div>
       <fieldset>
         <legend>Search</legend>
@@ -53,14 +49,16 @@
   <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="" />
+      <input id="search-widgets-searchterm"
+             name="search.widgets.searchterm"
+             class="text-widget required textline-field"
+             value="" type="text" />
   </td>
   <td class="action">
-    <input type="submit" id="search-buttons-search"
+  <input id="search-buttons-search"
          name="search.buttons.search"
-         class="submit-widget button-field" value="Search" />
+         class="submit-widget button-field" value="Search"
+         type="submit" />
   </td>
   </tr>
   </table>
@@ -105,18 +103,21 @@
     </div>
     <div>
       <div class="buttons">
-        <input type="submit" id="contents-buttons-copy"
+  <input 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"
+         class="submit-widget button-field" value="Copy"
+         type="submit" />
+  <input id="contents-buttons-cut" name="contents.buttons.cut"
+         class="submit-widget button-field" value="Cut"
+         type="submit" />
+  <input id="contents-buttons-delete"
          name="contents.buttons.delete"
-         class="submit-widget button-field" value="Delete" />
-        <input type="submit" id="contents-buttons-rename"
+         class="submit-widget button-field" value="Delete"
+         type="submit" />
+  <input id="contents-buttons-rename"
          name="contents.buttons.rename"
-         class="submit-widget button-field" value="Rename" />
+         class="submit-widget button-field" value="Rename"
+         type="submit" />
       </div>
     </div>
   </form>

Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml	2011-01-28 07:37:25 UTC (rev 119985)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/ftesting.zcml	2011-01-28 07:58:49 UTC (rev 119986)
@@ -8,6 +8,8 @@
 
   <!-- use ftesting configuration from zam.api -->
   <include package="zam.skin" file="ftesting.zcml" />
+  <exclude package="zope.app.principalannotation" file="browser.zcml" />
+  <include package="zope.app.principalannotation" />
 
   <!-- load app configuration -->
   <include package="zamplugin.sitemanager" file="app.zcml" />



More information about the checkins mailing list