[jbosscache-commits] JBoss Cache SVN: r8150 - in core/trunk/src: main/java/org/jboss/cache/marshall and 2 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Aug 5 07:45:34 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-08-05 07:45:34 -0400 (Wed, 05 Aug 2009)
New Revision: 8150
Modified:
core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
core/trunk/src/main/java/org/jboss/cache/jmx/LegacyConfiguration.java
core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
Log:
JBCACHE-1517 JGroups 2.8 compatibility
Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2009-08-05 11:21:18 UTC (rev 8149)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2009-08-05 11:45:34 UTC (rev 8150)
@@ -35,7 +35,6 @@
import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.LegacyConfigurationException;
-import org.jboss.cache.config.RuntimeConfig;
import org.jboss.cache.config.parsing.JGroupsStackParser;
import org.jboss.cache.config.parsing.XmlConfigurationParser2x;
import org.jboss.cache.config.parsing.element.BuddyElementParser;
@@ -43,9 +42,7 @@
import org.jboss.cache.config.parsing.element.LoadersElementParser;
import org.jboss.cache.util.CachePrinter;
import org.jgroups.Address;
-import org.jgroups.Channel;
import org.jgroups.ChannelFactory;
-import org.jgroups.jmx.JChannelFactoryMBean;
import org.w3c.dom.Element;
import javax.management.*;
@@ -90,7 +87,6 @@
private Element evictionConfig;
private Element cacheLoaderConfig;
private Element clusterConfig;
- private JChannelFactoryMBean multiplexerService;
private BuddyElementParser buddyElementParser = new BuddyElementParser();
private LoadersElementParser loadersElementParser = new LoadersElementParser();
@@ -299,11 +295,6 @@
return getConfiguration().getLockAcquisitionTimeout();
}
- public JChannelFactoryMBean getMultiplexerService()
- {
- return multiplexerService;
- }
-
public String getMultiplexerStack()
{
return getConfiguration().getMultiplexerStack();
@@ -511,11 +502,6 @@
getConfiguration().setLockAcquisitionTimeout(timeout);
}
- public void setMultiplexerService(JChannelFactoryMBean muxService)
- {
- this.multiplexerService = muxService;
- }
-
public void setMultiplexerStack(String stackName)
{
getConfiguration().setMultiplexerStack(stackName);
@@ -958,10 +944,6 @@
log.debug("Constructing Cache");
CacheFactory<K, V> cf = new DefaultCacheFactory<K, V>();
setCache(cf.createCache(config, false));
- if (multiplexerService != null)
- {
- injectMuxChannel();
- }
}
protected boolean registerJmxResources() throws CacheException
@@ -990,28 +972,6 @@
// -------------------------------------------------------- Private methods
- private void injectMuxChannel() throws CacheException
- {
- Configuration cfg = getConfiguration();
- RuntimeConfig rtcfg = cfg.getRuntimeConfig();
-
- // Only inject if there isn't already a channel or factory
- if (rtcfg.getMuxChannelFactory() == null && rtcfg.getChannel() == null)
- {
- Channel ch;
- try
- {
- ch = multiplexerService.createMultiplexerChannel(cfg.getMultiplexerStack(), cfg.getClusterName());
- }
- catch (Exception e)
- {
- throw new CacheException("Exception creating multiplexed channel", e);
- }
- rtcfg.setChannel(ch);
- }
- }
-
-
/**
* Adds and removes the CacheListener.
* A counter is used to determine whether we have any clients who are
Modified: core/trunk/src/main/java/org/jboss/cache/jmx/LegacyConfiguration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/jmx/LegacyConfiguration.java 2009-08-05 11:21:18 UTC (rev 8149)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/LegacyConfiguration.java 2009-08-05 11:45:34 UTC (rev 8150)
@@ -23,7 +23,6 @@
import org.jboss.cache.Region;
import org.jgroups.ChannelFactory;
-import org.jgroups.jmx.JChannelFactoryMBean;
import org.w3c.dom.Element;
import javax.transaction.TransactionManager;
@@ -357,9 +356,4 @@
ChannelFactory getMuxChannelFactory();
void setMuxChannelFactory(ChannelFactory factory);
-
- JChannelFactoryMBean getMultiplexerService();
-
- void setMultiplexerService(JChannelFactoryMBean muxService);
-
}
\ No newline at end of file
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2009-08-05 11:21:18 UTC (rev 8149)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2009-08-05 11:45:34 UTC (rev 8150)
@@ -21,6 +21,8 @@
*/
package org.jboss.cache.marshall;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.RPCManager;
import org.jboss.cache.RPCManagerImpl.FlushTracker;
@@ -77,6 +79,7 @@
private Configuration configuration;
private RPCManager rpcManager;
private ReplicationObserver replicationObserver;
+ protected Log log = LogFactory.getLog(CommandAwareRpcDispatcher.class);
public CommandAwareRpcDispatcher() {}
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2009-08-05 11:21:18 UTC (rev 8149)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2009-08-05 11:45:34 UTC (rev 8150)
@@ -46,17 +46,15 @@
import org.jboss.cache.loader.SingletonStoreCacheLoader;
import org.jboss.cache.loader.jdbm.JdbmCacheLoader;
import org.jboss.cache.lock.IsolationLevel;
-import org.jboss.cache.multiplexer.MultiplexerTestHelper;
import org.jboss.cache.transaction.BatchModeTransactionManagerLookup;
import org.jgroups.ChannelFactory;
import org.jgroups.JChannelFactory;
-import org.jgroups.jmx.JChannelFactoryMBean;
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
import javax.transaction.TransactionManager;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -242,35 +240,35 @@
assertSame("Same ChannelFactory", cf, rc.getMuxChannelFactory());
}
- @SuppressWarnings("unchecked")
- public void testLegacyMuxChannelCreation() throws Exception
- {
- CacheJmxWrapperMBean<String, String> wrapper = new CacheJmxWrapper<String, String>();
- registerWrapper(wrapper);
+// @SuppressWarnings("unchecked")
+// public void testLegacyMuxChannelCreation() throws Exception
+// {
+// CacheJmxWrapperMBean<String, String> wrapper = new CacheJmxWrapper<String, String>();
+// registerWrapper(wrapper);
+//
+// wrapper = (CacheJmxWrapperMBean<String, String>) MBeanServerInvocationHandler.newProxyInstance(mBeanServer, mBeanName, CacheJmxWrapperMBean.class, false);
+// wrapper.setMultiplexerStack(MultiplexerTestHelper.MUX_STACK + Thread.currentThread().getName());
+//
+// JChannelFactory factory = new JChannelFactory();
+// factory.setDomain("jbc.mux.test");
+// factory.setExposeChannels(false);
+// factory.setMultiplexerConfig(MultiplexerTestHelper.getClusterConfigElement(getDefaultProperties()));
+//
+// ObjectName on = new ObjectName("jgroups:service=Mux");
+// mBeanServer.registerMBean(new org.jgroups.jmx.JChannelFactory(factory), on);
+//
+// wrapper.setMultiplexerService((JChannelFactoryMBean) MBeanServerInvocationHandler.newProxyInstance(mBeanServer, on, JChannelFactoryMBean.class, false));
+//
+// wrapper.start();
+//
+// RuntimeConfig rc = wrapper.getConfiguration().getRuntimeConfig();
+// assertNotNull("Channel created", rc.getChannel());
+//
+// //wrapper.stop();
+// //wrapper.destroy();
+//
+// }
- wrapper = (CacheJmxWrapperMBean<String, String>) MBeanServerInvocationHandler.newProxyInstance(mBeanServer, mBeanName, CacheJmxWrapperMBean.class, false);
- wrapper.setMultiplexerStack(MultiplexerTestHelper.MUX_STACK + Thread.currentThread().getName());
-
- JChannelFactory factory = new JChannelFactory();
- factory.setDomain("jbc.mux.test");
- factory.setExposeChannels(false);
- factory.setMultiplexerConfig(MultiplexerTestHelper.getClusterConfigElement(getDefaultProperties()));
-
- ObjectName on = new ObjectName("jgroups:service=Mux");
- mBeanServer.registerMBean(new org.jgroups.jmx.JChannelFactory(factory), on);
-
- wrapper.setMultiplexerService((JChannelFactoryMBean) MBeanServerInvocationHandler.newProxyInstance(mBeanServer, on, JChannelFactoryMBean.class, false));
-
- wrapper.start();
-
- RuntimeConfig rc = wrapper.getConfiguration().getRuntimeConfig();
- assertNotNull("Channel created", rc.getChannel());
-
- //wrapper.stop();
- //wrapper.destroy();
-
- }
-
protected static Element getBuddyReplicationConfig(boolean legacy) throws Exception
{
if (legacy)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-08-05 11:21:18 UTC (rev 8149)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-08-05 11:45:34 UTC (rev 8150)
@@ -3,9 +3,9 @@
*/
package org.jboss.cache.optimistic;
-import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.VersionedDataCommand;
import org.jboss.cache.commands.WriteCommand;
import org.jboss.cache.config.CacheLoaderConfig;
@@ -40,7 +40,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* @author manik
@@ -314,10 +313,10 @@
return 0;
}
- public int compareTo(Object o)
- {
- return 0;
- }
+// public int compareTo(Object o)
+// {
+// return 0;
+// }
public void readFrom(DataInputStream
arg0)
More information about the jbosscache-commits
mailing list