X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fservlet%2FServletModuleMonitor.java;h=7c5f6c0388049ef38e7582b441ca038be8423363;hb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;hp=e6a7334a4eb452d22e943bc1784aeddf91eee6fa;hpb=5bf2a1fa11c1529a731ab6b4521b8254c1fa100f;p=mir.git

diff --git a/source/mir/servlet/ServletModuleMonitor.java b/source/mir/servlet/ServletModuleMonitor.java
index e6a7334a..7c5f6c03 100755
--- a/source/mir/servlet/ServletModuleMonitor.java
+++ b/source/mir/servlet/ServletModuleMonitor.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.servlet;
 
 import java.io.*;
@@ -14,7 +45,6 @@ import mir.misc.*;
 import mir.storage.*;
 import mir.entity.*;
 
-import com.javaexchange.dbConnectionBroker.*;
 /*
  *  ServletModuleShow -
  *  liefert HTML fuer Show
@@ -37,10 +67,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) {
@@ -49,49 +78,14 @@ public class ServletModuleMonitor extends ServletModule
     }
   }
   protected int getInstances(){
-    AbstractEntity ent = new AbstractEntity();
+    Entity ent = new Entity();
     return ent.getInstances();
   }
   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 Configuration.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=Configuration.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");
-    }
-  }
 }