[Checkins] SVN: zope.introspectorui/trunk/s Add explicit dependency to zope.location and clean up ZCML activation.

[Christian Theune]

Log message for revision 95410:
  Add explicit dependency to zope.location and clean up ZCML activation.
  

Changed:
  U   zope.introspectorui/trunk/setup.py
  U   zope.introspectorui/trunk/src/zope/introspectorui/configure.zcml
  U   zope.introspectorui/trunk/src/zope/introspectorui/ftesting.zcml

-=-
Modified: zope.introspectorui/trunk/setup.py
===================================================================
--- zope.introspectorui/trunk/setup.py	2009-01-29 11:37:14 UTC (rev 95409)
+++ zope.introspectorui/trunk/setup.py	2009-01-29 11:40:33 UTC (rev 95410)
@@ -61,6 +61,7 @@
                         'grokcore.view',
                         'zope.interface',
                         'zope.component',
+                        'zope.location',
                         'zope.introspector',
                         'z3c.autoinclude',
                         ],

Modified: zope.introspectorui/trunk/src/zope/introspectorui/configure.zcml
===================================================================
--- zope.introspectorui/trunk/src/zope/introspectorui/configure.zcml	2009-01-29 11:37:14 UTC (rev 95409)
+++ zope.introspectorui/trunk/src/zope/introspectorui/configure.zcml	2009-01-29 11:40:33 UTC (rev 95410)
@@ -1,11 +1,17 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:grok="http://namespaces.zope.org/grok"
            i18n_domain="zope.introspector">
-  
+
+  <include package="grokcore.view" file="meta.zcml" />
+  <include package="zope.app.component" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
   <include package="zope.introspector" file="meta.zcml" />
+
+  <include package="grokcore.view" />
   <include package="zope.introspector" />
-  <include package="grokcore.view" file="meta.zcml" />
-  <include package="grokcore.view" />
+  <include package="zope.location" />
+  <include package="zope.traversing" />
+
   <grok:grok package="." />
 
 </configure>

Modified: zope.introspectorui/trunk/src/zope/introspectorui/ftesting.zcml
===================================================================
--- zope.introspectorui/trunk/src/zope/introspectorui/ftesting.zcml	2009-01-29 11:37:14 UTC (rev 95409)
+++ zope.introspectorui/trunk/src/zope/introspectorui/ftesting.zcml	2009-01-29 11:40:33 UTC (rev 95410)
@@ -2,15 +2,9 @@
            xmlns:grok="http://namespaces.zope.org/grok"
            i18n_domain="zope.introspector"
            package="zope.introspectorui">
-  
-  <include package="zope.introspector" file="meta.zcml" />
-  <include package="zope.introspector" />
-  <include package="grokcore.view" file="meta.zcml" />
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.app.component" file="meta.zcml" />
-  <include package="grokcore.view" />
-  <include package="zope.traversing" />
-  <grok:grok package="." />
+
+  <include package="zope.introspectorui" />
+
   <grok:grok package=".tests" />
 
 </configure>