[Checkins] SVN: z3c.sampledata/trunk/ - adjust zope.app.session to zope.session in ftesting.zcml

[Roger Ineichen]

Log message for revision 93260:
  - adjust zope.app.session to zope.session in ftesting.zcml
  - adjust zope.app.securitypolicy to zope.securitpolicy in ftesting.zcml
  
  TODO:
  Check why we load the old zope.app configure.zcml in ftesting.zcml?
  

Changed:
  U   z3c.sampledata/trunk/CHANGES.txt
  U   z3c.sampledata/trunk/src/z3c/sampledata/ftesting.zcml

-=-
Modified: z3c.sampledata/trunk/CHANGES.txt
===================================================================
--- z3c.sampledata/trunk/CHANGES.txt	2008-11-22 09:25:08 UTC (rev 93259)
+++ z3c.sampledata/trunk/CHANGES.txt	2008-11-22 13:41:02 UTC (rev 93260)
@@ -2,6 +2,18 @@
 CHANGES
 =======
 
+Before next release check why we load the old zope.app configure.zcml in 
+ftesting.zcml
+
+
+0.2.0dev (unreleased)
+---------------------
+
+- adjust zope.app.session to zope.session in ftesting.zcml
+
+- adjust zope.app.securitypolicy to zope.securitpolicy in ftesting.zcml
+
+
 0.1.0 (2008-02-14)
 ------------------
 

Modified: z3c.sampledata/trunk/src/z3c/sampledata/ftesting.zcml
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/ftesting.zcml	2008-11-22 09:25:08 UTC (rev 93259)
+++ z3c.sampledata/trunk/src/z3c/sampledata/ftesting.zcml	2008-11-22 13:41:02 UTC (rev 93260)
@@ -1,35 +1,44 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:browser="http://namespaces.zope.org/browser"
-           i18n_domain="zope">
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="zope">
  
   <include package="zope.app" />
 
   <include package="zope.viewlet" file="meta.zcml"/>
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="z3c.sampledata" file="meta.zcml" />
   
   <include package="zope.app.server" />
   <include package="zope.app.authentication" />
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-  <include package="zope.app.securitypolicy" />
-  <include package="zope.app.session" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+  <include package="zope.securitypolicy" />
   
+  <include package="zope.session" />
   <include package="zope.contentprovider"/>
   <include package="zope.viewlet"/>
   <include package="zope.formlib"/>
   <include package="z3c.sampledata"/>
   
-  <role id="zope.Anonymous" title="Everybody"
-      description="All users have this role implicitly" />
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
+  <role
+      id="zope.Anonymous" title="Everybody"
+      description="All users have this role implicitly"
+      />
+  <role
+      id="zope.Manager"
+      title="Site Manager"
+      />
+  <grantAll
+      role="zope.Manager"
+      />
 
   <principal
      id="zope.manager"
      title="Administrator"
      login="mgr"
-     password="mgrpw" />
+     password="mgrpw"
+     />
   <grant
      role="zope.Manager"
      principal="zope.manager"