Index: kernel-impl/src/test/java/org/sakai/memory/impl/test/TestCacheInitializer.java
===================================================================
--- kernel-impl/src/test/java/org/sakai/memory/impl/test/TestCacheInitializer.java	(revision 129411)
+++ kernel-impl/src/test/java/org/sakai/memory/impl/test/TestCacheInitializer.java	(revision 129412)
@@ -1,6 +1,6 @@
 package org.sakai.memory.impl.test;
 
-import org.sakaiproject.memory.impl.CacheInitializer;
+import org.sakaiproject.memory.util.CacheInitializer;
 
 import junit.framework.TestCase;
 import net.sf.ehcache.config.CacheConfiguration;
Index: kernel-impl/src/main/java/org/sakaiproject/memory/impl/CacheInitializer.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/memory/impl/CacheInitializer.java	(revision 129411)
+++ kernel-impl/src/main/java/org/sakaiproject/memory/impl/CacheInitializer.java	(revision 129412)
@@ -1,129 +0,0 @@
-package org.sakaiproject.memory.impl;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.sf.ehcache.config.CacheConfiguration;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Utility class to configure a cache. Could have used common beanutils but
- * didn't want another library.
- * 
- * @author buckett
- * 
- */
-public class CacheInitializer {
-
-	private static final Log M_log = LogFactory.getLog(CacheInitializer.class);
-
-	private Map<String, String> configMap;
-
-	public CacheInitializer() {
-
-	}
-
-	/**
-	 * Set the configuration that needs to be set on the cache.
-	 * 
-	 * @param config
-	 *            The unsplit configuration. Eg:
-	 *            "timeToLiveSeconds=400,timeToIdleSeconds=100"
-	 * @return This object.
-	 */
-	public CacheInitializer configure(String config) {
-		configMap = new HashMap<String, String>();
-		String[] configParts = config.split(",");
-		for (String part : configParts) {
-			String[] splitParts = part.split("=", 2);
-			if (splitParts.length == 2) {
-				String key = splitParts[0];
-				String value = splitParts[1];
-				configMap.put(key, value);
-			} else {
-				M_log.warn("Couldn't parse cache config of: " + part);
-			}
-		}
-		return this;
-	}
-
-	/**
-	 * Configure
-	 * 
-	 * @param cacheConfig
-	 * @return
-	 */
-	public CacheInitializer initialize(CacheConfiguration cacheConfig) {
-		if (configMap == null) {
-			throw new IllegalStateException(
-					"You must configure the initializer first.");
-		}
-		Method[] methods = cacheConfig.getClass().getMethods();
-		for (Method method : methods) {
-			if (Modifier.isPublic(method.getModifiers())
-					&& method.getName().startsWith("set")
-					&& method.getParameterTypes().length == 1) {
-				// Ok we can handle this method.
-				String key = Character.toLowerCase(method.getName().charAt(
-						"set".length()))
-						+ method.getName().substring("set".length() + 1);
-				M_log.debug("Looking in config map for: " + key);
-				String value = configMap.get(key);
-				if (value != null) {
-					Class clazz = method.getParameterTypes()[0];
-					M_log.debug("Need to convert to :" + clazz);
-					Object obj = covertValue(value, clazz);
-
-					if (obj != null) {
-						invokeMethod(method, cacheConfig, obj);
-						M_log.debug("Setting " + clazz + "#" + key + " to " + value);
-					}
-
-				}
-
-			}
-		}
-		return this;
-	}
-
-	private Object covertValue(String value, Class clazz) {
-		Object obj = null;
-		try {
-			if (String.class.equals(clazz)) {
-				obj = value;
-			} else if (Integer.class.equals(clazz) || int.class.equals(clazz)) {
-				obj = Integer.valueOf(value);
-			} else if (Boolean.class.equals(clazz)
-					|| boolean.class.equals(clazz)) {
-				obj = Boolean.valueOf(value);
-			} else if (Long.class.equals(clazz) || long.class.equals(clazz)) {
-				obj = Long.valueOf(value);
-			} else if (Float.class.equals(clazz) || float.class.equals(clazz)) {
-				obj = Float.valueOf(value);
-			} else if (Double.class.equals(clazz) || double.class.equals(clazz)) {
-				obj = Double.valueOf(value);
-			} else if (Character.class.equals(clazz)
-					|| char.class.equals(clazz)) {
-				obj = Character.valueOf(value.charAt(0));
-			} else {
-				M_log.debug("Can't convert to :" + clazz);
-			}
-		} catch (NumberFormatException nfe) {
-			M_log.debug("Ignored bad number: " + value);
-		}
-		return obj;
-	}
-
-	private void invokeMethod(Method method, Object obj, Object value) {
-		try {
-			method.invoke(obj, value);
-		} catch (Exception e) {
-			M_log.debug(e);
-		}
-	}
-
-}
Index: kernel-impl/src/main/java/org/sakaiproject/memory/impl/BasicMemoryService.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/memory/impl/BasicMemoryService.java	(revision 129411)
+++ kernel-impl/src/main/java/org/sakaiproject/memory/impl/BasicMemoryService.java	(revision 129412)
@@ -51,6 +51,7 @@
 import org.sakaiproject.memory.api.MemoryPermissionException;
 import org.sakaiproject.memory.api.MemoryService;
 import org.sakaiproject.memory.api.MultiRefCache;
