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 
36614: ALF-13822: Renamed JGroupsKeepAliveHeartbeatReceiver.
   36615: ALF-13822: renamed JGroupsKeepAliveHeartbeatSender.
   36616: ALF-13822: renamed JGroupsRMICacheManagerPeerProvider.
   36626: ALF-13822: renamed package from jgroups to cluster.
   36642: ALF-13822: remove jgroupsChannelFactory from bootstrap-context.xml, exchange for Hazelcast.
   36648: ALF-13822: remove jgroups references from RMICacheManagerPeerProvider.
   36649: ALF-13822: Replaced jgroups with hazelcast in ehcache testing context.
   36650: ALF-13822: Renamed ehcache test context and config so that jgroups not in name.
   36651: ALF-13822: renamed jgroups package to ehcache.
   36652: ALF-13822: Fix broken test from XML file renames.
   36653: ALF-13822: rename file so that it doesn't have jgroups in the name.
   36667: ALF-13822: removed some commented out jgroups code.
   36679: ALF-13822: reimplemented membership change logging for KeepAliveHeartbeatReceiver.
   36680: ALF-13822: remove redundant JGroups properties from clusterPropertySetter
   36681: ALF-13822: remove redundant properties from repository.properties.
   36682: ALF-13822: remove jgroups configuration files.
   36683: ALF-13822: remove jgroups messenger abstraction classes.
   36684: ALF-13822: removed jgroups test XML
   36685: ALF-13822: remove AlfrescoJGroupsChannelFactory.
   36686: ALF-13822: updated comment to include word hazelcast rather than jgroups.
   36687: ALF-13822: removed jgroups from comment
   36688: ALF-13822: removed jgroups from comment
   36689: ALF-13822: removed jgroups comment as no longer relavent
   36697: ALF-13822: removed jgroups from ant build files.
   36704: ALF-13822: removed jgroups libraries.
   36707: ALF-13822: removed jgroups source zip.
   36708: ALF-13822: removed jgroups form installer license file.
   36710: ALF-13822: removed jgroups lib from 3rd-party eclipse project's classpath.
   36731: ALF-13822: removed mentions of jgroups from JLAN.
   36761: ALF-13822: fixed hazelcast TCP config - removed ever-present loopback interface.
   36762: ALF-13822: improved logging of KeepAliveHeartbeatReceiver and added toString() for HazelcastMessenger.
   36990: ALF-13822: fixed AWS placeholder properties and added interface binding properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-05-25 15:11:50 +00:00
parent 1236e1ef84
commit 18ad785d32
31 changed files with 233 additions and 3837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/java/org/alfresco/repo/cluster/HazelcastMessengerFactory.java
View File

@@ -20,13 +20,13 @@
package org.alfresco.repo.cluster;
import java.io.Serializable;
import java.util.Set;
import org.springframework.util.StringUtils;
import com.hazelcast.config.Config;
import com.hazelcast.config.GroupConfig;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ITopic;
import com.hazelcast.core.Member;
import com.hazelcast.core.MembershipEvent;
import com.hazelcast.core.MembershipListener;
/**
* Hazelcast-based implementation of the {@link MessengerFactory} interface.
@@ -37,8 +37,8 @@ import com.hazelcast.core.ITopic;
*/
public class HazelcastMessengerFactory implements MessengerFactory
{
private HazelcastInstance hazelcast;
private HazelcastInstanceFactory hazelcastInstanceFactory;
@Override
public <T extends Serializable> Messenger<T> createMessenger(String appRegion)
{
@@ -48,28 +48,70 @@ public class HazelcastMessengerFactory implements MessengerFactory
@Override
public <T extends Serializable> Messenger<T> createMessenger(String appRegion, boolean acceptLocalMessages)
{
if (!isClusterActive())
{
return new NullMessenger<T>();
}
// Clustering is enabled, create a messenger.
HazelcastInstance hazelcast = hazelcastInstanceFactory.getInstance();
ITopic<T> topic = hazelcast.getTopic(appRegion);
String address = hazelcast.getCluster().getLocalMember().getInetSocketAddress().toString();
return new HazelcastMessenger<T>(topic, address);
}
/**
* @param hazelcast the hazelcast to set
* Provide the messenger factory with a means to obtain a HazelcastInstance.
*
* @param hazelcastInstanceFactory
*/
public void setHazelcast(HazelcastInstance hazelcast)
public void setHazelcastInstanceFactory(HazelcastInstanceFactory hazelcastInstanceFactory)
{
this.hazelcast = hazelcast;
this.hazelcastInstanceFactory = hazelcastInstanceFactory;
}
@Override
public boolean isClusterActive()
{
Config config = hazelcast.getConfig();
if (config == null || config.getGroupConfig() == null)
return hazelcastInstanceFactory.isClusteringEnabled();
}
@Override
public void addMembershipListener(final ClusterMembershipListener listener)
{
if (isClusterActive())
{
return false;
HazelcastInstance hazelcast = hazelcastInstanceFactory.getInstance();
hazelcast.getCluster().addMembershipListener(new MembershipListener()
{
@Override
public void memberRemoved(MembershipEvent e)
{
listener.memberLeft(member(e), cluster(e));
}
@Override
public void memberAdded(MembershipEvent e)
{
listener.memberJoined(member(e), cluster(e));
}
private String member(MembershipEvent e)
{
return e.getMember().getInetSocketAddress().toString();
}
private String[] cluster(MembershipEvent e)
{
Set<Member> members = e.getCluster().getMembers();
String[] cluster = new String[members.size()];
int i = 0;
for (Member m : members)
{
cluster[i++] = m.getInetSocketAddress().toString();
}
return cluster;
}
});
}
GroupConfig groupConfig = config.getGroupConfig();
return StringUtils.hasText(groupConfig.getName());
}
}