[icinga-checkins] icinga.org: icinga-web/mhein/extlayout: Removed "config/plugins/", modules must specify configs in module.xml now

git at icinga.org git at icinga.org
Fri Apr 23 10:56:03 CEST 2010


Module: icinga-web
Branch: mhein/extlayout
Commit: 45242a1bd82765e8df477b723fde65386031ab5f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=45242a1bd82765e8df477b723fde65386031ab5f

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed Apr 21 10:24:37 2010 +0200

Removed "config/plugins/", modules must specify configs in module.xml now

---

 plugins/bin/manifestAgaviConfiguratorTask.php |   27 +------------------------
 plugins/bin/manifestFileSelectorTask.php      |   13 +-----------
 plugins/build.xml                             |    9 +------
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/plugins/bin/manifestAgaviConfiguratorTask.php b/plugins/bin/manifestAgaviConfiguratorTask.php
index 22ee51d..b4757f9 100644
--- a/plugins/bin/manifestAgaviConfiguratorTask.php
+++ b/plugins/bin/manifestAgaviConfiguratorTask.php
@@ -22,13 +22,6 @@ class ManifestAgaviConfiguratorTask extends Task {
 	private $xmlObject = null;
 	
 	/**
-	 * Flag that determines if a "plugins/PLUGIN_NAME.xml" include should
-	 * be inserted to icinga.xml  
-	 * @var Boolean
-	 */
-	private $noInclude = false;
-	
-	/**
 	 * Sets the manifest filename
 	 * @param String $str
 	 */
@@ -43,15 +36,7 @@ class ManifestAgaviConfiguratorTask extends Task {
     public function setXMLObject(DOMDocument $xml) {
     	$this->xmlObject = $xml;
     }
-	
-    /**
-     * Sets the setNoInclude flag
-     * @param $bool
-     */
-    public function setNoInclude($bool) {
-    	$this->noInclude = $bool;
-    }
-    
+
     /**
      * returns the manifest filename
      * @return String Filename of manifest.xml
@@ -68,14 +53,6 @@ class ManifestAgaviConfiguratorTask extends Task {
     	return $this->xmlObject;
     }
     
-    /**
-     * Returns the noInclude flag
-     * @return Boolean 
-     */
-    public function getNoInclude() {
-    	return $this->noInclude;
-    }
-    
     public function init() {
 		
     }
@@ -101,8 +78,6 @@ class ManifestAgaviConfiguratorTask extends Task {
 			$file = $file->nodeName;
 			$this->setConfigVars($file);
 		}
-		if(!$this->getNoInclude())
-			$this->addSettingsInclude();
 	
 		// set routes and translations
 		$this->registerRoutes();
diff --git a/plugins/bin/manifestFileSelectorTask.php b/plugins/bin/manifestFileSelectorTask.php
index 37352be..76fdf29 100644
--- a/plugins/bin/manifestFileSelectorTask.php
+++ b/plugins/bin/manifestFileSelectorTask.php
@@ -38,9 +38,6 @@ class manifestFileSelectorTask extends manifestBaseClass {
 	protected function fetchFileList() {
 		$files;
 		switch($this->getSource())	{
-			case 'Config':
-				$files = $this->getConfigList();
-				break;
 			case 'Plugin':
 				$files = $this->getFileList();
 				break;
@@ -93,15 +90,7 @@ class manifestFileSelectorTask extends manifestBaseClass {
 		$icingaPath = $this->project->getUserProperty("PATH_Icinga");
 		return str_replace($icingaPath,"",$path);
 	}
-	
-	protected function getConfigList() {
-		$config = new FileSet();
-		$config->setDir($this->project->getUserProperty("PATH_Icinga"));
-		$name = $this->project->getUserProperty("PLUGIN_Name");
-		$config->setIncludes("app/config/plugins/".$name.".xml");
-		return $config;	
-	}
-	
+
 	protected function getDBModels() {
 		$xml = $this->getXMLObject();
 		$db = $xml->Database;
diff --git a/plugins/build.xml b/plugins/build.xml
index fd94abf..3d83e5f 100644
--- a/plugins/build.xml
+++ b/plugins/build.xml
@@ -160,8 +160,7 @@
 		
 		<echo>Removing files</echo>
 		<delete dir="${PATH_Icinga}/app/modules/${PLUGIN_Name}" />	
-		<delete file="${PATH_Icinga}/app/config/plugins/${PLUGIN_Name}.xml" />	
-	
+
 		<echo>Plugin successfully deleted!</echo>
 	</target>
 		
@@ -183,7 +182,6 @@
 		<taskdef name="manifestSettingsExtractor" classname="bin.manifestSettingsExtractorTask"/>
 	
 		<property name="manifest" value="${coreDir}/manifest.xml"></property>
-		<manifestFileSelector file="${manifest}" source="Config" propertyName="config"/>  
 		<manifestFileSelector file="${manifest}" source="Plugin" propertyName="plugin"/>
 	 	<manifestFileSelector file="${manifest}" source="Doctrine" propertyName="models"/>
 		<manifestFileSelector file="${manifest}" source="SQL" propertyName="sqlRoutines"/>
@@ -191,10 +189,7 @@
 		<phingcall target="structure-create" />	
 		
 		<!-- Copy agavi module and config to src -->
-		<echo>Saving config...</echo>
-		<copy todir="${PLUGIN_Name}/src">
-			<fileset refid="config" />
-		</copy>
+	
 		<echo>Saving plugin Data...</echo>		
 		<copy todir="${PLUGIN_Name}/src">
 			<fileset refid="plugin" />





More information about the icinga-checkins mailing list