[Zope3-checkins] SVN: Zope3/trunk/ Change the way the zope.app.securitypolicy ZCML is loaded, so it can be

[Fred L. Drake, Jr.]

Log message for revision 24681:
Change the way the zope.app.securitypolicy ZCML is loaded, so it can be
treated as an optional component.  This works for z.a.securitypolicy since it
is not a core component.



-=-
Added: Zope3/trunk/package-includes/securitypolicy-configure.zcml
===================================================================
--- Zope3/trunk/package-includes/securitypolicy-configure.zcml	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/package-includes/securitypolicy-configure.zcml	2004-05-14 19:25:41 UTC (rev 24681)
@@ -0,0 +1 @@
+<include package="zope.app.securitypolicy" />


Property changes on: Zope3/trunk/package-includes/securitypolicy-configure.zcml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Added: Zope3/trunk/package-includes/securitypolicy-meta.zcml
===================================================================
--- Zope3/trunk/package-includes/securitypolicy-meta.zcml	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/package-includes/securitypolicy-meta.zcml	2004-05-14 19:25:41 UTC (rev 24681)
@@ -0,0 +1 @@
+<include package="zope.app.securitypolicy" file="meta.zcml" />


Property changes on: Zope3/trunk/package-includes/securitypolicy-meta.zcml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: Zope3/trunk/src/zope/app/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 19:25:41 UTC (rev 24681)
@@ -104,7 +104,6 @@
   <include package="zope.app.rdb" />
   <include package="zope.app.workflow" />
   <include package="zope.app.catalog"/>
-  <include package="zope.app.securitypolicy" />
   <include package="zope.app.tree" />
   <include package="zope.app.introspector" />
   <include package="zope.app.apidoc" />

Modified: Zope3/trunk/src/zope/app/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 19:25:41 UTC (rev 24681)
@@ -7,7 +7,6 @@
 <include package="zope.app.component" file="meta.zcml" />
 <include package="zope.app.publisher" file="meta.zcml" />
 <include package="zope.app.security" file="meta.zcml" />
-<include package="zope.app.securitypolicy" file="meta.zcml" />
 <include package="zope.app.form.browser" file="meta.zcml" />
 <include package="zope.app.event" file="meta.zcml" />
 <include package="zope.app.mail" file="meta.zcml" />

Added: Zope3/trunk/src/zope/app/securitypolicy/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/PACKAGE.cfg	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/src/zope/app/securitypolicy/PACKAGE.cfg	2004-05-14 19:25:41 UTC (rev 24681)
@@ -0,0 +1,10 @@
+# Load the ZCML slugs for installation into a software or instance
+# home.
+
+<load>
+
+securitypolicy-configure.zcml svn://svn.zope.org/Zope3/trunk/package-includes/securitypolicy-configure.zcml
+
+securitypolicy-meta.zcml      svn://svn.zope.org/Zope3/trunk/package-includes/securitypolicy-meta.zcml
+
+</load>

Added: Zope3/trunk/src/zope/app/securitypolicy/SETUP.cfg
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/SETUP.cfg	2004-05-14 19:14:40 UTC (rev 24680)
+++ Zope3/trunk/src/zope/app/securitypolicy/SETUP.cfg	2004-05-14 19:25:41 UTC (rev 24681)
@@ -0,0 +1,5 @@
+# Tell zpkg how to install the ZCML slugs.
+
+<data-files etc/package-includes>
+  securitypolicy-*.zcml
+</data-files>