[Checkins] SVN: five.hashedresource/trunk/src/five/hashedresource/ removed our own zcml directive in favour of a much simpler way to register things

[Thomas Lotze]

Log message for revision 101900:
  removed our own zcml directive in favour of a much simpler way to register things

Changed:
  U   five.hashedresource/trunk/src/five/hashedresource/configure.zcml
  D   five.hashedresource/trunk/src/five/hashedresource/meta.zcml
  D   five.hashedresource/trunk/src/five/hashedresource/metaconfigure.py

-=-
Modified: five.hashedresource/trunk/src/five/hashedresource/configure.zcml
===================================================================
--- five.hashedresource/trunk/src/five/hashedresource/configure.zcml	2009-07-14 13:04:39 UTC (rev 101899)
+++ five.hashedresource/trunk/src/five/hashedresource/configure.zcml	2009-07-14 13:11:59 UTC (rev 101900)
@@ -1,11 +1,27 @@
 <configure
   xmlns="http://namespaces.zope.org/zope"
+  xmlns:zcml="http://namespaces.zope.org/zcml"
   xmlns:browser="http://namespaces.zope.org/browser">
 
   <include package="z3c.hashedresource" />
 
-  <include file="meta.zcml" />
+  <adapter factory=".url.HashingURL" />
+  <adapter zcml:condition="have devmode"
+    factory="z3c.hashedresource.hash.ContentsHash"
+    for="Products.Five.browser.resource.DirectoryResource"
+    />
+  <adapter zcml:condition="have devmode"
+    factory="z3c.hashedresource.hash.ContentsHash"
+    for="Products.Five.browser.resource.FileResource"
+    />
+  <adapter zcml:condition="not-have devmode"
+    factory="z3c.hashedresource.hash.CachingContentsHash"
+    for="Products.Five.browser.resource.DirectoryResource"
+    />
+  <adapter zcml:condition="not-have devmode"
+    factory="z3c.hashedresource.hash.CachingContentsHash"
+    for="Products.Five.browser.resource.FileResource"
+    />
 
-
 </configure>
 

Deleted: five.hashedresource/trunk/src/five/hashedresource/meta.zcml
===================================================================
--- five.hashedresource/trunk/src/five/hashedresource/meta.zcml	2009-07-14 13:04:39 UTC (rev 101899)
+++ five.hashedresource/trunk/src/five/hashedresource/meta.zcml	2009-07-14 13:11:59 UTC (rev 101900)
@@ -1,16 +0,0 @@
-<configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:meta="http://namespaces.zope.org/meta">
-
-  <meta:directives
-    namespace="http://namespaces.zope.org/five">
-
-    <meta:directive
-      name="hashedResourceDirectory"
-      schema="zope.app.publisher.browser.metadirectives.IResourceDirectoryDirective"
-      handler=".metaconfigure.hashedResourceDirectory"
-      />
-
-  </meta:directives>
-
-</configure>

Deleted: five.hashedresource/trunk/src/five/hashedresource/metaconfigure.py
===================================================================
--- five.hashedresource/trunk/src/five/hashedresource/metaconfigure.py	2009-07-14 13:04:39 UTC (rev 101899)
+++ five.hashedresource/trunk/src/five/hashedresource/metaconfigure.py	2009-07-14 13:11:59 UTC (rev 101900)
@@ -1,46 +0,0 @@
-import Products.Five.browser.metaconfigure
-import zope.publisher.interfaces.browser
-import five.hashedresource.url
-import z3c.hashedresource.hash
-import zope.component.zcml
-import zope.traversing.browser.interfaces
-from zope.publisher.interfaces.browser import IBrowserRequest
-
-
-
-def hashedResourceDirectory(
-        _context, name, directory,
-        layer=zope.publisher.interfaces.browser.IDefaultBrowserLayer,
-        permission='zope.Public'):
-    already_registered = len(_context.actions)
-    Products.Five.browser.metaconfigure.resourceDirectory(
-        _context, name, directory, layer, permission)
-    new_classes =[r[0][1] for r in _context.actions[already_registered:]
-        if isinstance(r[0], tuple) and r[0][0] ==  'five:initialize:class']
-    for new_class in new_classes:
-        _context.action(
-            discriminator = ('adapter',
-                             (new_class, IBrowserRequest),
-                             zope.traversing.browser.interfaces.IAbsoluteURL,
-                             ''),
-            callable = zope.component.zcml.handler,
-            args = ('registerAdapter',
-                    five.hashedresource.url.HashingURL,
-                    (new_class, IBrowserRequest),
-                    zope.traversing.browser.interfaces.IAbsoluteURL,
-                    '',
-                    _context.info),
-        )
-        _context.action(
-            discriminator = ('adapter',
-                             new_class,
-                             z3c.hashedresource.interfaces.IResourceContentsHash,
-                             ''),
-            callable = zope.component.zcml.handler,
-            args = ('registerAdapter',
-                    z3c.hashedresource.hash.ContentsHash,
-                    (new_class,),
-                    z3c.hashedresource.interfaces.IResourceContentsHash,
-                    '',
-                    _context.info),
-        )