+import org.sakaiproject.memory.util.CacheInitializer;
 
 /**
  * <p>
Index: kernel-util/src/main/java/org/sakaiproject/memory/util/CacheInitializer.java
===================================================================
--- kernel-util/src/main/java/org/sakaiproject/memory/util/CacheInitializer.java	(revision 0)
+++ kernel-util/src/main/java/org/sakaiproject/memory/util/CacheInitializer.java	(revision 129412)
@@ -0,0 +1,129 @@
+package org.sakaiproject.memory.util;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.ehcache.config.CacheConfiguration;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Utility class to configure a cache. Could have used common beanutils but
+ * didn't want another library.
+ * 
+ * @author buckett
+ * 
+ */
+public class CacheInitializer {
+
+	private static final Log M_log = LogFactory.getLog(CacheInitializer.class);
+
+	private Map<String, String> configMap;
+
+	public CacheInitializer() {
+
+	}
+
+	/**
+	 * Set the configuration that needs to be set on the cache.
+	 * 
+	 * @param config
+	 *            The unsplit configuration. Eg:
+	 *            "timeToLiveSeconds=400,timeToIdleSeconds=100"
+	 * @return This object.
+	 */
+	public CacheInitializer configure(String config) {
+		configMap = new HashMap<String, String>();
+		String[] configParts = config.split(",");
+		for (String part : configParts) {
+			String[] splitParts = part.split("=", 2);
+			if (splitParts.length == 2) {
+				String key = splitParts[0];
+				String value = splitParts[1];
+				configMap.put(key, value);
+			} else {
+				M_log.warn("Couldn't parse cache config of: " + part);
+			}
+		}
+		return this;
+	}
+
+	/**
+	 * Configure
+	 * 
+	 * @param cacheConfig
+	 * @return
+	 */
+	public CacheInitializer initialize(CacheConfiguration cacheConfig) {
+		if (configMap == null) {
+			throw new IllegalStateException(
+					"You must configure the initializer first.");
+		}
+		Method[] methods = cacheConfig.getClass().getMethods();
+		for (Method method : methods) {
+			if (Modifier.isPublic(method.getModifiers())
+					&& method.getName().startsWith("set")
+					&& method.getParameterTypes().length == 1) {
+				// Ok we can handle this method.
+				String key = Character.toLowerCase(method.getName().charAt(
+						"set".length()))
+						+ method.getName().substring("set".length() + 1);
+				M_log.debug("Looking in config map for: " + key);
+				String value = configMap.get(key);
+				if (value != null) {
+					Class clazz = method.getParameterTypes()[0];
+					M_log.debug("Need to convert to :" + clazz);
+					Object obj = covertValue(value, clazz);
+
+					if (obj != null) {
+						invokeMethod(method, cacheConfig, obj);
+						M_log.debug("Setting " + clazz + "#" + key + " to " + value);
+					}
+
+				}
+
+			}
+		}
+		return this;
+	}
+
+	private Object covertValue(String value, Class clazz) {
+		Object obj = null;
+		try {
+			if (String.class.equals(clazz)) {
+				obj = value;
+			} else if (Integer.class.equals(clazz) || int.class.equals(clazz)) {
+				obj = Integer.valueOf(value);
+			} else if (Boolean.class.equals(clazz)
+					|| boolean.class.equals(clazz)) {
+				obj = Boolean.valueOf(value);
+			} else if (Long.class.equals(clazz) || long.class.equals(clazz)) {
+				obj = Long.valueOf(value);
+			} else if (Float.class.equals(clazz) || float.class.equals(clazz)) {
+				obj = Float.valueOf(value);
+			} else if (Double.class.equals(clazz) || double.class.equals(clazz)) {
+				obj = Double.valueOf(value);
+			} else if (Character.class.equals(clazz)
+					|| char.class.equals(clazz)) {
+				obj = Character.valueOf(value.charAt(0));
+			} else {
+				M_log.debug("Can't convert to :" + clazz);
+			}
+		} catch (NumberFormatException nfe) {
+			M_log.debug("Ignored bad number: " + value);
+		}
+		return obj;
+	}
+
+	private void invokeMethod(Method method, Object obj, Object value) {
+		try {
+			method.invoke(obj, value);
+		} catch (Exception e) {
+			M_log.debug(e);
+		}
+	}
+
+}

Property changes on: kernel-util/src/main/java/org/sakaiproject/memory/util/CacheInitializer.java
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kernel-util/src/main/java/org/sakaiproject/memory/util/EhCacheFactoryBean.java
===================================================================
--- kernel-util/src/main/java/org/sakaiproject/memory/util/EhCacheFactoryBean.java	(revision 129411)
+++ kernel-util/src/main/java/org/sakaiproject/memory/util/EhCacheFactoryBean.java	(revision 129412)
@@ -379,6 +379,18 @@
 				logger.debug("Creating new EHCache cache region '" + this.cacheName + "'");
 			}
 			rawCache = createCache();
+            // Not look for any custom configuration.
+            // Check for old configuration properties.
+            if(serverConfigurationService.getString(this.cacheName) == null) {
+                logger.warn("Old cache configuration "+ this.cacheName+ " must be changed to memory."+ this.cacheName);
+            }
+            String config = serverConfigurationService.getString("memory."+ this.cacheName);
+            if (config != null && config.length() > 0) {
+                logger.debug("Found configuration for cache: "+ this.cacheName+ " of: "+ config);
+                new CacheInitializer().configure(config).initialize(
+                        rawCache.getCacheConfiguration());
+            }
+
 			this.cacheManager.addCache(rawCache);
 		}
 		boolean override = false;

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /kernel/branches/KNL-1118:r129406-129411