[infinispan-commits] Infinispan SVN: r460 - in trunk: tools/src/main/java/org/infinispan/tools/doclet/jmx and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-06-13 08:13:52 -0400 (Sat, 13 Jun 2009)
New Revision: 460

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
   trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
Log:
JMX info update

Modified: trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java	2009-06-12 14:10:45 UTC (rev 459)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java	2009-06-13 12:13:52 UTC (rev 460)
@@ -37,6 +37,7 @@
 import org.infinispan.factories.annotations.Inject;
 import org.infinispan.factories.annotations.Start;
 import org.infinispan.interceptors.base.BaseRpcInterceptor;
+import org.infinispan.jmx.annotations.MBean;
 import org.infinispan.jmx.annotations.ManagedAttribute;
 import org.infinispan.jmx.annotations.ManagedOperation;
 import org.infinispan.transaction.xa.GlobalTransaction;
@@ -64,6 +65,7 @@
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  * @since 4.0
  */
+ at MBean(objectName = "Invalidation", description = "Component responsible for invalidating entries on remote caches when entries are written to locally.")
 public class InvalidationInterceptor extends BaseRpcInterceptor {
    private final AtomicLong invalidations = new AtomicLong(0);
    protected Map<GlobalTransaction, List<VisitableCommand>> txMods;

Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java	2009-06-12 14:10:45 UTC (rev 459)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java	2009-06-13 12:13:52 UTC (rev 460)
@@ -39,8 +39,10 @@
       List<MBeanComponent> mbeans = new LinkedList<MBeanComponent>();
 
       for (ClassDoc cd : classes) {
-         MBeanComponent mbean = toJmxComponent(cd);
-         if (mbean != null) mbeans.add(mbean);
+         if (!cd.isAbstract()) {
+            MBeanComponent mbean = toJmxComponent(cd);
+            if (mbean != null) mbeans.add(mbean);
+         }
       }
 
       // sort components alphabetically
@@ -158,7 +160,8 @@
    private static String fromBeanConvention(String getterOrSetter) {
       if (getterOrSetter.startsWith("get") || getterOrSetter.startsWith("set")) {
          String withoutGet = getterOrSetter.substring(4);
-         return Character.toLowerCase(getterOrSetter.charAt(3)) + withoutGet;
+         // not specifically BEAN convention, but this is what is bound in JMX.
+         return Character.toUpperCase(getterOrSetter.charAt(3)) + withoutGet;
       }
       return getterOrSetter;
    }