[Checkins] SVN: zope.errorview/branches/jj-i18n/src/zope/errorview/ straighten out the registrations

[Jan-Wijbrand Kolman]

Log message for revision 122010:
  straighten out the registrations

Changed:
  U   zope.errorview/branches/jj-i18n/src/zope/errorview/browser.zcml
  U   zope.errorview/branches/jj-i18n/src/zope/errorview/http.zcml
  U   zope.errorview/branches/jj-i18n/src/zope/errorview/tests/ftesting.zcml

-=-
Modified: zope.errorview/branches/jj-i18n/src/zope/errorview/browser.zcml
===================================================================
--- zope.errorview/branches/jj-i18n/src/zope/errorview/browser.zcml	2011-06-28 11:39:25 UTC (rev 122009)
+++ zope.errorview/branches/jj-i18n/src/zope/errorview/browser.zcml	2011-06-28 12:18:52 UTC (rev 122010)
@@ -4,9 +4,14 @@
   xmlns:i18n="http://namespaces.zope.org/i18n"
   i18n_domain="zope.errorview">
 
+  <include package="zope.errorview" file="http.zcml" />
+
+  <include package="zope.i18n" file="meta.zcml"/>
   <include package="zope.browserpage" file="meta.zcml" />
-  <include package="." file="http.zcml" />
-  
+
+  <include package="zope.i18n"/>
+  <include package="zope.browserpage" />
+
   <i18n:registerTranslations directory="i18n/locales" />
 
   <browser:page

Modified: zope.errorview/branches/jj-i18n/src/zope/errorview/http.zcml
===================================================================
--- zope.errorview/branches/jj-i18n/src/zope/errorview/http.zcml	2011-06-28 11:39:25 UTC (rev 122009)
+++ zope.errorview/branches/jj-i18n/src/zope/errorview/http.zcml	2011-06-28 12:18:52 UTC (rev 122010)
@@ -3,8 +3,13 @@
   xmlns:browser="http://namespaces.zope.org/browser">
 
   <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml"/>
   <include package="zope.publisher" file="meta.zcml" />
 
+  <include package="zope.component"/>
+  <include package="zope.security"/>
+  <include package="zope.publisher"/>
+
   <view
     factory=".http.ExceptionView"
     for="zope.interface.common.interfaces.IException"

Modified: zope.errorview/branches/jj-i18n/src/zope/errorview/tests/ftesting.zcml
===================================================================
--- zope.errorview/branches/jj-i18n/src/zope/errorview/tests/ftesting.zcml	2011-06-28 11:39:25 UTC (rev 122009)
+++ zope.errorview/branches/jj-i18n/src/zope/errorview/tests/ftesting.zcml	2011-06-28 12:18:52 UTC (rev 122010)
@@ -2,15 +2,6 @@
   xmlns="http://namespaces.zope.org/zope"
   xmlns:browser="http://namespaces.zope.org/browser">
 
-  <include package="zope.component" file="meta.zcml"/>
-  <include package="zope.security" file="meta.zcml"/>
-  <include package="zope.i18n" file="meta.zcml"/>
-
-  <include package="zope.component"/>
-  <include package="zope.security"/>
-  <include package="zope.publisher"/>
-  <include package="zope.i18n"/>
-
   <include package="zope.errorview" file="browser.zcml" />
 
   <utility