[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - metaConfigure.py:1.1.2.15

[Casey Duncan]

Update of /cvs-repository/Zope3/lib/python/Zope/ComponentArchitecture
In directory cvs.zope.org:/tmp/cvs-serv6089

Modified Files:
      Tag: Zope-3x-branch
	metaConfigure.py 
Log Message:
Updated defaultView zcml directive to use new default view name api


=== Zope3/lib/python/Zope/ComponentArchitecture/metaConfigure.py 1.1.2.14 => 1.1.2.15 ===
 
 from hooks import provideAdapter, provideUtility
-from ViewService import provideView
+from ViewService import provideView, setDefaultViewName
 from ResourceService import provideResource
 from SkinService import defineSkin
 from Zope.Configuration.name import resolve
 from Zope.Configuration import namespace
 from Service import defineService, provideService
+from Zope.Configuration.Action import Action
+
 
 def adapter(factory, provides, for_=None):
     if for_ is not None: for_ = resolve(for_)
@@ -43,11 +45,18 @@
     type = resolve(type)
     factory = resolve(factory)
     return [
-        (('view', for_, name, type),
-        provideView, (for_, name, type, factory)),
-        (('view', for_, '', type),
-        provideView, (for_, '', type, factory)),
+        Action(
+            discriminator = ('view', for_, name, type),
+            callable = provideView, 
+            args = (for_, name, type, factory),
+            ),
+        Action(
+            discrimnator = ('defaultViewName', for_, name, type),
+            callable = setDefaultViewName,
+            args = (for_, name, type),
+            )
         ]
+
 
 def resource(component, type, name, layer=''):
     type = resolve(type)