mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged BRANCHES/DEV/mward/cifs_hazelcast_conf to HEAD:
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:
@@ -531,7 +531,6 @@ public abstract class AlfrescoTransactionSupport
|
||||
private final Set<LuceneIndexerAndSearcher> lucenes;
|
||||
private final LinkedHashSet<TransactionListener> listeners;
|
||||
private final Set<TransactionalCache<Serializable, Object>> transactionalCaches;
|
||||
// private final Set<JGroupsEhCacheListener> jgroupsEhCacheListeners;
|
||||
private final Map<Object, Object> resources;
|
||||
|
||||
/**
|
||||
@@ -548,7 +547,6 @@ public abstract class AlfrescoTransactionSupport
|
||||
lucenes = new HashSet<LuceneIndexerAndSearcher>(3);
|
||||
listeners = new LinkedHashSet<TransactionListener>(5);
|
||||
transactionalCaches = new HashSet<TransactionalCache<Serializable, Object>>(3);
|
||||
// jgroupsEhCacheListeners = new HashSet<JGroupsEhCacheListener>(3);
|
||||
resources = new HashMap<Object, Object>(17);
|
||||
}
|
||||
|
||||
@@ -602,10 +600,6 @@ public abstract class AlfrescoTransactionSupport
|
||||
{
|
||||
return transactionalCaches.add((TransactionalCache<Serializable, Object>)listener);
|
||||
}
|
||||
// else if (listener instanceof JGroupsEhCacheListener)
|
||||
// {
|
||||
// return jgroupsEhCacheListeners.add((JGroupsEhCacheListener)listener);
|
||||
// }
|
||||
else
|
||||
{
|
||||
return listeners.add(listener);
|
||||
@@ -709,12 +703,6 @@ public abstract class AlfrescoTransactionSupport
|
||||
{
|
||||
cache.beforeCommit(readOnly);
|
||||
}
|
||||
//
|
||||
// // Flush the JGroups listeners
|
||||
// for (JGroupsEhCacheListener listener : jgroupsEhCacheListeners)
|
||||
// {
|
||||
// listener.beforeCommit(readOnly);
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user