X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmir%2Fstorage%2FDatabase.java;h=f7c6ba893cee147cb07ffc344956a41ef61e41e6;hb=86b6f499b413c722acc895346ac5186405b0c44c;hp=4f73324c63fbb8ca5f1799ddaa277144d226d90c;hpb=78e59ae06a886d0894ca037c72b6d8ca301dfa1a;p=mir.git

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 4f73324c..f7c6ba89 100755
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -60,20 +60,20 @@ public class Database implements StorageObject {
 	 * @param   String confFilename Dateiname der Konfigurationsdatei
 	 */
 	public Database() {
-  	theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("Database.Logfile"));
-		String database_username=Configuration.getProperty("Database.Username");
-		String database_password=Configuration.getProperty("Database.Password");
-		String database_host=Configuration.getProperty("Database.Host");
-		String theAdaptorName=Configuration.getProperty("Database.Adaptor");
+  	theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Database.Logfile"));
+		String database_username=MirConfig.getProp("Database.Username");
+		String database_password=MirConfig.getProp("Database.Password");
+		String database_host=MirConfig.getProp("Database.Host");
+		String theAdaptorName=MirConfig.getProp("Database.Adaptor");
 		try {
 			theEntityClass = Class.forName("mir.entity.GenericEntity");
 			theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
-			defaultLimit = Integer.parseInt(Configuration.getProperty("Database.Limit"));
+			defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
 			database_driver=theAdaptor.getDriver();
 			database_url=theAdaptor.getURL(database_username,database_password,database_host);
 			theLog.printDebugInfo("adding Broker with: " +database_driver+":"+database_url  );
-			Configuration.addBroker(database_driver,database_url);
-			myBroker=Configuration.getBroker();
+			MirConfig.addBroker(database_driver,database_url);
+			myBroker=MirConfig.getBroker();
 		}
 		catch (Exception e){
 			theLog.printError("Bei Konstruktion von Database() with " + theAdaptorName + " -- " +e.toString());