Ok, big merge. here's the new xml-config stuff in action. There's a few

[mir.git] / source / mir / storage / Database.java

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index ce5f4c5..3c75365 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -60,20 +60,21 @@ public class Database implements StorageObject {
    * @param   String confFilename Dateiname der Konfigurationsdatei
    */
   public Database() {
-    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");
+    //theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Database.Logfile"));
+    theLog = Logfile.getInstance(this.getClass().getName());
+    String database_username=DatabaseConfig.getProp("Database.Username");
+    String database_password=DatabaseConfig.getProp("Database.Password");
+    String database_host=DatabaseConfig.getProp("Database.Host");
+    String theAdaptorName=DatabaseConfig.getProp("Database.Adaptor");
     try {
       theEntityClass = Class.forName("mir.entity.GenericEntity");
       theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
-      defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
+      defaultLimit = Integer.parseInt(DatabaseConfig.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  );
-      MirConfig.addBroker(database_driver,database_url);
-      myBroker=MirConfig.getBroker();
+      DatabaseConfig.addBroker(database_driver,database_url);
+      myBroker=DatabaseConfig.getBroker();
     }
     catch (Exception e){
       theLog.printError("Bei Konstruktion von Database() with " + theAdaptorName + " -- " +e.toString());