[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - configure.zcml:1.6.2.1 resource.py:1.4.20.1 resourcemeta.py:1.11.2.1

[Sidnei da Silva]

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

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	configure.zcml resource.py resourcemeta.py 
Log Message:
Fix the resourceDirectory directive accordingly

=== Zope3/src/zope/app/publisher/browser/configure.zcml 1.6 => 1.6.2.1 ===
--- Zope3/src/zope/app/publisher/browser/configure.zcml:1.6	Mon Aug 11 10:58:07 2003
+++ Zope3/src/zope/app/publisher/browser/configure.zcml	Fri Aug 15 15:03:31 2003
@@ -1,12 +1,10 @@
 <zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
->
-
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:browser="http://namespaces.zope.org/browser">
 
 <serviceType
    id="BrowserMenu"
-   interface="zope.app.interfaces.publisher.browser.IBrowserMenuService" 
+   interface="zope.app.interfaces.publisher.browser.IBrowserMenuService"
    />
 
 <service
@@ -15,7 +13,6 @@
    component=".globalbrowsermenuservice.globalBrowserMenuService"
    />
 
-
 <content class="zope.publisher.browser.BrowserRequest">
   <allow
     interface="zope.publisher.interfaces.browser.IBrowserApplicationRequest"
@@ -55,7 +52,7 @@
   <allow attributes="__call__" />
 </content>
 
-<browser:page 
+<browser:page
     name=""
     class="zope.app.publisher.browser.resources.Resources"
     for="zope.app.interfaces.services.service.IServiceManagerContainer"


=== Zope3/src/zope/app/publisher/browser/resource.py 1.4 => 1.4.20.1 ===
--- Zope3/src/zope/app/publisher/browser/resource.py:1.4	Tue May 27 10:18:22 2003
+++ Zope3/src/zope/app/publisher/browser/resource.py	Fri Aug 15 15:03:31 2003
@@ -21,6 +21,7 @@
 from zope.context import getWrapperContainer, getInnerWrapperData
 from zope.context import ContextMethod
 from zope.app.traversing import joinPath
+from zope.component.interfaces import IResourceService
 
 class Resource:
 
@@ -33,6 +34,11 @@
             name = name[12:]
 
         service = getWrapperContainer(wrapped_self)
+        while not IResourceService.isImplementedBy(service):
+            name = "%s/%s" % (getInnerWrapperData(service)['name'],
+                              name)
+            service = getWrapperContainer(service)
+
         site = getWrapperContainer(service)
 
         skin = wrapped_self.request.getPresentationSkin()


=== Zope3/src/zope/app/publisher/browser/resourcemeta.py 1.11 => 1.11.2.1 ===
--- Zope3/src/zope/app/publisher/browser/resourcemeta.py:1.11	Mon Aug 11 10:58:07 2003
+++ Zope3/src/zope/app/publisher/browser/resourcemeta.py	Fri Aug 15 15:03:31 2003
@@ -65,7 +65,8 @@
     if permission == 'zope.Public':
         permission = CheckerPublic
 
-    checker = NamesChecker(allowed_names, permission)
+    checker = NamesChecker(allowed_names + ('__getitem__', 'get'),
+                           permission)
 
     if not os.path.isdir(directory):
         raise ConfigurationError(