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

@@ -34,6 +34,7 @@ import org.alfresco.jlan.server.core.SharedDeviceList;
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
import org.springframework.extensions.config.ConfigElement;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.filesys.alfresco.AlfrescoClientInfo;
import org.alfresco.filesys.config.ServerConfigurationBean;
import org.apache.commons.logging.Log;
@@ -62,8 +63,6 @@ public class HomeShareMapper implements ShareMapper, InitializingBean
private ServerConfiguration m_config;
private FilesystemsConfigSection m_filesysConfig;
private ServerConfigurationBean serverConfigurationBean;
// Filesystem driver to be used to create home shares
@@ -392,7 +391,21 @@ public class HomeShareMapper implements ShareMapper, InitializingBean
// Create the disk driver and context
ContentContext diskCtx = new ContentContext( getHomeFolderName(), "", "", alfClient.getHomeFolder());
diskCtx.enableStateCache(getServerConfigurationBean(), true);
if(m_config instanceof ServerConfigurationBean)
{
ServerConfigurationBean config = (ServerConfigurationBean)m_config;
config.initialiseRuntimeContext(diskCtx);
// Enable file state caching
// diskCtx.enableStateCache(serverConfigurationBean, true);
}
else
{
throw new AlfrescoRuntimeException("configuration error, unknown configuration bean");
}
// Create a temporary shared device for the users home directory
@@ -404,15 +417,4 @@ public class HomeShareMapper implements ShareMapper, InitializingBean
return null;
}
public void setServerConfigurationBean(ServerConfigurationBean serverConfigurationBean)
{
this.serverConfigurationBean = serverConfigurationBean;
}
public ServerConfigurationBean getServerConfigurationBean()
{
return serverConfigurationBean;
}
}