dbpoolman instead of connectionbroker

[mir.git] / source / mir / misc / MirConfig.java

diff --git a/source/mir/misc/MirConfig.java b/source/mir/misc/MirConfig.java
index 0cf4859..9910b55 100755 (executable)
--- a/source/mir/misc/MirConfig.java
+++ b/source/mir/misc/MirConfig.java
@@ -6,7 +6,8 @@ import  java.io.*;
 import  java.util.*;
 import  java.lang.*;
 import  com.javaexchange.dbConnectionBroker.*;
-import         mir.storage.StorageObjectException;
+import  mir.storage.StorageObjectException;
+import com.codestudio.util.*;
 
 /**
  * Title:        Mir
@@ -79,7 +80,7 @@ public class MirConfig extends Configuration {
     return (String)configHash.get("Home") +
            (String)configHash.get(propName);
   }
-
+  
   public static void addBroker(String driver, String URL) throws StorageObjectException {
 
     String username,passwd,min,max,log,reset;
@@ -92,6 +93,44 @@ public class MirConfig extends Configuration {
       log=getProp("Home") + configHash.get("Database.PoolLog");
       reset=getProp("Database.poolResetTime");
 
+      System.err.println("-- making Broker for -"
+                          +driver+" - " +URL
+                          + " log " + log + " user "
+                          + username + " pass: " + passwd);
+
+      JDBCPoolMetaData meta = new JDBCPoolMetaData();
+      meta.setDbname("mir");
+      meta.setDriver(driver);
+      meta.setURL(URL);
+      meta.setUserName(username);
+      meta.setPassword(passwd);
+      meta.setJNDIName("mir");
+      meta.setMaximumSize(Integer.parseInt(max));
+      meta.setMinimumSize(Integer.parseInt(min));
+      
+      JDBCPool pool = SQLManager.getInstance().createPool(meta);
+      SQLManager.getInstance().addPool("mir",pool);
+          
+      if (pool!=null){
+        instances++;
+        brokerHash.put("Pool.broker",pool);
+      }
+
+    } // end if
+  }
+
+  public static void addBroker2(String driver, String URL) throws StorageObjectException {
+
+    String username,passwd,min,max,log,reset;
+
+    if(!brokerHash.containsKey("Pool.broker")){
+      username=getProp("Database.Username");
+      passwd=getProp("Database.Password");
+      min=getProp("Database.poolMin");
+      max=getProp("Database.poolMax");
+      log=getProp("Home") + configHash.get("Database.PoolLog");
+      reset=getProp("Database.poolResetTime");
+
       try{
         System.err.println("-- making Broker for -"
                             +driver+" - " +URL
@@ -107,37 +146,11 @@ public class MirConfig extends Configuration {
       } catch(IOException e){
         System.err.println("Der ConnectionBroker konnte nicht initializiert werden"+ e.toString());e.printStackTrace();
         throw new StorageObjectException(e.toString());
-           }
+      }
     } // end if
   }
 
   /**
-   * Liefert DBConnectionBroker einer Configuration zurueck
-   * @param confFilename
-   * @return DBConnectionBroker
-   */
-  public static DbConnectionBroker getBroker() {
-    DbConnectionBroker broker=null;
-    broker=(DbConnectionBroker)brokerHash.get("Pool.broker");
-    if (broker==null) {
-      System.err.println("Konnte kein ConnectionPoolBroker initialisiert werden");
-    }
-    return broker;
-  }
-
-  /**
-   * Liefert Anzahl der Instantiierten DBConnectionBroker zurueck
-   * @return
-   */
-  public static int getBrokerInstances() {
-    return instances;
-  }
-
-  public static DbConnectionBroker getBrokerInfo(){
-    return (DbConnectionBroker)brokerHash.get("Pool.broker");
-  }
-
-  /**
    * Finalize method
    */
   public void finalize(){