first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mir/servlet/ServletModuleMonitor.java b/source/mir/servlet/ServletModuleMonitor.java
index 3bfdd1f..2356975 100755 (executable)
--- a/source/mir/servlet/ServletModuleMonitor.java
+++ b/source/mir/servlet/ServletModuleMonitor.java
@@ -14,7 +14,6 @@ import mir.misc.*;
 import mir.storage.*;
 import mir.entity.*;
 
-import com.javaexchange.dbConnectionBroker.*;
 /*
  *  ServletModuleShow -
  *  liefert HTML fuer Show
@@ -37,10 +36,9 @@ public class ServletModuleMonitor extends ServletModule
       // instances in AbstractEntity
       // eingelesene confs
       // datenbankverbindungen fuer brokers
-      getSimpleInfo(res.getWriter(),getConfs());
+      //getSimpleInfo(res.getWriter(),getConfs());
       PrintWriter out = res.getWriter();
       out.println(getInstancesInfo());
-      out.println(getInstancesConfInfo());
 
     }
     catch (Exception e) {
@@ -55,43 +53,8 @@ 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();
-  }
-  public String getBrokerInfo(DbConnectionBroker broker){
-    return "<tr><td>Connections im pool                  = </td><td>"+ broker.getSize() + "</td></tr>\n"+
-           "<tr><td>Connection die gerade benutzt werden = </td><td>" + broker.getUseCount()+"</td></tr>\n";
-  }
-  public void getSimpleInfo(Writer out,HashMap confs) throws IOException{
-    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
-        out.write("<tr><td>Broker nicht initializiert</td><td></td></tr>\n");
-      out.write("</table>\n");
-    }
-  }
 }