actionroot-quickhack deleted

diff --git a/source/Mir.java b/source/Mir.java
index 97d2816..8ac8b84 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -50,7 +50,7 @@ public class Mir extends AbstractServlet
     // get the configration
     if (!confed){
       confed = getConfig(req);
-      MirConfig.setServletName(req.getServerName());
+      MirConfig.setServletName(getServletName());
     }
 
     session = req.getSession(true);

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index d9ed5bb..5a30e99 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -45,10 +45,7 @@ public final class HTMLTemplateProcessor {
     templateCache.startAutoUpdate();
     theLog = Logfile.getInstance(MirConfig.getPropWithHome("HTMLTemplateProcessor.Logfile"));
     docRoot = MirConfig.getProp("RootUri");
-    //small quickhack, idfx
-    //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
-    actionRoot = docRoot + "/servlet/Mir";
-
+    actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
     openAction = MirConfig.getProp("Producer.OpenAction");
     productionHost = MirConfig.getProp("Producer.ProductionHost");
     videoHost = MirConfig.getProp("Producer.VideoHost");
@@ -56,7 +53,6 @@ public final class HTMLTemplateProcessor {
     imageHost = MirConfig.getProp("Producer.Image.Host");
     producerDocRoot = MirConfig.getProp("Producer.DocRoot");
     producerStorageRoot = MirConfig.getProp("Producer.StorageRoot");
-
   }
 
   /**

diff --git a/source/mir/misc/MirConfig.java b/source/mir/misc/MirConfig.java
index 5f0f96b..d6cd485 100755 (executable)
--- a/source/mir/misc/MirConfig.java
+++ b/source/mir/misc/MirConfig.java
@@ -43,7 +43,6 @@ public class MirConfig extends Configuration {
 
     configHash.put("Home", home);
     configHash.put("RootUri", uri);
-    configHash.put("ServletName", name);
 
     Enumeration resKeys = getResourceKeys();
     while(resKeys.hasMoreElements()) {
@@ -51,14 +50,22 @@ 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 String getProp(String PropName) {
-    return (String)configHash.get(PropName);
+  public static void setServletName(String servletName) {
+    configHash.put("ServletName",servletName);
+  }
+  
+  /**
+   * 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 String getProp(String propName) {
+    return (String)configHash.get(propName);
   }
 
   /**
@@ -67,9 +74,9 @@ public class MirConfig extends Configuration {
    * @param a String containing the property name (key)
    * @return a String containing the prop.value
    */
-  public static String getPropWithHome(String PropName) {
+  public static String getPropWithHome(String propName) {
     return (String)configHash.get("Home") +
-           (String)configHash.get(PropName);
+           (String)configHash.get(propName);
   }
 
   public static void addBroker(String driver, String URL){