[Zope3-checkins] CVS: Zope3/src/zope/app/services - package.py:1.5 viewpackage.py:1.9 configurationmanager.py:NONE

[Jim Fulton]

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

Modified Files:
	package.py viewpackage.py 
Removed Files:
	configurationmanager.py 
Log Message:
Merged the configurationmanager module with the configuration module.



=== Zope3/src/zope/app/services/package.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/package.py:1.4	Wed Mar 19 14:57:31 2003
+++ Zope3/src/zope/app/services/package.py	Fri Mar 21 16:06:26 2003
@@ -20,7 +20,7 @@
 
 from zope.app.component.nextservice import getNextServiceManager
 from zope.app.container.btree import BTreeContainer
-from zope.app.services.configurationmanager import ConfigurationManager
+from zope.app.services.configuration import ConfigurationManager
 from zope.app.traversing import getPath
 
 from zope.proxy.context import ContextMethod


=== Zope3/src/zope/app/services/viewpackage.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/viewpackage.py:1.8	Wed Mar 19 14:57:31 2003
+++ Zope3/src/zope/app/services/viewpackage.py	Fri Mar 21 16:06:26 2003
@@ -24,8 +24,7 @@
 from zope.proxy.context import getItem, getAttr
 from zope.proxy.context import ContextMethod
 from zope.app.interfaces.services.configuration import Active
-from zope.app.services.configurationmanager \
-     import ConfigurationManager
+from zope.app.services.configuration import ConfigurationManager
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.proxy.introspection import removeAllProxies
 from zope.app.services.view import PageConfiguration

=== Removed File Zope3/src/zope/app/services/configurationmanager.py ===