dbpoolman instead of connectionbroker

[mir.git] / source / mir / servlet / ServletModuleMonitor.java

diff --git a/source/mir/servlet/ServletModuleMonitor.java b/source/mir/servlet/ServletModuleMonitor.java
index 3bfdd1f..ee8f541 100755 (executable)
--- a/source/mir/servlet/ServletModuleMonitor.java
+++ b/source/mir/servlet/ServletModuleMonitor.java
@@ -40,7 +40,6 @@ public class ServletModuleMonitor extends ServletModule
       getSimpleInfo(res.getWriter(),getConfs());
       PrintWriter out = res.getWriter();
       out.println(getInstancesInfo());
-      out.println(getInstancesConfInfo());
 
     }
     catch (Exception e) {
@@ -55,19 +54,13 @@ public class ServletModuleMonitor extends ServletModule
   public String getInstancesInfo(){
     return "<table><tr><td>Momentan instanzierte EntityObjekte = </td><td>" + getInstances()+"</td></tr></table>\n";
   }
-  public String getInstancesConfInfo(){
-    return "<table><tr><td>Momentan instanzierte BrokerObjekte  = </td><td>" + getConfBrokerCnt()+"</td></tr></table>\n";
-  }
-
   protected HashMap getConfs(){
     return Configuration.getConfs();
   }
   protected int getBrokerUseCnt(DbConnectionBroker broker){
     return broker.getUseCount();
   }
-  protected int getConfBrokerCnt(){
-    return MirConfig.getBrokerInstances();
-  }
+
   protected int getBrokerSize(DbConnectionBroker broker){
     return broker.getSize();
   }
@@ -79,13 +72,11 @@ public class ServletModuleMonitor extends ServletModule
     String key;
     DbConnectionBroker broker = null;
     out.write(getInstancesInfo());
-    out.write(getInstancesConfInfo());
     Set set = confs.keySet();
     Iterator it = set.iterator();
     for (int i=0;i<set.size();i++){
       key=(String)it.next();
       out.write("<table><tr><td>Konfiguration : </td><td>" + confs.get(key)+ "</td></tr>\n" );
-      broker=MirConfig.getBrokerInfo();
       //broker=(DbConnectionBroker) ((HashMap)confs.get(key)).get("Pool.broker");
       if(broker!=null)  out.write(getBrokerInfo(broker));
       else