[jboss-cvs] JBossAS SVN: r109125 - in projects/cluster/ha-server-ispn/trunk: src/main/java/org/jboss/ha/ispn and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 4 11:01:18 EDT 2010
Author: pferraro
Date: 2010-11-04 11:01:17 -0400 (Thu, 04 Nov 2010)
New Revision: 109125
Modified:
projects/cluster/ha-server-ispn/trunk/pom.xml
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerTest.java
Log:
Upgrade to infinispan 4.2.0.BETA1
Auto-set GlobalConfiguration.setCacheManagerName(), if undefined, with id from registry.
Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml 2010-11-04 14:22:48 UTC (rev 109124)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml 2010-11-04 15:01:17 UTC (rev 109125)
@@ -32,7 +32,7 @@
</scm>
<properties>
- <version.infinispan>4.2.0.ALPHA5</version.infinispan>
+ <version.infinispan>4.2.0.BETA1</version.infinispan>
<version.jta>1.0.1.GA</version.jta>
<version.junit>4.8.2</version.junit>
<version.easymock>3.0</version.easymock>
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java 2010-11-04 14:22:48 UTC (rev 109124)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java 2010-11-04 15:01:17 UTC (rev 109125)
@@ -87,24 +87,28 @@
global.setAsyncListenerExecutorProperties(globalConfig.getAsyncListenerExecutorProperties());
global.setAsyncTransportExecutorFactoryClass(globalConfig.getAsyncTransportExecutorFactoryClass());
global.setAsyncTransportExecutorProperties(globalConfig.getAsyncTransportExecutorProperties());
+ global.setCacheManagerName(globalConfig.getCacheManagerName() + "/" + cacheName);
global.setClusterName(clusterName);
global.setDistributedSyncTimeout(globalConfig.getDistributedSyncTimeout());
global.setEvictionScheduledExecutorFactoryClass(globalConfig.getEvictionScheduledExecutorFactoryClass());
global.setEvictionScheduledExecutorProperties(globalConfig.getEvictionScheduledExecutorProperties());
global.setExposeGlobalJmxStatistics(globalConfig.isExposeGlobalJmxStatistics());
global.setJmxDomain(globalConfig.getJmxDomain());
+ global.setMachineId(globalConfig.getMachineId());
global.setMarshallerClass(globalConfig.getMarshallerClass());
global.setMarshallVersion(globalConfig.getMarshallVersion());
global.setMBeanServerLookup(globalConfig.getMBeanServerLookup());
+ global.setRackId(globalConfig.getRackId());
global.setReplicationQueueScheduledExecutorFactoryClass(globalConfig.getReplicationQueueScheduledExecutorFactoryClass());
global.setReplicationQueueScheduledExecutorProperties(globalConfig.getReplicationQueueScheduledExecutorProperties());
global.setShutdownHookBehavior(globalConfig.getShutdownHookBehavior());
+ global.setSiteId(globalConfig.getSiteId());
global.setStrictPeerToPeer(globalConfig.isStrictPeerToPeer());
global.setTransportClass(globalConfig.getTransportClass());
global.setTransportNodeName(globalConfig.getTransportNodeName());
Properties properties = new Properties(globalConfig.getTransportProperties());
- properties.setProperty("clusterId", clusterName);
+ properties.setProperty(DefaultCacheContainerFactory.CHANNEL_ID, clusterName);
global.setTransportProperties(properties);
// Create single use cache manager
@@ -133,14 +137,14 @@
public void addListener(Object listener)
{
super.addListener(listener);
- // Warning - very, very hacky...
+ // This is hacky...
// Better solution - use custom notifier that allows
// some level of control over listeners order
if (listener != DefaultCacheContainer.this)
{
// Make sure our listener is last since our listener stops the container!
- this.removeListener(DefaultCacheContainer.this);
- this.addListener(DefaultCacheContainer.this);
+ super.removeListener(DefaultCacheContainer.this);
+ super.addListener(DefaultCacheContainer.this);
}
}
};
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java 2010-11-04 14:22:48 UTC (rev 109124)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java 2010-11-04 15:01:17 UTC (rev 109125)
@@ -34,6 +34,7 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
+import org.infinispan.config.GlobalConfiguration;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted;
@@ -53,10 +54,11 @@
*/
public class DefaultCacheContainerRegistry implements CacheContainerRegistry
{
+ public static final String DEFAULT_CACHE_MANAGER_NAME = new GlobalConfiguration().getCacheManagerName();
+
static Logger logger = Logger.getLogger(DefaultCacheContainerRegistry.class);
private static final AtomicReference<CacheContainerRegistry> singleton = new AtomicReference<CacheContainerRegistry>();
-
public static CacheContainerRegistry getInstance()
{
return singleton.get();
@@ -171,7 +173,16 @@
public void add(CacheContainerRegistryConfigurationEntry configEntry) throws NamingException
{
String id = configEntry.getId();
- EmbeddedCacheManager container = this.factory.createCacheContainer(configEntry.getConfiguration());
+ CacheContainerConfiguration config = configEntry.getConfiguration();
+ GlobalConfiguration globalConfig = config.getGlobalConfiguration();
+
+ // ISPN-754 As of 4.2.0.BETA1, Infinispan uses this to build its JMX object names
+ if (globalConfig.getCacheManagerName() == DEFAULT_CACHE_MANAGER_NAME)
+ {
+ globalConfig.setCacheManagerName(id);
+ }
+
+ EmbeddedCacheManager container = this.factory.createCacheContainer(config);
String jndiName = configEntry.getJndiName();
List<String> aliases = configEntry.getAliases();
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java 2010-11-04 14:22:48 UTC (rev 109124)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java 2010-11-04 15:01:17 UTC (rev 109125)
@@ -161,6 +161,9 @@
this.control.verify();
+ Assert.assertEquals(defaultEntry.getId(), defaultConfig.getGlobalConfiguration().getCacheManagerName());
+ Assert.assertEquals(otherEntry.getId(), otherConfig.getGlobalConfiguration().getCacheManagerName());
+
Set<String> names = registry.getCacheContainers();
Assert.assertEquals(2, names.size());
Assert.assertTrue(names.contains("default"));
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerTest.java 2010-11-04 14:22:48 UTC (rev 109124)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerTest.java 2010-11-04 15:01:17 UTC (rev 109125)
@@ -118,7 +118,8 @@
Assert.assertEquals(config, manager.getDefaultConfiguration());
GlobalConfiguration globalConfig = manager.getGlobalConfiguration();
Assert.assertEquals("cluster/" + cacheName, globalConfig.getClusterName());
- Assert.assertEquals("cluster/" + cacheName, globalConfig.getTransportProperties().getProperty("clusterId"));
+ Assert.assertEquals("cluster/" + cacheName, globalConfig.getTransportProperties().getProperty(DefaultCacheContainerFactory.CHANNEL_ID));
+ Assert.assertEquals(DefaultCacheContainerRegistry.DEFAULT_CACHE_MANAGER_NAME + "/" + cacheName, globalConfig.getCacheManagerName());
Assert.assertEquals(CacheContainer.DEFAULT_CACHE_NAME, result.getName());
Set<Object> listeners = manager.getListeners();
Assert.assertTrue(listeners.contains(this.container));
More information about the jboss-cvs-commits
mailing list