inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged from branch DEV/mward/head_cachefactory_conf to HEAD

Browse Source 
54858: ALF-19668: Further cache configuration overrides
  54859: ALF-19668: added clustered cache types to properties, e.g. createLocalCache, createCache, createInvalidateRemovalCache.
  54867: ALF-19668: ClusterAwareCacheFactory now uses *.cluster.type properties to determine cache type.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55148 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-09-09 18:41:27 +00:00
parent fce64e27a9
commit 57e814314c
7 changed files with 216 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/java/org/alfresco/repo/cache/DefaultCacheFactory.java vendored
View File

@@ -32,10 +32,10 @@ import org.apache.commons.logging.LogFactory;
*
* @author Matt Ward
*/
public class DefaultCacheFactory<K extends Serializable, V> implements CacheFactory<K, V>
public class DefaultCacheFactory<K extends Serializable, V> extends AbstractCacheFactory<K, V>
{
private static final Log log = LogFactory.getLog(DefaultCacheFactory.class);
private Properties properties;
@Override
public SimpleCache<K, V> createCache(String cacheName)
@@ -43,8 +43,7 @@ public class DefaultCacheFactory<K extends Serializable, V> implements CacheFact
return createLocalCache(cacheName);
}
@Override
public SimpleCache<K, V> createLocalCache(String cacheName)
private SimpleCache<K, V> createLocalCache(String cacheName)
{
DefaultSimpleCache<K, V> cache = new DefaultSimpleCache<K, V>();
cache.setCacheName(cacheName);
@@ -61,34 +60,10 @@ public class DefaultCacheFactory<K extends Serializable, V> implements CacheFact
return cache;
}
private SimpleCache<K, V> createInvalidatingCache(String cacheName)
{
return createLocalCache(cacheName);
}
@Override
public SimpleCache<K, V> createInvalidateRemovalCache(String cacheName)
{
return createLocalCache(cacheName);
}
private int maxItems(String cacheName)
{
String maxItemsStr = properties.getProperty(cacheName + ".maxItems");
Integer maxItems = maxItemsStr != null ? Integer.parseInt(maxItemsStr) : 0;
String maxItemsStr = getProperty(cacheName, "maxItems", "0");
Integer maxItems = Integer.parseInt(maxItemsStr);
return maxItems.intValue();
}
/**
* Provide properties to parameterize cache creation. Cache properties are prefixed
* with the cacheName supplied when invoking {@link DefaultCacheFactory#createCache(String)}.
* For example, for a cache named cache.ticketsCache the property cache.ticketsCache.maxItems
* will determine the capacity of the cache.
*
* @param properties
*/
public void setProperties(Properties properties)
{
this.properties = properties;
}
}