[Zope3-checkins] SVN: Zope3/trunk/ zope.app.adapter is required by zope.app.utility, so cannot be split out

[Fred L. Drake, Jr.]

Log message for revision 24694:
zope.app.adapter is required by zope.app.utility, so cannot be split out


-=-
Deleted: Zope3/trunk/package-includes/adapter-configure.zcml
===================================================================
--- Zope3/trunk/package-includes/adapter-configure.zcml	2004-05-14 21:07:30 UTC (rev 24693)
+++ Zope3/trunk/package-includes/adapter-configure.zcml	2004-05-14 21:08:34 UTC (rev 24694)
@@ -1 +0,0 @@
-<include package="zope.app.adapter" />

Modified: Zope3/trunk/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/PACKAGE.cfg	2004-05-14 21:07:30 UTC (rev 24693)
+++ Zope3/trunk/src/zope/app/PACKAGE.cfg	2004-05-14 21:08:34 UTC (rev 24694)
@@ -26,6 +26,8 @@
 
 # Code:
 
+# zope.app.adapter is needed by zope.app.utility, which is part of zope.app
+adapter
 annotation
 applicationcontrol
 _app.py

Deleted: Zope3/trunk/src/zope/app/adapter/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/adapter/PACKAGE.cfg	2004-05-14 21:07:30 UTC (rev 24693)
+++ Zope3/trunk/src/zope/app/adapter/PACKAGE.cfg	2004-05-14 21:08:34 UTC (rev 24694)
@@ -1,7 +0,0 @@
-# Pick up the ZCML slugs:
-
-<load>
-
-adapter-configure.zcml svn://svn.zope.org/repos/main/Zope3/tags/*/package-includes/adapter-configure.zcml
-
-</load>

Deleted: Zope3/trunk/src/zope/app/adapter/SETUP.cfg
===================================================================
--- Zope3/trunk/src/zope/app/adapter/SETUP.cfg	2004-05-14 21:07:30 UTC (rev 24693)
+++ Zope3/trunk/src/zope/app/adapter/SETUP.cfg	2004-05-14 21:08:34 UTC (rev 24694)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files etc/package-includes>
-  pagetemplate-*.zcml
-</data-files>

Modified: Zope3/trunk/src/zope/app/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 21:07:30 UTC (rev 24693)
+++ Zope3/trunk/src/zope/app/configure.zcml	2004-05-14 21:08:34 UTC (rev 24694)
@@ -13,6 +13,7 @@
   <include package=".generations" file="subscriber.zcml" />
 
   <!-- Ordinary Application (non-view) configuration) -->
+  <include package="zope.app.adapter" />
   <include package="zope.app.component" />
   <include package="zope.app.interface" />
   <include package="zope.app.security" />
@@ -100,7 +101,6 @@
   <include package="zope.app.catalog"/>
   <include package="zope.app.tree" />
   <include package="zope.app.introspector" />
-  <include package="zope.app.apidoc" />
 
 
   <!-- Content types -->