[Zope3-checkins] SVN: Zope3/trunk/ Convert zope.app.mail to use ZCML slugs in package-includes so zope.app

[Fred L. Drake, Jr.]

Log message for revision 24683:
Convert zope.app.mail to use ZCML slugs in package-includes so zope.app
does not have to include zope.app.mail; zope.app is not allowed to depend on
contained packages.



-=-
Added: Zope3/trunk/package-includes/mail-configure.zcml
===================================================================
--- Zope3/trunk/package-includes/mail-configure.zcml	2004-05-14 19:32:43 UTC (rev 24682)
+++ Zope3/trunk/package-includes/mail-configure.zcml	2004-05-14 19:53:07 UTC (rev 24683)
@@ -0,0 +1 @@
+<include package="zope.app.mail"/>


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

Added: Zope3/trunk/package-includes/mail-meta.zcml
===================================================================
--- Zope3/trunk/package-includes/mail-meta.zcml	2004-05-14 19:32:43 UTC (rev 24682)
+++ Zope3/trunk/package-includes/mail-meta.zcml	2004-05-14 19:53:07 UTC (rev 24683)
@@ -0,0 +1 @@
+<include package="zope.app.mail" file="meta.zcml"/>


Property changes on: Zope3/trunk/package-includes/mail-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:32:43 UTC (rev 24682)
+++ Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 19:53:07 UTC (rev 24683)
@@ -18,7 +18,6 @@
   <include package="zope.app.security" />
   <include package="zope.app.event" />
   <include package="zope.app.observable" />
-  <include package="zope.app.mail" />
   <include package="zope.app.annotation" />
   <include package="zope.app.dependable" />
   <include package="zope.app.server" />

Added: Zope3/trunk/src/zope/app/mail/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/mail/PACKAGE.cfg	2004-05-14 19:32:43 UTC (rev 24682)
+++ Zope3/trunk/src/zope/app/mail/PACKAGE.cfg	2004-05-14 19:53:07 UTC (rev 24683)
@@ -0,0 +1,9 @@
+# Pick up the ZCML slugs:
+
+<load>
+
+mail-configure.zcml svn://svn.zope.org/repos/main/Zope3/tags/*/package-includes/mail-configure.zcml
+
+mail-meta.zcml      svn://svn.zope.org/repos/main/Zope3/tags/*/package-includes/mail-meta.zcml
+
+</load>

Added: Zope3/trunk/src/zope/app/mail/SETUP.cfg
===================================================================
--- Zope3/trunk/src/zope/app/mail/SETUP.cfg	2004-05-14 19:32:43 UTC (rev 24682)
+++ Zope3/trunk/src/zope/app/mail/SETUP.cfg	2004-05-14 19:53:07 UTC (rev 24683)
@@ -0,0 +1,5 @@
+# Tell zpkg how to install the ZCML slugs.
+
+<data-files etc/package-includes>
+  pagetemplate-*.zcml
+</data-files>

Modified: Zope3/trunk/src/zope/app/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 19:32:43 UTC (rev 24682)
+++ Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 19:53:07 UTC (rev 24683)
@@ -9,7 +9,6 @@
 <include package="zope.app.security" 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" />
 <include package="zope.app.i18n" file="meta.zcml" />
 <include package="zope.app.process" file="meta.zcml" />
 <include package="zope.app.onlinehelp" file="meta.zcml" />