[icinga-checkins] icinga.org: icinga-web/mhein/testing: * Fixed config handler issue ( sub module include databases)

git at icinga.org git at icinga.org
Thu Aug 11 17:35:22 CEST 2011


Module: icinga-web
Branch: mhein/testing
Commit: 7ac3e10e7867f2e52233c9f914f7055e14349f08
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7ac3e10e7867f2e52233c9f914f7055e14349f08

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:31:45 2011 +0200

* Fixed config handler issue (sub module include databases)

---

 app/config/config_handlers.xml                     |    2 ++
 .../config/AppKitXIncludeConfigHandler.class.php   |    2 +-
 app/modules/TestDummy/config/module.xml            |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/config/config_handlers.xml b/app/config/config_handlers.xml
index 0f514bd..fcd4065 100755
--- a/app/config/config_handlers.xml
+++ b/app/config/config_handlers.xml
@@ -27,6 +27,8 @@
                 <ae:parameters>
                     <ae:parameter name="query"><![CDATA[//ae:configurations/ae:configuration/databases:databases]]></ae:parameter>
                     <ae:parameter name="pointer"><![CDATA[xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0) xmlns(d=http://agavi.org/agavi/config/parts/databases/1.0) xpointer(//ae:configurations/ae:configuration/d:databases/d:database)]]></ae:parameter>
+                    <ae:parameter name="includeNS">databases</ae:parameter>
+                    <ae:parameter name="debug">true</ae:parameter>
                 </ae:parameters>
 
                 <validation>%core.agavi_dir%/config/xsd/databases.xsd</validation>
diff --git a/app/modules/AppKit/lib/config/AppKitXIncludeConfigHandler.class.php b/app/modules/AppKit/lib/config/AppKitXIncludeConfigHandler.class.php
index 25e8827..a8462b2 100644
--- a/app/modules/AppKit/lib/config/AppKitXIncludeConfigHandler.class.php
+++ b/app/modules/AppKit/lib/config/AppKitXIncludeConfigHandler.class.php
@@ -62,7 +62,7 @@ class AppKitXIncludeConfigHandler extends AgaviXmlConfigHandler {
                             ),
                             false
                         );
-
+            
             if ($includes) {
 
                 foreach($pointers as $pointer) {
diff --git a/app/modules/TestDummy/config/module.xml b/app/modules/TestDummy/config/module.xml
index b8812f8..4b2e8a9 100644
--- a/app/modules/TestDummy/config/module.xml
+++ b/app/modules/TestDummy/config/module.xml
@@ -24,7 +24,7 @@
 				<!-- 
 					Adding module related databases
 				-->
-				<setting name="agavi.include.database">
+				<setting name="agavi.include.databases">
 					<ae:parameter>%core.module_dir%/TestDummy/config/databases.xml</ae:parameter>
 				</setting>
 				





More information about the icinga-checkins mailing list