[infinispan-commits] Infinispan SVN: r2663 - in branches/4.2.x: jopr-plugin/src/main/java/org/infinispan/jopr and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-11-03 12:45:38 -0400 (Wed, 03 Nov 2010)
New Revision: 2663

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/CacheDelegate.java
   branches/4.2.x/jopr-plugin/src/main/java/org/infinispan/jopr/CacheComponent.java
Log:
ISPN-675 - Make Infinispan JOPR plugin friendly with AS environments - Tidy up.
ISPN-754 - Build object names that follow best practices, are clearer and avoid confusion - Make sure JMX getCacheName returns a cache name with cluster mode so that it can be found properly by jopr plugin.

Modified: branches/4.2.x/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/CacheDelegate.java	2010-11-03 16:16:02 UTC (rev 2662)
+++ branches/4.2.x/core/src/main/java/org/infinispan/CacheDelegate.java	2010-11-03 16:45:38 UTC (rev 2663)
@@ -399,7 +399,8 @@
    @ManagedAttribute(description = "Returns the cache name")
    @Metric(displayName = "Cache name", dataType = DataType.TRAIT, displayType = DisplayType.SUMMARY)
    public String getCacheName() {
-      return getName().equals(CacheContainer.DEFAULT_CACHE_NAME) ? "Default Cache" : getName();
+      String name = getName().equals(CacheContainer.DEFAULT_CACHE_NAME) ? "Default Cache" : getName();
+      return name + "(" + getConfiguration().getCacheModeString().toLowerCase() + ")";
    }
 
    public String getVersion() {

Modified: branches/4.2.x/jopr-plugin/src/main/java/org/infinispan/jopr/CacheComponent.java
===================================================================
--- branches/4.2.x/jopr-plugin/src/main/java/org/infinispan/jopr/CacheComponent.java	2010-11-03 16:16:02 UTC (rev 2662)
+++ branches/4.2.x/jopr-plugin/src/main/java/org/infinispan/jopr/CacheComponent.java	2010-11-03 16:45:38 UTC (rev 2663)
@@ -207,20 +207,6 @@
       return null;
    }
 
-//   private EmsBean queryCacheBean(EmsConnection conn, String cacheManagerName, String cacheName) {
-//      String pattern = getNamedCachePattern(cacheManagerName, cacheName);
-//      if (log.isTraceEnabled()) log.trace("Pattern to query is {0}", pattern);
-//      ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(pattern);
-//      // Assume that a single cache fulfills this pattern since
-//      // the most normal thing is for the same domain to be
-//      // used by all cache within the same VM
-//      return conn.queryBeans(queryUtility.getTranslatedQuery()).get(0);
-//   }
-
-   private String getNamedCachePattern(String cacheManagerName, String cacheName) {
-      return namedCacheComponentPattern(cacheManagerName, cacheName, "Cache") + ",*";
-   }
-
    private String getSingleComponentPattern(String cacheManagerName, String cacheName, String componentName) {
       return namedCacheComponentPattern(cacheManagerName, cacheName, componentName) + ",*";
    }
@@ -230,19 +216,6 @@
             + ",name=" + ObjectName.quote(cacheName);
    }
 
-//   private EmsBean getComponentBean(String name) {
-//      EmsConnection conn = getConnection();
-//      String componentName = name.substring(0, name.indexOf("."));
-//      String pattern = getSingleComponentPattern(cacheManagerName, cacheName, componentName);
-//      if (log.isTraceEnabled()) log.trace("Pattern to query is {0}", pattern);
-//      ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(pattern);
-//      EmsBean bean = conn.queryBeans(queryUtility.getTranslatedQuery()).get(0);
-//      if (bean == null) {
-//         if (log.isTraceEnabled()) log.trace("No mbean found with name {0}", pattern);
-//      }
-//      return bean;
-//   }
-
    private EmsBean queryCacheBean() {
       return queryBean("Cache");
    }