[Zope3-checkins] CVS: Zope3/src/zope/app - configure.zcml:1.23 meta.zcml:1.11

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app
In directory cvs.zope.org:/tmp/cvs-serv4594

Modified Files:
	configure.zcml meta.zcml 
Log Message:
Merged from fdrake-zconfig-in-zope-3-branch:
Replace zope.app.startup with zope.app.process; these contain mostly the same
code, but zope.app.process supports the new startup events instead of calling
various initialization routines directly, and supports configuration of the
appserver using ZConfig.


=== Zope3/src/zope/app/configure.zcml 1.22 => 1.23 ===
--- Zope3/src/zope/app/configure.zcml:1.22	Tue Jun 24 14:58:11 2003
+++ Zope3/src/zope/app/configure.zcml	Wed Jun 25 11:29:32 2003
@@ -99,7 +99,7 @@
   <include package="zope.app.form" />
   <include package="zope.app.cache" />
   <include package="zope.app.dublincore" />
-  <include package="zope.app.startup" />
+  <include package="zope.app.process" />
   <include package="zope.app.index" />
   <include package="zope.app.pagetemplate" />
   <include package="zope.app.onlinehelp" />


=== Zope3/src/zope/app/meta.zcml 1.10 => 1.11 ===
--- Zope3/src/zope/app/meta.zcml:1.10	Tue May 20 11:46:38 2003
+++ Zope3/src/zope/app/meta.zcml	Wed Jun 25 11:29:32 2003
@@ -11,7 +11,7 @@
 <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.startup" file="meta.zcml" />
+<include package="zope.app.process" file="meta.zcml" />
 <include package="zope.app.applicationcontrol" file="meta.zcml" />
 <include package="zope.app.onlinehelp" file="meta.zcml" />
 <include package="zope.app.xml" file="meta.zcml" />