From: idfx <idfx>
Date: Thu, 13 Mar 2003 21:33:21 +0000 (+0000)
Subject: commons-configuration is gone to commons-collections
X-Git-Tag: BEFORE_MERGE_1_1~223
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=3179630c23e18720178f72322a8a08998a5a134d;hp=b0dca2762e7c5958169fc9da7b4f1f4a74fd27ec;p=mir.git

commons-configuration is gone to commons-collections
---

diff --git a/lib/README.txt b/lib/README.txt
index c2c58ddb..69c5ee2f 100755
--- a/lib/README.txt
+++ b/lib/README.txt
@@ -40,15 +40,14 @@ todo       : check if necessary / update to version 1.1.1
              necessary?
 
 
-commons-configuration-1.0-dev
+commons-collections
 ------------------------------------------------
-version    : 1.0-dev
+version    : 2.1
 url        : http://jakarta.apache.org/commons/
 description: needed for parsing the configuration 
-             properties file
-todo       : moved into the Commons Collections as 
-             ExtendedProperties / replace with
-             commons-collections
+             properties file and provides more useful collections
+             like a LRUCache
+todo       : 
 
 
 commons-net20030111
diff --git a/lib/commons-collections-2.1.jar b/lib/commons-collections-2.1.jar
new file mode 100755
index 00000000..f66c6d27
Binary files /dev/null and b/lib/commons-collections-2.1.jar differ
diff --git a/lib/commons-configuration-1.0-dev.jar b/lib/commons-configuration-1.0-dev.jar
deleted file mode 100755
index c0f1011d..00000000
Binary files a/lib/commons-configuration-1.0-dev.jar and /dev/null differ
diff --git a/source/mir/config/MirPropertiesConfiguration.java b/source/mir/config/MirPropertiesConfiguration.java
index eea7bf05..52c3fc10 100755
--- a/source/mir/config/MirPropertiesConfiguration.java
+++ b/source/mir/config/MirPropertiesConfiguration.java
@@ -33,6 +33,7 @@ package mir.config;
 import multex.Exc;
 import multex.Failure;
 
+import org.apache.commons.collections.ExtendedProperties;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 import java.io.File;
@@ -49,7 +50,7 @@ import javax.servlet.ServletContext;
 /**
  * @author idefix
  */
-public class MirPropertiesConfiguration extends PropertiesConfiguration {
+public class MirPropertiesConfiguration extends ExtendedProperties {
   private static MirPropertiesConfiguration instance;
   private static ServletContext context;
   private static String contextPath;
@@ -121,7 +122,7 @@ public class MirPropertiesConfiguration extends PropertiesConfiguration {
 
     while (iterator.hasNext()) {
       String key = (String) iterator.next();
-      Object o = this.getString(key);
+      Object o = this.getProperty(key);
 
       if (o == null) {
         o = new Object();
@@ -175,11 +176,16 @@ public class MirPropertiesConfiguration extends PropertiesConfiguration {
    * @see org.apache.commons.configuration.Configuration#getString(java.lang.String)
    */
   public String getString(String key) {
-    if (super.getString(key) == null) {
+  	Object object = getProperty(key);  	
+  	if(object != null){
+  		if (object instanceof String) {
+  			return (String)object;
+  		} else {
+  			return object.toString();
+  		}
+  	} else {
       return new String();
     }
-
-    return super.getString(key);
   }
 
   /**