[jboss-cvs] JBossAS SVN: r109501 - in projects/cluster/ha-server-ispn/trunk: src/main/java/org/jboss/ha/ispn and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 26 19:01:23 EST 2010
Author: pferraro
Date: 2010-11-26 19:01:23 -0500 (Fri, 26 Nov 2010)
New Revision: 109501
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/DefaultCacheContainerFactory.java
Log:
Upgrade Infinispan to 4.2.0.CR2. Remove obsolete workarounds.
Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml 2010-11-26 22:02:47 UTC (rev 109500)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml 2010-11-27 00:01:23 UTC (rev 109501)
@@ -32,7 +32,7 @@
</scm>
<properties>
- <version.infinispan>4.2.0.BETA1</version.infinispan>
+ <version.infinispan>4.2.0.CR2</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-26 22:02:47 UTC (rev 109500)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java 2010-11-27 00:01:23 UTC (rev 109501)
@@ -23,7 +23,6 @@
import java.security.AccessController;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -93,37 +92,11 @@
if (container == null)
{
- // Workaround for ISPN-744
- GlobalConfiguration global = new GlobalConfiguration();
- global.setAllowDuplicateDomains(globalConfig.isAllowDuplicateDomains());
- global.setAsyncListenerExecutorFactoryClass(globalConfig.getAsyncListenerExecutorFactoryClass());
- global.setAsyncListenerExecutorProperties(globalConfig.getAsyncListenerExecutorProperties());
- global.setAsyncTransportExecutorFactoryClass(globalConfig.getAsyncTransportExecutorFactoryClass());
- global.setAsyncTransportExecutorProperties(globalConfig.getAsyncTransportExecutorProperties());
+ GlobalConfiguration global = globalConfig.clone();
global.setCacheManagerName(containerName);
global.setClusterName(this.appendCacheName(globalConfig.getClusterName(), cacheName));
- 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());
+ global.getTransportProperties().setProperty(DefaultCacheContainerFactory.CHANNEL_ID, global.getClusterName());
- Properties properties = new Properties(globalConfig.getTransportProperties());
- properties.setProperty(DefaultCacheContainerFactory.CHANNEL_ID, global.getClusterName());
- global.setTransportProperties(properties);
-
// Create single use cache manager
container = new SingletonCacheManager(this, cacheName, global, config);
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java 2010-11-26 22:02:47 UTC (rev 109500)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java 2010-11-27 00:01:23 UTC (rev 109501)
@@ -21,7 +21,6 @@
*/
package org.jboss.ha.ispn;
-import java.lang.ref.WeakReference;
import java.util.Locale;
import java.util.Properties;
@@ -56,7 +55,7 @@
*/
@SuppressWarnings("deprecation")
@Listener
-public class DefaultCacheContainerFactory implements CacheContainerFactory
+public class DefaultCacheContainerFactory implements CacheContainerFactory, MBeanServerLookup
{
public static final String CHANNEL_ID = "channelId";
public static final String CHANNEL_FACTORY = "channelFactory";
@@ -86,6 +85,8 @@
GlobalConfiguration global = configuration.getGlobalConfiguration();
// Don't register shutdown hook - caches/containers will stop when registry stops
global.setShutdownHookBehavior(ShutdownHookBehavior.DONT_REGISTER);
+ global.setMBeanServerLookup(this);
+
if (global.getTransportClass() != null)
{
global.setStrictPeerToPeer(false);
@@ -98,9 +99,6 @@
properties.setProperty(JGroupsTransport.CHANNEL_LOOKUP, ChannelFactoryChannelLookup.class.getName());
}
}
-
- MBeanServerReferenceLookup.serverRef = new WeakReference<MBeanServer>(this.server);
- global.setMBeanServerLookup(MBeanServerReferenceLookup.class.getName());
EmbeddedCacheManager manager = new DefaultCacheManager(global, configuration.getDefaultConfiguration(), false);
@@ -113,6 +111,16 @@
return new DefaultCacheContainer(manager);
}
+ /**
+ * {@inheritDoc}
+ * @see org.infinispan.jmx.MBeanServerLookup#getMBeanServer(java.util.Properties)
+ */
+ @Override
+ public MBeanServer getMBeanServer(Properties properties)
+ {
+ return this.server;
+ }
+
@CacheStarted
public void cacheStarted(CacheStartedEvent event)
{
@@ -206,20 +214,4 @@
return this.autoStop;
}
}
-
- public static class MBeanServerReferenceLookup implements MBeanServerLookup
- {
- // Hacky way to reference injected mbean server
- static WeakReference<MBeanServer> serverRef;
-
- /**
- * {@inheritDoc}
- * @see org.infinispan.jmx.MBeanServerLookup#getMBeanServer()
- */
- @Override
- public MBeanServer getMBeanServer()
- {
- return serverRef.get();
- }
- }
}
More information about the jboss-cvs-commits
mailing list