[Checkins] SVN: zamplugin.control/trunk/ Moved zcml package include of ``zope.applicationcontrol`` from `app.zcml` to `configure.zcml` so you can include `configure.zcml` (as usual) when using this plug-in.

[Michael Howitz]

Log message for revision 120091:
  Moved zcml package include of ``zope.applicationcontrol`` from `app.zcml` to `configure.zcml` so you can include `configure.zcml` (as usual) when using this plug-in.
  

Changed:
  U   zamplugin.control/trunk/CHANGES.txt
  U   zamplugin.control/trunk/src/zamplugin/control/app.zcml
  U   zamplugin.control/trunk/src/zamplugin/control/configure.zcml

-=-
Modified: zamplugin.control/trunk/CHANGES.txt
===================================================================
--- zamplugin.control/trunk/CHANGES.txt	2011-02-04 07:32:30 UTC (rev 120090)
+++ zamplugin.control/trunk/CHANGES.txt	2011-02-04 07:53:28 UTC (rev 120091)
@@ -5,7 +5,9 @@
 0.6.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Moved zcml package include of ``zope.applicationcontrol`` from `app.zcml`
+  to `configure.zcml` so you can include `configure.zcml` (as usual) when
+  using this plug-in.
 
 
 0.6.0 (2011-02-03)

Modified: zamplugin.control/trunk/src/zamplugin/control/app.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/app.zcml	2011-02-04 07:32:30 UTC (rev 120090)
+++ zamplugin.control/trunk/src/zamplugin/control/app.zcml	2011-02-04 07:53:28 UTC (rev 120091)
@@ -6,9 +6,6 @@
   <!-- use app configuration from zam.skin -->
   <include package="zam.skin" file="app.zcml" />
 
-  <!-- zope app package configuration -->
-  <include package="zope.applicationcontrol" />
-
   <!-- zam skin configuration -->
   <include package="zamplugin.control" />
 

Modified: zamplugin.control/trunk/src/zamplugin/control/configure.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/configure.zcml	2011-02-04 07:32:30 UTC (rev 120090)
+++ zamplugin.control/trunk/src/zamplugin/control/configure.zcml	2011-02-04 07:53:28 UTC (rev 120091)
@@ -2,6 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zam">
 
+  <include package="zope.applicationcontrol" />
   <include file="plugin.zcml" />
 
   <!-- plugin management for IControlPluginLayer -->
@@ -29,7 +30,7 @@
 
 
     <!-- configure zope defaults (we do not include original configure.zcml -->
-    <adapter 
+    <adapter
         for="zope.app.applicationcontrol.interfaces.IApplicationControl"
         provides="zope.app.applicationcontrol.interfaces.IRuntimeInfo"
         factory="zope.app.applicationcontrol.runtimeinfo.RuntimeInfo"
@@ -37,7 +38,7 @@
         />
 
     <!-- configure zope defaults (we do not include original configure.zcml -->
-    <utility 
+    <utility
         component="zope.app.applicationcontrol.zopeversion.ZopeVersionUtility"
         provides="zope.app.applicationcontrol.interfaces.IZopeVersion"
         />