Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/cache/EhCacheAdapter.java

@@ -100,13 +100,6 @@ public class EhCacheAdapter<K extends Serializable, V extends Serializable>
 
     public void clear()
     {
-        try
-        {
-            cache.removeAll();
-        }
-        catch (IOException e)
-        {
-            throw new AlfrescoRuntimeException("Failed to clear cache", e);
-        }
+        cache.removeAll();
     }
 }

source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.cache;
+
+import java.io.IOException;
+
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.CacheManager;
+
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+
+/**
+ * This is virtually a copy of the Springframework version, with the exception
+ * that it uses the newer constructors for the <code>EHCacheManager</code>
+ * instances.
+ * 
+ * @author Derek Hulley
+ */
+public class EhCacheManagerFactoryBean implements FactoryBean, InitializingBean, DisposableBean
+{
+    protected final Log logger = LogFactory.getLog(EhCacheManagerFactoryBean.class);
+
+    private Resource configLocation;
+    private CacheManager cacheManager;
+
+    /**
+     * 
+     * @param configLocation a resource location using the <b>file:</b> or <b>classpath:</b> prefix
+     */
+    public void setConfigLocation(Resource configLocation)
+    {
+        this.configLocation = configLocation;
+    }
+
+    public void afterPropertiesSet() throws IOException, CacheException
+    {
+        PropertyCheck.mandatory(this, "configLocation", configLocation);
+        
+        logger.info("Initializing EHCache CacheManager");
+        this.cacheManager = new CacheManager(this.configLocation.getURL());
+    }
+
+    public Object getObject()
+    {
+        return this.cacheManager;
+    }
+
+    public Class getObjectType()
+    {
+        return (this.cacheManager != null ? this.cacheManager.getClass() : CacheManager.class);
+    }
+
+    public boolean isSingleton()
+    {
+        return true;
+    }
+
+    public void destroy()
+    {
+        logger.info("Shutting down EHCache CacheManager");
+        this.cacheManager.shutdown();
+    }
+}

source/java/org/alfresco/repo/cache/TransactionalCache.java

@@ -16,7 +16,6 @@
  */
 package org.alfresco.repo.cache;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.List;
 
@@ -438,15 +437,8 @@ public class TransactionalCache<K extends Serializable, V extends Serializable>
             // and also serves to ensure that the shared cache will be ignored
             // for the remainder of the transaction
             txnData.isClearOn = true;
-            try
-            {
-                txnData.updatedItemsCache.removeAll();
-                txnData.removedItemsCache.removeAll();
-            }
-            catch (IOException e)
-            {
-                throw new AlfrescoRuntimeException("Failed to clear caches", e);
-            }
+            txnData.updatedItemsCache.removeAll();
+            txnData.removedItemsCache.removeAll();
         }
         else            // no transaction
         {