just testing a new way of doing Mir.Version string

[mir.git] / source / mir / misc / MirConfig.java

diff --git a/source/mir/misc/MirConfig.java b/source/mir/misc/MirConfig.java
index a3e9199..67295a1 100755 (executable)
--- a/source/mir/misc/MirConfig.java
+++ b/source/mir/misc/MirConfig.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.misc;
 
 import  java.net.*;
@@ -43,14 +74,16 @@ public class MirConfig extends Configuration {
    * @param name, The name of the servlet (usually "Mir")
    * @param confName, the name of the config file to load.
    */
-  public static synchronized void initConfig(ServletContext ctx, String uri,
+  public static synchronized void initConfig(ServletContext ctx, String ctxPath,
                                             String name, String confName) {
     initConfResource(confName);
     configHash = new HashMap();
 
+    configHash.put("Mir.Version", "$Name:  $");
+
     configHash.put("Home", ctx.getRealPath("/"));
     configHash.put("ServletContext", ctx);
-    configHash.put("RootUri", uri);
+    configHash.put("RootUri", ctxPath);
 
     Enumeration resKeys = getResourceKeys();
     while(resKeys.hasMoreElements()) {
@@ -58,13 +91,13 @@ public class MirConfig extends Configuration {
       configHash.put(keyNm, getProperty(keyNm));
     }
   }
-  /**
-   * Returns the property asked for by pulling it out a HashMap
-   * @param a String containing the property name (key)
-   * @return a String containing the prop. value
-   */
-  public static void setServletName(String servletName) {
-    configHash.put("ServletName",servletName);
+
+  public static void setAdminServletName(String servletName) {
+    configHash.put("AdminServletName",servletName);
+  }
+
+  public static void setOpenServletName(String servletName) {
+    configHash.put("OpenServletName",servletName);
   }
 
   /**
@@ -73,14 +106,7 @@ public class MirConfig extends Configuration {
    * @return a String containing the prop. value
    */
   public static String getProp(String propName) {
-    String result = (String)configHash.get(propName);
-
-    if (result==null)
-      throw new ConfigException("config property '"+propName+"' not available!");
-
-
-
-    return result;
+    return (String)configHash.get(propName);
   }
 
   /**
@@ -90,11 +116,12 @@ public class MirConfig extends Configuration {
    * @return a String containing the prop.value
    */
   public static String getPropWithHome(String propName) {
-    return getProp("Home") + getProp(propName);
+    return (String)configHash.get("Home") +
+           (String)configHash.get(propName);
   }
 
   /**
-   * Returns the property asked for iin raw Object form by
+   * Returns the property asked for iin raw Object form by 
    * pulling it out a HashMap
    * @param a String containing the property name (key)
    * @return an Object containing the prop.value