X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fservlet%2FAbstractServlet.java;h=13f674b6fb486676ed8fc840b9b9a1da731cc6ef;hb=5379fccb255fc05ef109129b93b576663819c7df;hp=66ae8f0a88b6e5b535c8685009f20446d2863fdd;hpb=2f9c212134ba336f0460457a4b9abdacace5c50b;p=mir.git

diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java
index 66ae8f0a..13f674b6 100755
--- a/source/mir/servlet/AbstractServlet.java
+++ b/source/mir/servlet/AbstractServlet.java
@@ -31,17 +31,23 @@
 
 package mir.servlet;
 
-import mir.misc.Logfile;
-import mir.misc.MirConfig;
-import mir.misc.StringUtil;
-import mir.storage.StorageObjectException;
+import java.util.Locale;
 
-import javax.servlet.UnavailableException;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.util.Locale;
-import java.util.Random;
+
+import mir.config.MirPropertiesConfiguration;
+import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+import mir.log.LoggerWrapper;
+import mir.storage.DatabaseAdaptor;
+
+import com.codestudio.util.JDBCPool;
+import com.codestudio.util.JDBCPoolMetaData;
+import com.codestudio.util.SQLManager;
 
 /**
  * Title:        Mir
@@ -49,42 +55,31 @@ import java.util.Random;
  * Copyright:    Copyright (c) 2001, 2002
  * Company:      Mir-coders group
  * @author       idfx, the Mir-coders group
- * @version      $Id: AbstractServlet.java,v 1.18 2002/11/27 08:22:03 mh Exp $
+ * @version      $Id: AbstractServlet.java,v 1.20 2003/01/25 17:45:19 idfx Exp $
  */
 
 public abstract class AbstractServlet extends HttpServlet {
     protected static String lang;
-    protected static Logfile theLog;
+    //protected static Logfile theLog;
+  	protected LoggerWrapper logger;
+		protected MirPropertiesConfiguration configuration;  	
+  	
+  /**
+   * Constructor for AbstractServlet.
+   */
+  public AbstractServlet() {
+    super();
+    logger = new LoggerWrapper("Servlet");
+  }
 
-    /**
-     * the configration
-     */
-    protected boolean getConfig(HttpServletRequest req)
-            throws UnavailableException {
-
-        //String RealPath = super.getServletContext().getRealPath("/");
-        String name = super.getServletName();
-
-        // init config
-        //MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
-        MirConfig.initConfig(super.getServletContext(), req.getContextPath(),
-                              name, getInitParameter("Config"));
-
-        theLog = Logfile.getInstance(MirConfig.getPropWithHome(name + ".Logfile"));
-        theLog.printInfo(name + " started.");
-        theLog.printInfo("Path is: " + MirConfig.getProp("Home"));
-        theLog.printInfo("Root URI is: " + MirConfig.getProp("RootUri"));
-        theLog.printInfo("StandardLanguage is: " + MirConfig.getProp("StandardLanguage"));
-        try {
-            MirConfig.initDbPool();
-        }
-        catch (StorageObjectException e) {
-            throw new UnavailableException(
-                    "Could not initialize database pool. -- "
-                    + e.toString(), 0);
-        }
-        super.getServletContext().setAttribute("mir.confed", new Boolean(true));
-        return true;
+    protected void setNoCaching(HttpServletResponse res) {
+      //nothing in Mir can or should be cached as it's all dynamic...
+      //
+      //this needs to be done here and not per page (via meta tags) as some
+      //browsers have problems w/ it per-page -mh
+      res.setHeader("Pragma", "no-cache");
+      res.setDateHeader("Expires", 0);
+      res.setHeader("Cache-Control", "no-cache");
     }
 
     /**
@@ -137,16 +132,78 @@ public abstract class AbstractServlet extends HttpServlet {
     protected String getAcceptLanguage(HttpServletRequest req) {
         Locale loc = req.getLocale();
         lang = loc.getLanguage();
-        /* not needed anymore due to new i18n
-          File f = new File(HTMLTemplateProcessor.templateDir+"/"+lang);
-        //is there an existing template-path?
-        if(!f.isDirectory()){
-          //no there isn't. we use standard-language
-          lang = MirConfig.getProp("StandardLanguage");
-          theLog.printDebugInfo("language not existing");
-        }
-        theLog.printDebugInfo("Language: " + lang);
-        */
         return lang;
     }
+  /**
+   * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+   */
+  public void init(ServletConfig arg0) throws ServletException {
+    super.init(arg0);
+    MirPropertiesConfiguration.setContext(arg0.getServletContext());
+    MirPropertiesConfiguration.setContextPath("/"+arg0.getServletName());
+    try {
+      configuration = MirPropertiesConfiguration.instance();
+    } catch (PropertiesConfigExc e) {
+      throw new ServletException(e);
+    }
+    
+    String dbUser=configuration.getString("Database.Username");
+    String dbPassword=configuration.getString("Database.Password");
+    String dbHost=configuration.getString("Database.Host");
+    String dbAdapName=configuration.getString("Database.Adaptor");
+    
+    DatabaseAdaptor adaptor;
+    try {
+      adaptor = (DatabaseAdaptor)Class.forName(dbAdapName).newInstance();
+    } catch (Exception e) {
+      throw new ServletException("Could not load DB adapator: "+
+                                        e.toString());
+    }
+    
+    String min,max,log,reset,dbname,dblogfile;
+
+    min=configuration.getString("Database.poolMin");
+    System.out.println(min);
+    max=configuration.getString("Database.poolMax");
+    System.out.println(max);
+    dbname=configuration.getString("Database.Name");
+    System.out.println(dbname);
+    log=configuration.getStringWithHome("Database.PoolLog");
+    System.out.println(log);
+    reset=configuration.getString("Database.poolResetTime");
+    System.out.println(reset);
+    dblogfile=configuration.getStringWithHome("Database.Logfile");
+    System.out.println(dblogfile);
+    
+    String dbDriver;
+    String dbUrl;
+    try{
+      dbDriver=adaptor.getDriver();
+      dbUrl=adaptor.getURL(dbUser,dbPassword, dbHost);
+    } catch (Exception e) {
+      throw new ServletException(e);
+    }
+
+    JDBCPoolMetaData meta = new JDBCPoolMetaData();
+    meta.setDbname(dbname);
+    meta.setDriver(dbDriver);
+    meta.setURL(dbUrl);
+    meta.setUserName(dbUser);
+    meta.setPassword(dbPassword);
+    meta.setJNDIName("mir");
+    meta.setMaximumSize(10);
+    meta.setMinimumSize(1);
+    meta.setPoolPreparedStatements(false);
+    meta.setCacheEnabled(false);
+    meta.setCacheSize(15);
+    meta.setDebugging(false);
+    meta.setLogFile(dblogfile+".pool");
+
+    SQLManager manager = SQLManager.getInstance();
+    JDBCPool pool = null;
+    if(manager != null){
+      pool = manager.createPool(meta);
+    }
+  }
+
 }