[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol - applicationcontrol.py:1.5.10.3

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	applicationcontrol.py 
Log Message:
merged Folder and RootFolder

=== Zope3/src/zope/app/applicationcontrol/applicationcontrol.py 1.5.10.2 => 1.5.10.3 ===
--- Zope3/src/zope/app/applicationcontrol/applicationcontrol.py:1.5.10.2	Fri Sep 12 15:15:06 2003
+++ Zope3/src/zope/app/applicationcontrol/applicationcontrol.py	Fri Sep 12 16:46:25 2003
@@ -16,7 +16,7 @@
 $Id$"""
 
 from zope.app.interfaces.applicationcontrol import IApplicationControl
-from zope.app.content.folder import RootFolder
+from zope.app.content.folder import rootFolder
 from zope.security.checker import ProxyFactory, NamesChecker
 from zope.interface import implements
 from zope.app.location import Location
@@ -34,7 +34,7 @@
         return self.start_time
 
 applicationController = ApplicationControl()
-applicationControllerRoot = ProxyFactory(RootFolder(),
+applicationControllerRoot = ProxyFactory(rootFolder(),
                                          NamesChecker("__class__"))
 applicationController.__parent__ = applicationControllerRoot
 applicationController.__name__ = '++etc++process'