[jboss-cvs] JBossCache/src/org/jboss/cache/pojo/jmx ...

[Brian Stansberry]

  User: bstansberry
  Date: 07/05/11 18:42:10

  Modified:    src/org/jboss/cache/pojo/jmx  JmxUtil.java
  Log:
  JMX cleanups
  
  Revision  Changes    Path
  1.4       +12 -38    JBossCache/src/org/jboss/cache/pojo/jmx/JmxUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JmxUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/jmx/JmxUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- JmxUtil.java	11 May 2007 16:49:10 -0000	1.3
  +++ JmxUtil.java	11 May 2007 22:42:10 -0000	1.4
  @@ -8,7 +8,6 @@
   package org.jboss.cache.pojo.jmx;
   
   import java.util.Hashtable;
  -import java.util.Map;
   
   import javax.management.MBeanServer;
   import javax.management.MalformedObjectNameException;
  @@ -18,18 +17,14 @@
    * Various JMX related utilities
    *
    * @author Ben Wang
  - * @version $Id: JmxUtil.java,v 1.3 2007/05/11 16:49:10 bstansberry Exp $
  + * @version $Id: JmxUtil.java,v 1.4 2007/05/11 22:42:10 bstansberry Exp $
    */
   public class JmxUtil extends org.jboss.cache.jmx.JmxUtil
   {
      public static final String POJO_CACHE_DOMAIN = "jboss.pojocache";
  -   public static final String PC_PREFIX = POJO_CACHE_DOMAIN + ":service=PojoCache,clusterName=";
      public static final String POJO_CACHE_TYPE = "PojoCache";
  -   public static final String POJO_SERVICE_PREFIX = "Pojo";
  -   public static final String SERVICE_KEY_NAME = "service";
  -   public static final String CACHE_TYPE_KEY_NAME = "cacheType";
   
  -   public static void registerPojoCache(MBeanServer server, PojoCacheJmxWrapper cache, String objectName)
  +   public static void registerPojoCache(MBeanServer server, PojoCacheJmxWrapperMBean cache, String objectName)
              throws Exception
      {
         if (server == null || cache == null || objectName == null)
  @@ -40,42 +35,21 @@
   
      }
      
  -   private static ObjectName toObjectName(String name)
  +   public static ObjectName getPlainCacheObjectName(ObjectName pojoCacheName) 
  +      throws MalformedObjectNameException
      {
  -      try
  +      String domain = pojoCacheName.getDomain();
  +      Hashtable attributes = new Hashtable(pojoCacheName.getKeyPropertyList());
  +      Object type = attributes.get(CACHE_TYPE_KEY);
  +      if (type == null || POJO_CACHE_TYPE.equals(type))
         {
  -         return new ObjectName(name);
  +         attributes.put(CACHE_TYPE_KEY, PLAIN_CACHE_TYPE);
         }
  -      catch (MalformedObjectNameException e)
  +      else
         {
  -         throw new IllegalArgumentException(e);
  +         attributes.put(UNIQUE_ID_KEY, String.valueOf(System.currentTimeMillis()));
         }
  -   }
  -
  -   public static String getPojoCacheObjectName(org.jboss.cache.pojo.PojoCache cache)
  -   {
  -      // get the cache's registration name
  -      String tmpName = getCacheObjectName(cache.getCache());
  -      ObjectName cacheName = toObjectName(tmpName);
  -      
  -      String newName = POJO_CACHE_DOMAIN + ":";
  -      Hashtable<String, String> keyPropertyList = cacheName.getKeyPropertyList();
  -      for (Map.Entry<String, String> entry : keyPropertyList.entrySet())
  -      {
  -         String key = entry.getKey();
  -         String value = entry.getValue();
  -         
  -         if (SERVICE_KEY_NAME.equals(key) || CACHE_TYPE_KEY_NAME.equals(key))
  -            continue;
  -         newName += key + "=" + value + ",";
  -      }
  -
  -      String serviceName = keyPropertyList.get(SERVICE_KEY_NAME);
  -      serviceName = serviceName != null ? POJO_SERVICE_PREFIX + serviceName : POJO_CACHE_TYPE;
  -
  -      newName += SERVICE_KEY_NAME + "=" + serviceName + "," + CACHE_TYPE_KEY_NAME + "=" + POJO_CACHE_TYPE;
  -
  -      return toObjectName(newName).getCanonicalName();
  +      return new ObjectName(domain, attributes);
      }
   
      public static void unregisterPojoCache(MBeanServer server, String objectName)