[Checkins] SVN: zope.securitypolicy/branches/3.4/ Backport fix for LP #564525 from trunk.

[Tres Seaver]

Log message for revision 110988:
  Backport fix for LP #564525 from trunk.
  
  Fixes permission moved from ``zope.app.dublincore`` namespace
  to ``zope.dublincore``, and makes its grant conditional on the presence of
  ``zope.dublincore``.
  

Changed:
  U   zope.securitypolicy/branches/3.4/CHANGES.txt
  U   zope.securitypolicy/branches/3.4/src/zope/securitypolicy/securitypolicy.zcml

-=-
Modified: zope.securitypolicy/branches/3.4/CHANGES.txt
===================================================================
--- zope.securitypolicy/branches/3.4/CHANGES.txt	2010-04-16 16:52:57 UTC (rev 110987)
+++ zope.securitypolicy/branches/3.4/CHANGES.txt	2010-04-16 16:55:52 UTC (rev 110988)
@@ -5,7 +5,9 @@
 3.4.3 (unreleased)
 ------------------
 
-- TBD
+- LP #564525:  fix permission moved from ``zope.app.dublincore`` namespace
+  to ``zope.dublincore``, and make its grant conditional on the presence of
+  ``zope.dublincore``.
 
 3.4.2 (2009-01-28)
 ------------------

Modified: zope.securitypolicy/branches/3.4/src/zope/securitypolicy/securitypolicy.zcml
===================================================================
--- zope.securitypolicy/branches/3.4/src/zope/securitypolicy/securitypolicy.zcml	2010-04-16 16:52:57 UTC (rev 110987)
+++ zope.securitypolicy/branches/3.4/src/zope/securitypolicy/securitypolicy.zcml	2010-04-16 16:55:52 UTC (rev 110988)
@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zope"
     >
 
@@ -17,10 +18,14 @@
   <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 -->
+  <!-- Replace the following directives if you don't want public access -->
   <grant permission="zope.View" role="zope.Anonymous" />
-  <grant permission="zope.app.dublincore.view" role="zope.Anonymous" />
 
+  <configure zcml:condition="installed zope.dublincore">
+    <include package="zope.dublincore" />
+    <grant permission="zope.dublincore.view" role="zope.Anonymous" />
+  </configure>
+
   <grantAll role="zope.Manager" />
 
 </configure>