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 BRANCHES/DEV/mward/cifs_hazelcast_conf to HEAD:

Browse Source 
36500: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36507: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36511: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36519: ALF-13821: Extract hazelcastConfig, hazelcastInstanceFactory bean definitions from webdav-context.xml to cluster-context.xml
   36553: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-05-18 18:10:02 +00:00
parent d437d5105d
commit bc532d64b8
9 changed files with 142 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/java/org/alfresco/filesys/config/ClusterConfigBean.java
View File

@@ -18,6 +18,8 @@
*/
package org.alfresco.filesys.config;
import org.alfresco.repo.cluster.HazelcastInstanceFactory;
/**
* The Class ClusterConfigBean.
*
@@ -26,40 +28,29 @@ package org.alfresco.filesys.config;
*/
public class ClusterConfigBean
{
private boolean isClusterEnabled = false;
private String configFile;
private String clusterName;
private HazelcastInstanceFactory hazelcastInstanceFactory;
private String debugFlags;
private int nearCacheTimeout;
public void setClusterEnabled(boolean clusterEnabled)
public void setHazelcastInstanceFactory(HazelcastInstanceFactory hazelcastInstanceFactory)
{
this.isClusterEnabled = clusterEnabled;
this.hazelcastInstanceFactory = hazelcastInstanceFactory;
}
public HazelcastInstanceFactory getHazelcastInstanceFactory()
{
return this.hazelcastInstanceFactory;
}
public boolean getClusterEnabled()
{
return isClusterEnabled;
return hazelcastInstanceFactory.isClusteringEnabled();
}
public void setClusterName(String clusterName)
{
this.clusterName = clusterName;
}
public String getClusterName()
{
return clusterName;
}
public void setConfigFile(String configFile)
{
this.configFile = configFile;
}
public String getConfigFile()
{
return configFile;
return hazelcastInstanceFactory.getClusterName();
}
public void setDebugFlags(String debugFlags)