First cut of Hazelcast cache initialisation

need to set filesystem.cluster.enabled=true
                      filesystem.cluster.config=c:\\temp\\hazelcastConfig.xml
ALF-9966 - Locking wrong with OpLockManager and LockManager ContentDiskDriver error.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-08-19 13:21:53 +00:00
parent 5084d3612f
commit 021a93f5c3
20 changed files with 525 additions and 214 deletions

View File

@@ -21,6 +21,7 @@ package org.alfresco.filesys.avm;
import java.util.Enumeration;
import org.springframework.extensions.config.ConfigElement;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.filesys.config.ServerConfigurationBean;
import org.alfresco.jlan.server.SrvSession;
import org.alfresco.jlan.server.config.InvalidConfigurationException;
@@ -61,8 +62,6 @@ public class AVMShareMapper implements ShareMapper, InitializingBean {
private ServerConfiguration m_config;
private FilesystemsConfigSection m_filesysConfig;
private ServerConfigurationBean serverConfigurationBean;
// List of available AVM shares
@@ -287,7 +286,20 @@ public class AVMShareMapper implements ShareMapper, InitializingBean {
// Create a dynamic share mapped to the AVM store/version
AVMContext avmCtx = new AVMContext( name, storePath, storeVersion);
avmCtx.enableStateCache(serverConfigurationBean, true);
if(m_config instanceof ServerConfigurationBean)
{
ServerConfigurationBean config = (ServerConfigurationBean)m_config;
config.initialiseRuntimeContext(avmCtx);
// Enable file state caching
// diskCtx.enableStateCache(serverConfigurationBean, true);
}
else
{
throw new AlfrescoRuntimeException("configuration error, unknown configuration bean");
}
// Create a dynamic shared device for the store version
@@ -378,14 +390,4 @@ public class AVMShareMapper implements ShareMapper, InitializingBean {
// TODO Auto-generated method stub
}
public void setServerConfigurationBean(ServerConfigurationBean serverConfigurationBean)
{
this.serverConfigurationBean = serverConfigurationBean;
}
public ServerConfigurationBean getServerConfigurationBean()
{
return serverConfigurationBean;
}
}