[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - globalbrowsermenuservice.py:1.11 i18nresourcemeta.py:1.6 icon.py:1.6 metaconfigure.py:1.5 resourcemeta.py:1.7 resources.py:1.6 viewmeta.py:1.14

[R. Sean Bowman]

Update of /cvs-repository/Zope3/src/zope/app/publisher/browser
In directory cvs.zope.org:/tmp/cvs-serv21737/zope/app/publisher/browser

Modified Files:
	globalbrowsermenuservice.py i18nresourcemeta.py icon.py 
	metaconfigure.py resourcemeta.py resources.py viewmeta.py 
Log Message:
moved non core CA service names to zope/app/services/servicenames.py,
renamed ResourceService to Resources


=== Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py:1.10	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py	Tue Feb 11 21:17:27 2003
@@ -21,7 +21,7 @@
 from zope.configuration.interfaces import INonEmptyDirective
 from zope.configuration.interfaces import ISubdirectiveHandler
 
-from zope.component.servicenames import Interfaces
+from zope.app.services.servicenames import Interfaces
 
 from zope.security.checker import CheckerPublic
 from zope.security.management import getSecurityManager


=== Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py:1.5	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py	Tue Feb 11 21:17:27 2003
@@ -25,7 +25,7 @@
 from zope.configuration.action import Action
 from zope.configuration.exceptions import ConfigurationError
 
-from zope.component.servicenames import ResourceService
+from zope.app.services.servicenames import Resources
 
 from zope.publisher.interfaces.browser import IBrowserPresentation
 
@@ -115,7 +115,7 @@
                 discriminator = ('i18n-resource', self.name, self.type,
                                  self.layer),
                 callable = handler,
-                args = (ResourceService, 'provideResource', self.name, self.type,
+                args = (Resources, 'provideResource', self.name, self.type,
                         factory, self.layer)
                 )
             ]


=== Zope3/src/zope/app/publisher/browser/icon.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/publisher/browser/icon.py:1.5	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/icon.py	Tue Feb 11 21:17:27 2003
@@ -26,7 +26,7 @@
 from zope.app.traversing.namespace import getResourceInContext
 from zope.publisher.interfaces.browser import IBrowserPresentation
 from zope.configuration.exceptions import ConfigurationError
-from zope.component.servicenames import Interfaces
+from zope.app.services.servicenames import Interfaces
 
 __metaclass__ = type
 


=== Zope3/src/zope/app/publisher/browser/metaconfigure.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/publisher/browser/metaconfigure.py:1.4	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/metaconfigure.py	Tue Feb 11 21:17:27 2003
@@ -19,7 +19,7 @@
 from zope.configuration.action import Action
 
 from zope.publisher.interfaces.browser import IBrowserPresentation
-from zope.component.servicenames import Interfaces
+from zope.app.services.servicenames import Interfaces
 
 from zope.app.component.metaconfigure \
      import defaultView as _defaultView, skin as _skin, handler


=== Zope3/src/zope/app/publisher/browser/resourcemeta.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/publisher/browser/resourcemeta.py:1.6	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/resourcemeta.py	Tue Feb 11 21:17:27 2003
@@ -21,7 +21,7 @@
 from zope.configuration.action import Action
 from zope.configuration.exceptions import ConfigurationError
 
-from zope.component.servicenames import ResourceService
+from zope.app.services.servicenames import Resources
 
 from zope.publisher.interfaces.browser import IBrowserPresentation
 
@@ -56,7 +56,7 @@
         Action(
             discriminator = ('resource', name, IBrowserPresentation, layer),
             callable = handler,
-            args = (ResourceService, 'provideResource',
+            args = (Resources, 'provideResource',
                     name, IBrowserPresentation, factory, layer),
             )
         ]


=== Zope3/src/zope/app/publisher/browser/resources.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.5	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/resources.py	Tue Feb 11 21:17:27 2003
@@ -20,7 +20,7 @@
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.component import getService
-from zope.component.servicenames import ResourceService
+from zope.app.services.servicenames import Resources as ResourceService
 from zope.proxy.context import ContextWrapper
 from zope.proxy.context import ContextMethod
 from zope.exceptions import NotFoundError


=== Zope3/src/zope/app/publisher/browser/viewmeta.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/publisher/browser/viewmeta.py:1.13	Tue Feb 11 10:59:53 2003
+++ Zope3/src/zope/app/publisher/browser/viewmeta.py	Tue Feb 11 21:17:27 2003
@@ -29,7 +29,7 @@
 from zope.configuration.action import Action
 from zope.configuration.exceptions import ConfigurationError
 
-from zope.component.servicenames import Interfaces
+from zope.app.services.servicenames import Interfaces
 
 from zope.publisher.interfaces.browser import IBrowserPresentation
 from zope.publisher.interfaces.browser import IBrowserPublisher