[Zope3-checkins] CVS: Zope3/src/zope/app/component - configure.zcml:1.1.2.2 metaconfigure.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml metaconfigure.py 
Log Message:
Searched for and changed over 1200 references to Zope.something.

Most of these were either comments, doc strings, or permission ids.

Many were imports or ids in zcml.  (much zcml fixup is still needed.



=== Zope3/src/zope/app/component/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/component/configure.zcml:1.1.2.1	Mon Dec 23 14:31:26 2002
+++ Zope3/src/zope/app/component/configure.zcml	Tue Dec 24 07:50:58 2002
@@ -6,37 +6,37 @@
   <serviceType id='Utilities'
                interface='zope.component.interfaces.IUtilityService' />
   <service serviceType='Utilities'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.utility.utilityService' />
              
   <serviceType id='Adapters'
                interface='zope.component.interfaces.IAdapterService' />
   <service serviceType='Adapters'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.adapter.adapterService' />
 
   <serviceType id='Factories'
                interface='zope.component.interfaces.IFactoryService' />
   <service serviceType='Factories'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.factory.factoryService' />
 
   <serviceType id='Skins'
                interface='zope.component.interfaces.ISkinService' />
   <service serviceType='Skins'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.skin.skinService' />
 
   <serviceType id='Views' 
                interface='zope.component.interfaces.IViewService' />
   <service serviceType='Views'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.view.viewService' />
            
   <serviceType id='Resources'
                interface='zope.component.interfaces.IResourceService' />
   <service serviceType='Resources'
-           permission='Zope.Public'
+           permission='zope.Public'
            component='zope.component.resource.resourceService' />
            
   <hookable name=".getServiceManager" />
@@ -44,20 +44,18 @@
   <hook module="zope.component"
         name="getServiceManager"
         implementation="
-           Zope.App.ComponentArchitecture.hooks.getServiceManager_hook" />
+           zope.app.component.hooks.getServiceManager_hook" />
   
   <serviceType id='Interfaces'
                interface='zope.app.component.globalinterfaceservice.IInterfaceService' />
 	   
   <service 
      serviceType='Interfaces'
-     permission='Zope.Public'
+     permission='zope.Public'
      component=
-        'Zope.App.ComponentArchitecture.InterfaceService.interfaceService' />
+        'zope.app.component.globalinterfaceservice.interfaceService' />
 
   <interface interface="zope.interface.Interface" />
-
-  <include package="Zope.App.ComponentArchitecture.Browser" />
 
 </zopeConfigure>
 


=== Zope3/src/zope/app/component/metaconfigure.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/component/metaconfigure.py:1.1.2.1	Mon Dec 23 14:31:26 2002
+++ Zope3/src/zope/app/component/metaconfigure.py	Tue Dec 24 07:50:58 2002
@@ -69,7 +69,7 @@
     factory = map(_context.resolve, factory.split())
 
     if permission is not None:
-        if permission == 'Zope.Public':
+        if permission == 'zope.Public':
             permission = CheckerPublic
         checker = InterfaceChecker(provides, permission)
         factory.append(lambda c: Proxy(c, checker))
@@ -152,7 +152,7 @@
     if (not allowed_attributes) and (not allowed_interface):
         allowed_attributes = "__call__"
 
-    if permission == 'Zope.Public':
+    if permission == 'zope.Public':
         permission = CheckerPublic
 
     require={}
@@ -330,7 +330,7 @@
         else:
             raise UndefinedService(serviceType)
 
-        if permission == 'Zope.Public':
+        if permission == 'zope.Public':
             permission = CheckerPublic
     
         checker = InterfaceChecker(interface, permission)