[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Added additional siteconfig ( #refs 1187)

git at icinga.org git at icinga.org
Sun Mar 20 11:26:09 CET 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 3a38f14dca99ae92443ba18dc65d32b1fb89b292
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=3a38f14dca99ae92443ba18dc65d32b1fb89b292

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Fri Feb 11 17:27:51 2011 +0100

* Added additional siteconfig (#refs 1187)

---

 app/config/routing.xml               |   22 ++++++++++++++++++++--
 app/modules/Cronks/config/module.xml |   20 +++++++++++++++++++-
 etc/sitecfg/module.site.xml          |   20 ++++++++++++++++++++
 etc/sitecfg/routing.modules.xml      |    9 +++++++++
 4 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/app/config/routing.xml b/app/config/routing.xml
index 19ae428..64e6e19 100755
--- a/app/config/routing.xml
+++ b/app/config/routing.xml
@@ -5,7 +5,12 @@
 
 			<!-- INDEX -->
 			<route name="index_page" pattern="^/$" module="Web" action="Icinga.PortalView"/>
+			<route name="modules" pattern="^/modules" stop="false">
+				<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="routing.modules.xml" xpointer="xmlns(r=http://agavi.org/agavi/config/parts/routing/1.0) xpointer(//r:module_routes/r:configuration[@context='web']/node())">
+					<xi:fallback></xi:fallback>
+				</xi:include>
 
+			</route>
 			<!--
 				* AppKit routes
 			-->
@@ -204,9 +209,22 @@
 		</routes>
 	</ae:configuration>
 	
+	<ae:configuration context="console">
+		<route name="modules" pattern="^/modules">	
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="routing.modules.xml" xpointer="xmlns(r=http://agavi.org/agavi/config/parts/routing/1.0) xpointer(//r:module_routes/r:configuration[@context='console']/node())">
+					<xi:fallback></xi:fallback>
+			</xi:include>
+		</route>
+
+	</ae:configuration>
+	
 	<ae:configuration context="soap">
-		<route name="serviceMain" pattern="getIcingaAPI" action="Icinga.ApiSearch" module="Web"/>
-		
+		<route name="modules" pattern="^/modules">	
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="routing.modules.xml" xpointer="xmlns(r=http://agavi.org/agavi/config/parts/routing/1.0) xpointer(//r:module_routes/r:configuration[@context='soap']/node())">
+					<xi:fallback></xi:fallback>
+			</xi:include>
+		</route>
+		<route name="serviceMain" pattern="getIcingaAPI" action="Icinga.ApiSearch" module="Web"/>		
 	</ae:configuration>
 		
 </ae:configurations>
diff --git a/app/modules/Cronks/config/module.xml b/app/modules/Cronks/config/module.xml
index a56cd14..03de73e 100755
--- a/app/modules/Cronks/config/module.xml
+++ b/app/modules/Cronks/config/module.xml
@@ -13,6 +13,11 @@
 				<setting name="appkit_module.app.css_files">
 					<!-- JIT - JavaScript InfoVis Toolkit -->
 					<ae:parameter>/styles/statusmap.css</ae:parameter>
+					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml" xpointer="xmlns(m=http://agavi.org/agavi/config/parts/module/1.0) xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0) xpointer(//m:settings/m:setting[@name='appkit_module.app.css_files.site']/node())">
+						<xi:fallback></xi:fallback>
+					</xi:include>
+
+
 				</setting>
 
 				<setting name="appkit_module.app.javascript_files">
@@ -42,6 +47,11 @@
 
 					<ae:parameter>%core.root_dir%/lib/jit/Extras/excanvas.js</ae:parameter>
 					<ae:parameter>%core.root_dir%/lib/jit/jit-yc.js</ae:parameter>
+					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml" xpointer="xmlns(m=http://agavi.org/agavi/config/parts/module/1.0) xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0) xpointer(//m:settings/m:setting[@name='appkit_module.app.javascript_files.site']/node())">
+						<xi:fallback></xi:fallback>
+					</xi:include>
+
+
 				</setting>
 
 				<setting name="appkit_module.app.javascript_dynamic">
@@ -50,6 +60,9 @@
 					<ae:parameter name="Cronks.CommandHandler">%core.module_dir%/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js</ae:parameter>
 					<ae:parameter name="Cronks.JitStatusMap">%core.module_dir%/Cronks/templates/System/js/JitStatusMap.js</ae:parameter>
 					<ae:parameter name="Cronks.CronkTrigger">%core.module_dir%/Cronks/templates/System/js/CronkTrigger.js</ae:parameter>
+					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml" xpointer="xmlns(m=http://agavi.org/agavi/config/parts/module/1.0) xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0) xpointer(//m:settings/m:setting[@name='appkit_module.app.javascript_dynamic.site']/node())">
+						<xi:fallback></xi:fallback>
+					</xi:include>
 				</setting>
 
 				<!--
@@ -90,6 +103,11 @@
 					</xi:include>
 				</setting>
 				
+				<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml" xpointer="xmlns(m=http://agavi.org/agavi/config/parts/module/1.0) xpointer(//m:settings/node())">
+					<xi:fallback></xi:fallback>
+				</xi:include>
+
+		
 				<setting name="cronks">
 					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cronks.xml" xpointer="xpointer(//settings/setting[@name='cronks']/node())" />
 					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cronks.site.xml" xpointer="xpointer(//settings/setting[@name='cronks']/node())">
@@ -100,4 +118,4 @@
 		</module>
 		
 	</ae:configuration>
-</ae:configurations>
\ No newline at end of file
+</ae:configurations>
diff --git a/etc/sitecfg/module.site.xml b/etc/sitecfg/module.site.xml
new file mode 100644
index 0000000..7889d47
--- /dev/null
+++ b/etc/sitecfg/module.site.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://agavi.org/agavi/config/parts/module/1.0"> 
+<!-- 
+	+++ Site configuration file +++
+		This file won't be overwritten
+
+-->
+	<setting name="Nosetting">
+
+
+	</setting>
+
+	<setting name="appkit_module.app.css_files.site">
+	</setting>
+
+	<setting name="appkit_module.app.javascript_dynamic.site">
+	</setting>
+	<setting xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" name="appkit_module.app.javascript_files.site"> 	
+	</setting>
+</settings>
diff --git a/etc/sitecfg/routing.modules.xml b/etc/sitecfg/routing.modules.xml
new file mode 100644
index 0000000..3583e19
--- /dev/null
+++ b/etc/sitecfg/routing.modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module_routes xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://agavi.org/agavi/config/parts/routing/1.0">
+	<configuration context="web">
+	</configuration>
+	<configuration context="console">
+	</configuration>
+	<configuration context="soap">
+	</configuration>
+</module_routes>





More information about the icinga-checkins mailing list