[Checkins] SVN: zope.app.security/trunk/ Common permissions were moved to zope.security.

[Dan Korostelev]

Log message for revision 97989:
  Common permissions were moved to zope.security.

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/src/zope/app/security/standardpermissions.zcml

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-12 15:51:22 UTC (rev 97988)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-12 15:53:02 UTC (rev 97989)
@@ -22,8 +22,9 @@
   to the ``zope.security`` package. Backward-compatibility imports are
   provided.
 
-- The registration of the "zope.Public" permission has been moved to
-  ``zope.security``. Its configure.zcml is now included by this package.
+- The registration of the "zope.Public" permission as well as some other
+  common permissions, like "zope.View" have been moved to ``zope.security``.
+  Its configure.zcml is now included by this package.
 
 - The "protect" function is now a no-op and is not needed anymore, because
   zope.security now knows about i18n messages and __name__ and __parent__

Modified: zope.app.security/trunk/src/zope/app/security/standardpermissions.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/standardpermissions.zcml	2009-03-12 15:51:22 UTC (rev 97988)
+++ zope.app.security/trunk/src/zope/app/security/standardpermissions.zcml	2009-03-12 15:53:02 UTC (rev 97989)
@@ -3,24 +3,11 @@
     i18n_domain="zope"
     >
 
-  <!-- XXX: this will be moved -->
+  <!-- Common permissions were moved into zope.security -->
+  <include package="zope.security" file="permissions.zcml" />
 
+  <!-- These are either deprecated or TTW/Application Server specific -->
   <permission
-      id="zope.View"
-      title="[view-permission] View"
-      />
-
-  <permission
-      id="zope.Security"
-      title="[change-security-settings-permission] Change security settings"
-      />
-
-  <permission
-      id="zope.ManageContent"
-      title="[manage-content-permission] Manage Content"
-      />
-
-  <permission
       id="zope.ManageBindings"
       title="[manage-service-bindings-permission] Manage Service Bindings"
       />
@@ -32,16 +19,6 @@
       />
 
   <permission
-      id="zope.ManageServices"
-      title="[manage-services-permission] Manage Services"
-      />
-
-  <permission
-      id="zope.ManageSite"
-      title="[manage-site-permission] Manage Site"
-      />
-
-  <permission
       id="zope.ManagePrincipals"
       title="[manage-principal-permission] Manage Principals"
       />