[cvs] Expresso commit by mtraum: removed deprecated methods and organized

[JCorporate Ltd]

Log Message:
-----------
removed deprecated methods and organized imports

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
        ConfigManager.java

Revision Data
-------------
Index: ConfigManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -u -r1.68 -r1.69
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
@@ -64,10 +64,38 @@
 
 package com.jcorporate.expresso.core.misc;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.digester.Digester;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import com.jcorporate.expresso.core.cache.CacheManager;
 import com.jcorporate.expresso.core.controller.ControllerException;
 import com.jcorporate.expresso.core.controller.ControllerFactory;
-import com.jcorporate.expresso.core.controller.ExpressoActionServlet;
 import com.jcorporate.expresso.core.db.DBConnectionPool;
 import com.jcorporate.expresso.core.db.DBException;
 import com.jcorporate.expresso.core.dbobj.DBObject;
@@ -84,26 +112,6 @@
 import com.jcorporate.expresso.services.dbobj.SchemaList;
 import com.jcorporate.expresso.services.dbobj.Setup;
 import com.jcorporate.expresso.services.test.TestSystemInitializer;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.digester.Digester;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.config.ActionConfig;
-import org.apache.struts.config.ForwardConfig;
-import org.apache.struts.config.ModuleConfig;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
 
 /**
  * ConfigManager is a static class that utilizes the Struts Digester
@@ -539,16 +547,6 @@
     } /* getInstance() */
 
     /**
-     * Returns the directory to put all log files into.
-     * @return String containing the Expresso logging directory
-     * @deprecated Use getConfig().getLogDirectory() instead
-     */
-    public static String getLogDirectory() {
-        return getConfig().getLogDirectory();
-    } /* getLogFile() */
-
-
-    /**
      * Is the ConfigManager initialized yet?
      *
      * @return true if the xml configuration parsed correctly
@@ -912,19 +910,6 @@
         SystemMacros.getInstance().setWebAppDir(newDir);
     } /* setWebAppDir(String) */
 
-
-    /**
-     * @deprecated not used; deprecated march 03 since Expresso 5.1
-     * @param newLevel the new debug level 0-9
-     */
-    public static void setConfigDebugLevel(int newLevel) {
-/*
-        if (newLevel >= 0) {
-            configDebugLevel = newLevel;
-        }
-*/
-    }
-
     /**
      * Set the "context path" - this is used for translating
      * the %context% 'macro' that can be used in property and setup
@@ -1451,7 +1436,7 @@
      *
      * <p>
      *
-     * If no action mapping can be determined by looking for a
+     * If no action mapping can be determined by�looking for a
      * particular matching local action forward, then the first action
      * mapping is returned if exists. Please note the first action
      * mapping is not necessarily the first action mapping declared in
@@ -1654,21 +1639,6 @@
 
         return result;
     }
-
-
-    /**
-     * Store the Struts Forwards for lookups.
-     *
-     * @param theActionServlet the one and only Expresso Action Servlet
-     *
-     * @deprecated this method is now deprecated and does no anything since Struts 1.1
-     * {@link #storeModuleActionConfig( ModuleConfig moduleConfig)}
-     *
-     */
-    public static synchronized void setForwards(ExpressoActionServlet theActionServlet) {
-        // setMappings(theActionServlet.getMappings());
-    }
-
 
     /**
      * Perform a 'reverse-mapping', that is, locate a Struts action mapping