[icinga-checkins] icinga.org: icinga-web/master: Modified AppKit paths

[git at icinga.org]

Module: icinga-web
Branch: master
Commit: f1e727b5f9e3e7b5db77cc377bc1f459c5ed15b1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=f1e727b5f9e3e7b5db77cc377bc1f459c5ed15b1

Author: jmosshammer <jmosshammer at ws-jmosshammer.(none)>
Date:   Fri May 21 17:27:50 2010 +0200

Modified AppKit paths

---

 modules/bin/db.ini                    |    2 +-
 modules/bin/doctrineDBBuilderTask.php |    9 ++++-----
 modules/build.properties              |    2 +-
 modules/etc/db.ini                    |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/bin/db.ini b/modules/bin/db.ini
index d2a2b7b..b16240e 100755
--- a/modules/bin/db.ini
+++ b/modules/bin/db.ini
@@ -13,7 +13,7 @@ dbname = "icinga_web"
 
 ;Credentials 
 dbuser = "icinga_web"
-dbpass = "icinga_web"
+dbpass = "icinga"
 
 
 
diff --git a/modules/bin/doctrineDBBuilderTask.php b/modules/bin/doctrineDBBuilderTask.php
index 2c5bd70..257d37f 100755
--- a/modules/bin/doctrineDBBuilderTask.php
+++ b/modules/bin/doctrineDBBuilderTask.php
@@ -71,8 +71,6 @@ class doctrineDBBuilderTask extends Task {
 	public function buildDBFromModels() {	
 		$icinga = $this->project->getUserProperty("PATH_Icinga");
 		$modelPath = $icinga."/app/modules/".$this->project->getUserProperty("MODULE_Name")."/lib/";
-		self::$AppKitPath = $icinga."/lib/appkit/";
-		require_once(self::$AppKitPath."/auth/AppKitUserPreferences.interface.php");
 		
 		Doctrine::loadModels($this->models);
 		$tables = Doctrine::getLoadedModels();
@@ -80,9 +78,10 @@ class doctrineDBBuilderTask extends Task {
 		foreach($tables as $table) {
 			$tableList[] = Doctrine::getTable($table)->getTableName();	
 		}
-	
-		Doctrine::loadModels($icinga."/lib/appkit/database/models/generated");
-		Doctrine::loadModels($icinga."/lib/appkit/database/models");
+
+		$appKitPath = $this->project->getUserProperty("PATH_AppKit");
+		Doctrine::loadModels($icinga.$appKitPath."database/models/generated");
+		Doctrine::loadModels($icinga.$appKitPath."database/models");
 		Doctrine::createTablesFromModels(array($this->models.'/generated',$this->models));
 	
 		file_put_contents($modelPath."/.models.cfg",implode(",",$tableList));
diff --git a/modules/build.properties b/modules/build.properties
index 6e21c5c..ecd2ac2 100755
--- a/modules/build.properties
+++ b/modules/build.properties
@@ -1,2 +1,2 @@
 #Default settings for module installer
-icinga.path=/usr/local/iw-modules
+icinga.path=/usr/local/icinga-web
diff --git a/modules/etc/db.ini b/modules/etc/db.ini
index c25a1c3..8d3a116 100755
--- a/modules/etc/db.ini
+++ b/modules/etc/db.ini
@@ -9,10 +9,10 @@ dbtype = "mysql"
 ;Address of the database
 host = "127.0.0.1"
 port = "3306"
-dbname = "icinga"
+dbname = "icinga_web"
 
 ;Credentials 
-dbuser = "icinga"
+dbuser = "icinga_web"
 dbpass = "icinga"