[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/jmx ...

[Manik Surtani]

  User: msurtani
  Date: 06/09/07 09:52:29

  Modified:    tests/functional/org/jboss/cache/jmx  CacheMBeanTest.java
  Log:
  cleaned up jmx interfaces, fixed tx and gtx allocation problems
  
  Revision  Changes    Path
  1.2       +4 -5      JBossCache/tests/functional/org/jboss/cache/jmx/CacheMBeanTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheMBeanTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/jmx/CacheMBeanTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- CacheMBeanTest.java	6 Sep 2006 14:45:45 -0000	1.1
  +++ CacheMBeanTest.java	7 Sep 2006 13:52:29 -0000	1.2
  @@ -5,7 +5,6 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.config.Configuration;
   import org.jboss.cache.factories.DefaultCacheFactory;
  -import org.jboss.cache.util.MBeanConfigurator;
   
   import javax.management.MBeanServer;
   import javax.management.MBeanServerFactory;
  @@ -33,7 +32,7 @@
         c.setUseInterceptorMbeans(true);
         c.setCacheMode(Configuration.CacheMode.LOCAL);
         cache = new DefaultCacheFactory().createCache(c);
  -      mBeanNameStr = MBeanConfigurator.PREFIX + cache.getConfiguration().getClusterName();
  +      mBeanNameStr = JmxUtil.PREFIX + cache.getConfiguration().getClusterName();
         mBeanName = new ObjectName(mBeanNameStr);
      }
   
  @@ -63,9 +62,9 @@
   
         // should be 3 interceptor MBeans loaded:
         ObjectName[] interceptorMBeanNames = {
  -              new ObjectName(mBeanNameStr + MBeanConfigurator.MBEAN_KEY + "TxInterceptor"),
  -              new ObjectName(mBeanNameStr + MBeanConfigurator.MBEAN_KEY + "CacheMgmtInterceptor"),
  -              new ObjectName(mBeanNameStr + MBeanConfigurator.MBEAN_KEY + "InvocationContextInterceptor")
  +              new ObjectName(mBeanNameStr + JmxUtil.MBEAN_KEY + "TxInterceptor"),
  +              new ObjectName(mBeanNameStr + JmxUtil.MBEAN_KEY + "CacheMgmtInterceptor"),
  +              new ObjectName(mBeanNameStr + JmxUtil.MBEAN_KEY + "InvocationContextInterceptor")
         };
   
   //      TestingUtil.sleepThread(600000);