[Zope3-checkins] SVN: Zope3/trunk/s Moved security policy settings into securitypolicy.zcml out of z/a/securitypolicy/configure.zcml. There's a BIG FAT TODO here, which I'll add to the collector, to handle migration of existing Zope instances. I'm not sure what the right solution is, but hopefully we can get a discussion going.

[Garrett Smith]

Log message for revision 29454:
  Moved security policy settings into securitypolicy.zcml out of z/a/securitypolicy/configure.zcml. There's a BIG FAT TODO here, which I'll add to the collector, to handle migration of existing Zope instances. I'm not sure what the right solution is, but hopefully we can get a discussion going.

Changed:
  U   Zope3/trunk/securitypolicy.zcml
  U   Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
  U   Zope3/trunk/src/zope/app/securitypolicy/securitypolicy.zcml

-=-
Modified: Zope3/trunk/securitypolicy.zcml
===================================================================
--- Zope3/trunk/securitypolicy.zcml	2005-03-12 01:23:13 UTC (rev 29453)
+++ Zope3/trunk/securitypolicy.zcml	2005-03-12 01:29:49 UTC (rev 29454)
@@ -1 +1,24 @@
-<include package="zope.app.securitypolicy" />
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="zope"
+    >
+
+  <include package="zope.app.securitypolicy" />
+
+  <securityPolicy
+    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+  <role id="zope.Anonymous" title="Everybody"
+                 description="All users have this role implicitly" />
+  <role id="zope.Manager" title="Site Manager" />
+  <role id="zope.Member" title="Site Member" />
+
+  <!-- Replace the following directive if you don't want public access -->
+  <grant permission="zope.View"
+                  role="zope.Anonymous" />
+  <grant permission="zope.app.dublincore.view"
+                  role="zope.Anonymous" />
+
+  <grantAll role="zope.Manager" />
+
+</configure>

Modified: Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2005-03-12 01:23:13 UTC (rev 29453)
+++ Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2005-03-12 01:29:49 UTC (rev 29454)
@@ -84,21 +84,6 @@
   <include package=".browser"/>
 
 
-  <securityPolicy component=".zopepolicy.ZopeSecurityPolicy" />
-
-  <role id="zope.Anonymous" title="Everybody"
-                 description="All users have this role implicitly" />
-  <role id="zope.Manager" title="Site Manager" />
-  <role id="zope.Member" title="Site Member" />
-
-  <!-- Replace the following directive if you don't want public access -->
-  <grant permission="zope.View"
-                  role="zope.Anonymous" />
-  <grant permission="zope.app.dublincore.view"
-                  role="zope.Anonymous" />
-
-  <grantAll role="zope.Manager" />
-
   <!-- Vocabularies -->
 
   <vocabulary

Modified: Zope3/trunk/src/zope/app/securitypolicy/securitypolicy.zcml
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/securitypolicy.zcml	2005-03-12 01:23:13 UTC (rev 29453)
+++ Zope3/trunk/src/zope/app/securitypolicy/securitypolicy.zcml	2005-03-12 01:29:49 UTC (rev 29454)
@@ -1 +1,24 @@
-<include package="zope.app.securitypolicy" />
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="zope"
+    >
+
+  <include package="zope.app.securitypolicy" />
+
+  <securityPolicy
+    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+  <role id="zope.Anonymous" title="Everybody"
+                 description="All users have this role implicitly" />
+  <role id="zope.Manager" title="Site Manager" />
+  <role id="zope.Member" title="Site Member" />
+
+  <!-- Replace the following directive if you don't want public access -->
+  <grant permission="zope.View"
+                  role="zope.Anonymous" />
+  <grant permission="zope.app.dublincore.view"
+                  role="zope.Anonymous" />
+
+  <grantAll role="zope.Manager" />
+
+</configure>
\ No newline at end of file