[z3-checkins] r10828 - z3/Five/trunk

[philikon at codespeak.net]

Author: philikon
Date: Mon Apr 18 21:17:02 2005
New Revision: 10828

Added:
   z3/Five/trunk/browser.zcml   (contents, props changed)
Modified:
   z3/Five/trunk/configure.zcml
Log:
move browser-specific configuration directives out to browser.zcml.

We should really grow a Five.browser subpackage now. Lots and lots of stuff
is browser specific and lots of other isn't.  We're starting to get a mess.
Anyway, I think I'll propose a restructuring plan along with my test cleanups


Added: z3/Five/trunk/browser.zcml
==============================================================================
--- (empty file)
+++ z3/Five/trunk/browser.zcml	Mon Apr 18 21:17:02 2005
@@ -0,0 +1,63 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:browser="http://namespaces.zope.org/browser">
+
+  <browser:page
+      for="*"
+      name="absolute_url"
+      class=".browser.AbsoluteURL"
+      permission="zope.Public"
+      allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+      />
+
+  <browser:page
+      for="*"
+      template="five_template.pt"
+      name="five_template"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      for="*"
+      name="standard_macros"
+      permission="zope2.View"
+      class=".browser.StandardMacros"
+      allowed_interface="zope.interface.common.mapping.IItemMapping"
+      />
+
+  <view
+      for="*"
+      factory=".browser.AbsoluteURL"
+      type="zope.publisher.interfaces.http.IHTTPRequest"
+      permission="zope.Public"
+      provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+      />
+
+  <browser:page
+      for="zope.app.traversing.interfaces.IContainmentRoot"
+      name="absolute_url"
+      class=".browser.SiteAbsoluteURL"
+      permission="zope.Public"
+      allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+      />
+
+  <view
+      for="zope.app.traversing.interfaces.IContainmentRoot"
+      factory=".browser.SiteAbsoluteURL"
+      type="zope.publisher.interfaces.http.IHTTPRequest"
+      permission="zope.Public"
+      provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+      />
+
+  <browser:view
+      for=".interfaces.IObjectManager"
+      name="+"
+      class=".adding.ContentAdding"
+      permission="zope2.ViewManagementScreens"
+      >
+
+    <browser:page name="index.html"  template="adding.pt" />
+    <browser:page name="action.html" attribute="action" />
+
+  </browser:view>
+
+</configure>

Modified: z3/Five/trunk/configure.zcml
==============================================================================
--- z3/Five/trunk/configure.zcml	(original)
+++ z3/Five/trunk/configure.zcml	Mon Apr 18 21:17:02 2005
@@ -6,6 +6,7 @@
   <include file="services.zcml" />
   <include file="interfaces.zcml" />
   <include file="permissions.zcml" />
+  <include file="browser.zcml" />
 
   <include package="zope.app.traversing" />
   <include package="zope.app.form.browser" />
@@ -29,65 +30,6 @@
       provides=".interfaces.IBrowserDefault"
       />
 
-  <browser:page
-      for="*"
-      name="absolute_url"
-      class=".browser.AbsoluteURL"
-      permission="zope.Public"
-      allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
-      />
-
-  <browser:page
-      for="*"
-      template="five_template.pt"
-      name="five_template"
-      permission="zope.Public"
-      />
-
-  <browser:page
-    for="*"
-    name="standard_macros"
-    permission="zope2.View"
-    class=".browser.StandardMacros"
-    allowed_interface="zope.interface.common.mapping.IItemMapping"
-    />
-        
-  <view
-      for="*"
-      factory=".browser.AbsoluteURL"
-      type="zope.publisher.interfaces.http.IHTTPRequest"
-      permission="zope.Public"
-      provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
-      />
-
-  <browser:page
-      for="zope.app.traversing.interfaces.IContainmentRoot"
-      name="absolute_url"
-      class=".browser.SiteAbsoluteURL"
-      permission="zope.Public"
-      allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
-      />
-
-  <view
-      for="zope.app.traversing.interfaces.IContainmentRoot"
-      factory=".browser.SiteAbsoluteURL"
-      type="zope.publisher.interfaces.http.IHTTPRequest"
-      permission="zope.Public"
-      provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
-      />
-
-  <browser:view
-      for=".interfaces.IObjectManager"
-      name="+"
-      class=".adding.ContentAdding"
-      permission="zope2.ViewManagementScreens"
-      >
-
-    <browser:page name="index.html"  template="adding.pt" />
-    <browser:page name="action.html" attribute="action" />
-
-  </browser:view>
-
   <adapter
       for=".interfaces.IObjectManager"
       factory=".adding.ObjectManagerNameChooser"