[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: Added schedules config, cronk-import/export and "fromConfig"

git at icinga.org git at icinga.org
Tue Apr 13 16:34:52 CEST 2010


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

Author: jmosshammer <jmosshammer at ws-jmosshammer.(none)>
Date:   Tue Apr 13 16:34:04 2010 +0200

Added schedules config, cronk-import/export and "fromConfig"

---

 app/config/icinga.xml                            |    3 ---
 app/config/schedules.xml                         |    4 +---
 plugins/bin/doctrineDBBuilderTask.php            |    2 +-
 plugins/bin/manifestAgaviConfiguratorTask.php    |    2 +-
 plugins/bin/manifestDependencyCheckerTask.php    |    2 +-
 plugins/bin/manifestFileSelectorTask.php         |    2 +-
 plugins/bin/manifestMapper.php                   |    2 +-
 plugins/bin/manifestRouteExtractorTask.php       |    2 +-
 plugins/bin/manifestRouteRemover.php             |    2 +-
 plugins/bin/manifestRouteRemoverTask.php         |    2 +-
 plugins/bin/manifestSettingsExtractorTask.php    |    2 +-
 plugins/bin/manifestSettingsRemoverTask.php      |    2 +-
 plugins/bin/manifestSnippetExtractorTask.php     |    2 +-
 plugins/bin/manifestStore.php                    |    2 +-
 plugins/bin/manifestTranslationExtractorTask.php |    4 ++--
 plugins/bin/manifestXPathRemoverTask.php         |    2 +-
 plugins/bin/snippetInjectorTask.php              |    2 +-
 plugins/bin/sqlRunnerTask.php                    |    2 +-
 plugins/build.xml                                |    2 +-
 plugins/db.ini                                   |    1 +
 20 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/config/icinga.xml b/app/config/icinga.xml
index ad4aa1f..83b3b4a 100644
--- a/app/config/icinga.xml
+++ b/app/config/icinga.xml
@@ -38,7 +38,6 @@
   <setting name="appkit.autoloader.prefixes">
 	 <parameter>AppKit</parameter>
 	 <parameter>Icinga</parameter>
-	 <parameter>Heatmap</parameter>
   </setting>
   <!--
 		Doctrine setup
@@ -57,7 +56,6 @@
 	-->
   <setting name="appkit.menu_extender">
 	 <parameter>IcingaMenuExtender</parameter>
-	 <parameter>HeatmapMenuExtender</parameter>
   </setting>
   <!-- 
 		Eventhandling
@@ -347,5 +345,4 @@
 	-->
   <!-- Include settings for simple-data provider -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="simple_data_provider.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plugins/Heatmap.xml"/>
 </settings>
diff --git a/app/config/schedules.xml b/app/config/schedules.xml
index 28cb515..f1261e7 100644
--- a/app/config/schedules.xml
+++ b/app/config/schedules.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<setting name="schedules" xmlns="http://agavi.org/agavi/1.0/config">
-	
-</setting>
+<setting xmlns="http://agavi.org/agavi/1.0/config" name="schedules"/>
diff --git a/plugins/bin/doctrineDBBuilderTask.php b/plugins/bin/doctrineDBBuilderTask.php
index b05773c..de8bffe 100644
--- a/plugins/bin/doctrineDBBuilderTask.php
+++ b/plugins/bin/doctrineDBBuilderTask.php
@@ -23,7 +23,7 @@ class doctrineDBBuilderTask extends Task {
 			default:
 				throw new BuildException("Unknown db action ".$action."!");
 		}	
-			
+			 
 	}
 	
 	protected function checkForDoctrine() {
diff --git a/plugins/bin/manifestAgaviConfiguratorTask.php b/plugins/bin/manifestAgaviConfiguratorTask.php
index c2767da..f833837 100644
--- a/plugins/bin/manifestAgaviConfiguratorTask.php
+++ b/plugins/bin/manifestAgaviConfiguratorTask.php
@@ -267,7 +267,7 @@ class ManifestAgaviConfiguratorTask extends Task {
 					continue;
 				$route = $child;
 				break;
-			}			
+			}		
 			if($routingSearcher->query("//default:configuration[@context='".$context."']/default:routes/default:route[@name='".$routeName."']")->item(0)) {
 				echo("Route ".$routeName." already exists - skipping\n");
 				continue;
diff --git a/plugins/bin/manifestDependencyCheckerTask.php b/plugins/bin/manifestDependencyCheckerTask.php
index 58240b8..8d317d2 100644
--- a/plugins/bin/manifestDependencyCheckerTask.php
+++ b/plugins/bin/manifestDependencyCheckerTask.php
@@ -28,7 +28,7 @@ class manifestDependencyCheckerTask extends manifestBaseClass {
 				echo "PHP Versions and extensions are correct\n";
 				break;
 		}
-	}
+	} 
 	
 	protected function checkIcingaWeb(SimpleXMLElement $dependency) {
 		$version = (String) $dependency->Version;
diff --git a/plugins/bin/manifestFileSelectorTask.php b/plugins/bin/manifestFileSelectorTask.php
index 574e5f8..37352be 100644
--- a/plugins/bin/manifestFileSelectorTask.php
+++ b/plugins/bin/manifestFileSelectorTask.php
@@ -44,7 +44,7 @@ class manifestFileSelectorTask extends manifestBaseClass {
 			case 'Plugin':
 				$files = $this->getFileList();
 				break;
-			case 'Doctrine':
+			case 'Doctrine': 
 				$files = $this->getDBModels();
 				break;
 			case 'SQL':
diff --git a/plugins/bin/manifestMapper.php b/plugins/bin/manifestMapper.php
index 345e50b..1d41644 100644
--- a/plugins/bin/manifestMapper.php
+++ b/plugins/bin/manifestMapper.php
@@ -26,7 +26,7 @@ class manifestMapper implements FileNameMapper {
 			$this->buildRules();
 		return self::$rules;	
 	}    
-    
+     
     public function main($sourceFilename) {
 
 		$rules = $this->getRules();
diff --git a/plugins/bin/manifestRouteExtractorTask.php b/plugins/bin/manifestRouteExtractorTask.php
index 064f5af..2688f78 100644
--- a/plugins/bin/manifestRouteExtractorTask.php
+++ b/plugins/bin/manifestRouteExtractorTask.php
@@ -28,7 +28,7 @@ class ManifestRouteExtractorTask extends Task {
     }
     
     public function init() {
-		
+		 
     }
 	
     public function main() {
diff --git a/plugins/bin/manifestRouteRemover.php b/plugins/bin/manifestRouteRemover.php
index a763204..7b282ff 100644
--- a/plugins/bin/manifestRouteRemover.php
+++ b/plugins/bin/manifestRouteRemover.php
@@ -28,7 +28,7 @@ class ManifestRouteExtractorTask extends manifestBaseClass {
 		$configDOM->formatOutput = true;
 		$configDOM->save($configPath);
 		$this->reformat($configPath);
-	}
+	} 
 	
 	protected function reformat($configPath) {
 		// Reformat the xml (triple whitespaces to tab)
diff --git a/plugins/bin/manifestRouteRemoverTask.php b/plugins/bin/manifestRouteRemoverTask.php
index 0e6c634..21c1a83 100644
--- a/plugins/bin/manifestRouteRemoverTask.php
+++ b/plugins/bin/manifestRouteRemoverTask.php
@@ -29,7 +29,7 @@ class ManifestRouteRemoverTask extends manifestBaseClass {
 			$this->checkIfNodeIsEmpty($node);
 				
 			echo "Removing route ".$name."\n";
-		}
+		} 
 
 		$configDOM->formatOutput = true;
 		$configDOM->save($configPath);
diff --git a/plugins/bin/manifestSettingsExtractorTask.php b/plugins/bin/manifestSettingsExtractorTask.php
index bc0b53e..3f58a89 100644
--- a/plugins/bin/manifestSettingsExtractorTask.php
+++ b/plugins/bin/manifestSettingsExtractorTask.php
@@ -25,7 +25,7 @@ class ManifestSettingsExtractorTask extends Task {
     
     public function init() {
 		
-    }
+    } 
 	
     public function main() {
     	$file = $this->getFile();
diff --git a/plugins/bin/manifestSettingsRemoverTask.php b/plugins/bin/manifestSettingsRemoverTask.php
index db999f7..093d23b 100644
--- a/plugins/bin/manifestSettingsRemoverTask.php
+++ b/plugins/bin/manifestSettingsRemoverTask.php
@@ -22,7 +22,7 @@ class ManifestSettingsRemoverTask extends Task {
     public function init() {
 		
     }
-	
+	 
     public function main() {
 	 	$file = $this->getFile();
     	$DOM = new DOMDocument("1.0","UTF-8");
diff --git a/plugins/bin/manifestSnippetExtractorTask.php b/plugins/bin/manifestSnippetExtractorTask.php
index 6ee05fd..b91308d 100644
--- a/plugins/bin/manifestSnippetExtractorTask.php
+++ b/plugins/bin/manifestSnippetExtractorTask.php
@@ -23,7 +23,7 @@ class ManifestSnippetExtractorTask extends manifestBaseClass {
 		return $this->toFile;
 	}
 	public function getExtractorMarks() {
-		return $this->extractorMarks;
+		return  $this->extractorMarks;
 	}
 
     public function main() {
diff --git a/plugins/bin/manifestStore.php b/plugins/bin/manifestStore.php
index 551f458..87c0984 100644
--- a/plugins/bin/manifestStore.php
+++ b/plugins/bin/manifestStore.php
@@ -32,7 +32,7 @@ class manifestStore {
 				if(!$project->getProperty("PATH_".(String) $pathName))
 					$project->setUserProperty("PATH_".(String) $pathName,(String) $path);
 			}
-		}
+		} 
 		$properties = $project->getUserProperties();
 		// Resolve reference in paths
 		foreach($properties as $property=>$value) {
diff --git a/plugins/bin/manifestTranslationExtractorTask.php b/plugins/bin/manifestTranslationExtractorTask.php
index 5b32c11..237824d 100644
--- a/plugins/bin/manifestTranslationExtractorTask.php
+++ b/plugins/bin/manifestTranslationExtractorTask.php
@@ -25,10 +25,10 @@ class ManifestTranslationExtractorTask extends Task {
 	}
     public function getXMLObject() {
     	return $this->xmlObject;
-    }
+    } 
     
     public function init() {
-		
+		 
     }
 	
     public function main() {
diff --git a/plugins/bin/manifestXPathRemoverTask.php b/plugins/bin/manifestXPathRemoverTask.php
index 33ed51e..c7566e1 100644
--- a/plugins/bin/manifestXPathRemoverTask.php
+++ b/plugins/bin/manifestXPathRemoverTask.php
@@ -28,7 +28,7 @@ class ManifestXPathRemoverTask extends manifestBaseClass {
 	}
 	public function setUri($uri) {
 		$this->uri = $uri;
-	}
+	} 
 	
 	public function removeRoutes() {
 		$manifest = $this->getXMLObject();
diff --git a/plugins/bin/snippetInjectorTask.php b/plugins/bin/snippetInjectorTask.php
index 2a06e8b..c5643f9 100644
--- a/plugins/bin/snippetInjectorTask.php
+++ b/plugins/bin/snippetInjectorTask.php
@@ -15,7 +15,7 @@ class snippetInjectorTask extends Task {
  			echo ("Invalid snippet file");
  			return null;
 		}
-	
+	 
 		foreach($snippets as $snippet) {
 			$file = str_replace("%PATH_Icinga%",$this->project->getUserProperty("PATH_Icinga"),$snippet["file"]);
 			$mark;
diff --git a/plugins/bin/sqlRunnerTask.php b/plugins/bin/sqlRunnerTask.php
index feb0d09..7d14dd2 100644
--- a/plugins/bin/sqlRunnerTask.php
+++ b/plugins/bin/sqlRunnerTask.php
@@ -13,7 +13,7 @@ class sqlRunnerTask extends Task {
 		$this->checkForDoctrine();
 		$this->processSQL();
 	}
-	
+	  
 	protected function checkForDoctrine() {
 		$icinga = $this->project->getUserProperty("PATH_Icinga");
 		$doctrinePath = $icinga."/".$this->project->getUserProperty("PATH_Doctrine");
diff --git a/plugins/build.xml b/plugins/build.xml
index afb0e81..d235265 100644
--- a/plugins/build.xml
+++ b/plugins/build.xml
@@ -83,7 +83,7 @@
 		<property name="buildAdditional" value="false" />
 		<available file="additional.xml" property="buildAdditional" value="true" />
 		<if>
-			<equals arg1="${buildAdditional}" arg2="true" />
+			<equals arg1="${buildAdditional}" arg2="1" />
 			<then>
 				<phing phingfile="additional.xml" inheritAll="true" />
 			</then>
diff --git a/plugins/db.ini b/plugins/db.ini
index 3401628..c25a1c3 100644
--- a/plugins/db.ini
+++ b/plugins/db.ini
@@ -19,3 +19,4 @@ dbpass = "icinga"
 
 
 
+ 





More information about the icinga-checkins mailing list