[Checkins] SVN: zamplugin.sampledata/trunk/ Adapted test setup and demo application to run with ZTK 1.0, thus requiring at least `zam.api` version 0.7.

[Michael Howitz]

Log message for revision 119981:
  Adapted test setup and demo application to run with ZTK 1.0, thus requiring at least `zam.api` version 0.7.
  

Changed:
  U   zamplugin.sampledata/trunk/CHANGES.txt
  U   zamplugin.sampledata/trunk/buildout.cfg
  U   zamplugin.sampledata/trunk/setup.py
  U   zamplugin.sampledata/trunk/src/zamplugin/sampledata/app.zcml
  U   zamplugin.sampledata/trunk/src/zamplugin/sampledata/browser.zcml

-=-
Modified: zamplugin.sampledata/trunk/CHANGES.txt
===================================================================
--- zamplugin.sampledata/trunk/CHANGES.txt	2011-01-27 18:07:07 UTC (rev 119980)
+++ zamplugin.sampledata/trunk/CHANGES.txt	2011-01-28 07:35:14 UTC (rev 119981)
@@ -5,9 +5,10 @@
 Version 0.5.1dev (unreleased)
 -----------------------------
 
-- ...
+- Adapted test setup and demo application to run with ZTK 1.0, thus
+  requiring at least `zam.api` version 0.7.
 
-Version 0.5.0 (2008-04-14)
--------------------------
+0.5.0 (2008-04-14)
+------------------
 
 - Initial Release

Modified: zamplugin.sampledata/trunk/buildout.cfg
===================================================================
--- zamplugin.sampledata/trunk/buildout.cfg	2011-01-27 18:07:07 UTC (rev 119980)
+++ zamplugin.sampledata/trunk/buildout.cfg	2011-01-28 07:35:14 UTC (rev 119981)
@@ -90,7 +90,7 @@
 
   </configure>
 
-principals.zcml = 
+principals.zcml =
   <unauthenticatedPrincipal
       id="lovelybooks.anybody"
       title="Unauthenticated User"
@@ -124,7 +124,7 @@
       />
 
 securitypolicy.zcml =
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
@@ -140,7 +140,7 @@
       role="zope.Anonymous"
       />
   <grant
-      permission="zope.app.dublincore.view"
+      permission="zope.dublincore.view"
       role="zope.Anonymous"
       />
 

Modified: zamplugin.sampledata/trunk/setup.py
===================================================================
--- zamplugin.sampledata/trunk/setup.py	2011-01-27 18:07:07 UTC (rev 119980)
+++ zamplugin.sampledata/trunk/setup.py	2011-01-28 07:35:14 UTC (rev 119981)
@@ -55,7 +55,7 @@
             'z3c.testing',
             'zope.app.testing',
             'zope.testbrowser',
-            'zam.skin',
+            'zam.skin >= 0.8',
             ],
         ),
     install_requires = [
@@ -67,7 +67,7 @@
         'z3c.pagelet',
         'z3c.sampledata',
         'z3c.template',
-        'zam.api',
+        'zam.api >= 0.7',
         'zope.component',
         'zope.exceptions',
         'zope.interface',

Modified: zamplugin.sampledata/trunk/src/zamplugin/sampledata/app.zcml
===================================================================
--- zamplugin.sampledata/trunk/src/zamplugin/sampledata/app.zcml	2011-01-27 18:07:07 UTC (rev 119980)
+++ zamplugin.sampledata/trunk/src/zamplugin/sampledata/app.zcml	2011-01-28 07:35:14 UTC (rev 119981)
@@ -3,9 +3,6 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <!-- load meta configuration for exclude -->
-  <include package="zc.configuration" file="meta.zcml" />
-
   <!-- use app configuration from zam.api -->
   <include package="zam.skin" file="app.zcml" />
 

Modified: zamplugin.sampledata/trunk/src/zamplugin/sampledata/browser.zcml
===================================================================
--- zamplugin.sampledata/trunk/src/zamplugin/sampledata/browser.zcml	2011-01-27 18:07:07 UTC (rev 119980)
+++ zamplugin.sampledata/trunk/src/zamplugin/sampledata/browser.zcml	2011-01-28 07:35:14 UTC (rev 119981)
@@ -20,7 +20,7 @@
 
   <z3c:pagelet
       name="generatesample.html"
-      for="zope.app.folder.interfaces.IFolder"
+      for="zope.site.interfaces.IFolder"
       class=".browser.GenerateSample"
       layer="zam.api.layer.ISampleDataPluginLayer"
       permission="zope.ManageSite"