[Checkins] SVN: grokui.base/trunk/src/grokui/base/ make sure grokcore.view is properly configured

[Jan-Wijbrand Kolman]

Log message for revision 120628:
  make sure grokcore.view is properly configured

Changed:
  U   grokui.base/trunk/src/grokui/base/configure.zcml
  U   grokui.base/trunk/src/grokui/base/ftesting.zcml

-=-
Modified: grokui.base/trunk/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/configure.zcml	2011-03-01 09:38:50 UTC (rev 120627)
+++ grokui.base/trunk/src/grokui/base/configure.zcml	2011-03-01 09:45:09 UTC (rev 120628)
@@ -6,8 +6,10 @@
   <include package="zope.security" file="meta.zcml" />
   <include package="zope.fanstatic" />
   <include package="grokcore.component" file="meta.zcml" />
+  <include package="grokcore.view" file="meta.zcml" />
   <include package="grokcore.viewlet" file="meta.zcml" />
 
+  <include package="grokcore.view" />
   <include package="grokcore.viewlet" />
   <include package="megrok.menu" file="meta.zcml" />
   <include package="megrok.layout" file="meta.zcml" />

Modified: grokui.base/trunk/src/grokui/base/ftesting.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/ftesting.zcml	2011-03-01 09:38:50 UTC (rev 120627)
+++ grokui.base/trunk/src/grokui/base/ftesting.zcml	2011-03-01 09:45:09 UTC (rev 120628)
@@ -1,9 +1,9 @@
 <configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:grok="http://namespaces.zope.org/grok"
-   xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain="grok"
-   package="grokui.base">
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:grok="http://namespaces.zope.org/grok"
+  xmlns:browser="http://namespaces.zope.org/browser"
+  i18n_domain="grok"
+  package="grokui.base">
 
   <include package="grokcore.component" file="meta.zcml" />
   <include package="grokcore.message" file="ftesting.zcml" />
@@ -26,33 +26,32 @@
   <include package="zope.traversing" />
   <include package="zope.traversing.browser" />
 
-  <include package="grokcore.view" />
   <include package="grokui.base" />
 
   <grok:grok package="grokui.base.tests" />
 
- <browser:defaultView name="index.html" />
+  <browser:defaultView name="index.html" />
 
   <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+  />
 
   <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated User"
-      />
+    id="zope.anybody"
+    title="Unauthenticated User"
+  />
 
   <grant
-      permission="zope.View"
-      principal="zope.anybody"
-      />
+    permission="zope.View"
+    principal="zope.anybody"
+  />
 
   <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw"
-      />
+    id="zope.mgr"
+    title="Manager"
+    login="mgr"
+    password="mgrpw"
+  />
 
   <role id="zope.Manager" title="Site Manager" />
   <grantAll role="zope.Manager" />