[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Traversing - EtcNamespace.py:1.5 SkinNamespace.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Traversing
In directory cvs.zope.org:/tmp/cvs-serv13062/Zope/App/Traversing

Modified Files:
	EtcNamespace.py SkinNamespace.py 
Log Message:
Refactored ApplicationControl so that the application controller is no
longer a root object. Rather, to avoid traversing a database object to
get to it, we create a separate RootFolder just so we can traverse it
to get to the application controller.

We (Guido and I) also renamed the global instance to have a name
starting with a lower case name. This caused the most file changes.

To do: rip out the application controller view registry in favor of
the actions menu.



=== Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py:1.4	Fri Jul 12 15:28:32 2002
+++ Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py	Fri Dec 20 14:45:45 2002
@@ -16,11 +16,13 @@
 $Id$
 """
 from Zope.App.OFS.ApplicationControl.ApplicationControl \
-     import ApplicationController
+     import applicationController
 from Namespaces import provideNamespaceHandler
 from Exceptions import UnexpectedParameters
 from Zope.Exceptions import NotFoundError
 
+from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
+
 def etc(name, parameters, pname, ob, request):
     # XXX
 
@@ -37,8 +39,8 @@
     if parameters:
         raise UnexpectedParameters(parameters)
 
-    if name == 'ApplicationController' and ob is None:
-        return ApplicationController
+    if name == 'ApplicationController' and ob.__class__ == RootFolder:
+        return applicationController
 
     if name != 'Services':
         


=== Zope3/lib/python/Zope/App/Traversing/SkinNamespace.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/Traversing/SkinNamespace.py:1.2	Sat Jul 13 10:18:36 2002
+++ Zope3/lib/python/Zope/App/Traversing/SkinNamespace.py	Fri Dec 20 14:45:45 2002
@@ -16,8 +16,6 @@
 $Id$
 """
 
-from Zope.App.OFS.ApplicationControl.ApplicationControl \
-     import ApplicationController
 from Namespaces import provideNamespaceHandler
 from Exceptions import UnexpectedParameters
 from Zope.Exceptions import NotFoundError