[Zope3-checkins] SVN: Zope3/trunk/ Restore pagetemplate to the original way to include the ZCML; zope.app

[Fred L. Drake, Jr.]

Log message for revision 24673:
Restore pagetemplate to the original way to include the ZCML; zope.app
always requires zope.app.pagetemplate.



-=-
Deleted: Zope3/trunk/package-includes/pagetemplate-configure.zcml
===================================================================
--- Zope3/trunk/package-includes/pagetemplate-configure.zcml	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/package-includes/pagetemplate-configure.zcml	2004-05-14 18:53:50 UTC (rev 24673)
@@ -1 +0,0 @@
-<include package="zope.app.pagetemplate" />

Deleted: Zope3/trunk/package-includes/pagetemplate-meta.zcml
===================================================================
--- Zope3/trunk/package-includes/pagetemplate-meta.zcml	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/package-includes/pagetemplate-meta.zcml	2004-05-14 18:53:50 UTC (rev 24673)
@@ -1 +0,0 @@
-<include package="zope.app.pagetemplate" file="meta.zcml" />

Modified: Zope3/trunk/src/zope/app/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 18:53:50 UTC (rev 24673)
@@ -33,6 +33,7 @@
   <include package="zope.app.publisher" />
   <include package="zope.app.traversing" />
   <include package="zope.app.index" />
+  <include package="zope.app.pagetemplate" />
   <include package="zope.app.interpreter" />
   <include package="zope.app.renderer" />
   <include package=".generations" />

Modified: Zope3/trunk/src/zope/app/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/src/zope/app/meta.zcml	2004-05-14 18:53:50 UTC (rev 24673)
@@ -14,6 +14,7 @@
 <include package="zope.app.i18n" file="meta.zcml" />
 <include package="zope.app.process" file="meta.zcml" />
 <include package="zope.app.onlinehelp" file="meta.zcml" />
+<include package="zope.app.pagetemplate" file="meta.zcml" />
 <include package="zope.app.fssync" file="meta.zcml" />
 <include package="zope.app.dav" file="meta.zcml" />
 <include package="zope.app.rdb" file="meta.zcml" />

Deleted: Zope3/trunk/src/zope/app/pagetemplate/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/PACKAGE.cfg	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/src/zope/app/pagetemplate/PACKAGE.cfg	2004-05-14 18:53:50 UTC (rev 24673)
@@ -1,7 +0,0 @@
-<load>
-
-pagetemplate-meta.zcml svn://svn.zope.org/repos/main/Zope3/tags/*/package-includes/ pagetemplate-meta.zcml
-
-pagetemplate-configure.zcml svn://svn.zope.org/repos/main/Zope3/tags/*/package-includes/ pagetemplate-configure.zcml
-
-</load>

Deleted: Zope3/trunk/src/zope/app/pagetemplate/SETUP.cfg
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/SETUP.cfg	2004-05-14 18:34:51 UTC (rev 24672)
+++ Zope3/trunk/src/zope/app/pagetemplate/SETUP.cfg	2004-05-14 18:53:50 UTC (rev 24673)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files etc/package-includes>
-  pagetemplate-*.zcml
-</data-files>