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

[Manik Surtani]

  User: msurtani
  Date: 07/01/05 09:27:15

  Modified:    src/org/jboss/cache/jmx    CacheLegacyJmxWrapper.java
                        CacheLegacyJmxWrapperMBean.java JmxUtil.java
  Log:
  fixed some stuff
  
  Revision  Changes    Path
  1.4       +3 -2      JBossCache/src/org/jboss/cache/jmx/CacheLegacyJmxWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLegacyJmxWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/CacheLegacyJmxWrapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- CacheLegacyJmxWrapper.java	4 Jan 2007 15:39:38 -0000	1.3
  +++ CacheLegacyJmxWrapper.java	5 Jan 2007 14:27:15 -0000	1.4
  @@ -29,6 +29,7 @@
   import org.jgroups.jmx.JChannelFactoryMBean;
   import org.w3c.dom.Element;
   
  +import javax.management.NotificationBroadcaster;
   import javax.transaction.TransactionManager;
   
   /**
  @@ -37,9 +38,9 @@
    * configuration of the cache using the JBoss AS 4.x JMX microkernel.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
  -public class CacheLegacyJmxWrapper extends CacheJmxWrapper implements CacheLegacyJmxWrapperMBean
  +public class CacheLegacyJmxWrapper extends CacheJmxWrapper implements CacheLegacyJmxWrapperMBean, NotificationBroadcaster
   {
      private Element buddyReplConfig;
      private Element evictionConfig;
  
  
  
  1.4       +5 -6      JBossCache/src/org/jboss/cache/jmx/CacheLegacyJmxWrapperMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLegacyJmxWrapperMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/CacheLegacyJmxWrapperMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- CacheLegacyJmxWrapperMBean.java	30 Dec 2006 17:49:58 -0000	1.3
  +++ CacheLegacyJmxWrapperMBean.java	5 Jan 2007 14:27:15 -0000	1.4
  @@ -21,7 +21,6 @@
    */
   package org.jboss.cache.jmx;
   
  -import org.jboss.cache.CacheImpl;
   import org.jboss.cache.Region;
   import org.jgroups.jmx.JChannelFactoryMBean;
   import org.w3c.dom.Element;
  @@ -32,7 +31,7 @@
    * StandardMBean interface for {@link CacheLegacyJmxWrapper}.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public interface CacheLegacyJmxWrapperMBean extends CacheJmxWrapperMBean
   {
  @@ -189,7 +188,7 @@
       * identifies the format version being used by this cache instance.
       * <p/>
       * The default value for this property is
  -    * {@link CacheImpl#DEFAULT_REPLICATION_VERSION}.
  +    * {@link org.jboss.cache.config.Configuration#DEFAULT_REPLICATION_VERSION}.
       * </p>
       *
       * @return a short identifying JBossCache release; e.g. <code>124</code>
  @@ -245,10 +244,10 @@
   
      /**
       * Gets whether the entire tree is inactive upon startup, only responding
  -    * to replication messages after {@link #activateRegion(String)} is
  +    * to replication messages after activateRegion is
       * called to activate one or more parts of the tree.
       * <p/>
  -    * This property is only relevant if {@link #getUseMarshalling()} is
  +    * This property is only relevant if {@link org.jboss.cache.config.Configuration#isUseRegionBasedMarshalling()} is
       * <code>true</code>.
       */
      boolean isInactiveOnStartup();
  @@ -258,7 +257,7 @@
       * to replication messages after {@link Region#activate()} is
       * called to activate one or more parts of the tree.
       * <p/>
  -    * This property is only relevant if {@link #getUseMarshalling()} is
  +    * This property is only relevant if {@link org.jboss.cache.config.Configuration#isUseRegionBasedMarshalling()} is
       * <code>true</code>.
       */
      void setInactiveOnStartup(boolean inactiveOnStartup);
  
  
  
  1.9       +2 -2      JBossCache/src/org/jboss/cache/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/jmx/JmxUtil.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- JmxUtil.java	4 Jan 2007 16:17:38 -0000	1.8
  +++ JmxUtil.java	5 Jan 2007 14:27:15 -0000	1.9
  @@ -35,12 +35,12 @@
    *
    * @author Jerry Gauthier
    * @author Manik Surtani
  - * @version $Id: JmxUtil.java,v 1.8 2007/01/04 16:17:38 msurtani Exp $
  + * @version $Id: JmxUtil.java,v 1.9 2007/01/05 14:27:15 msurtani Exp $
    */
   public class JmxUtil
   {
      public static final String MBEAN_CLASS_SUFFIX = "MBean";
  -   public static final String MBEAN_KEY = ",treecache-interceptor=";
  +   public static final String MBEAN_KEY = ",cache-interceptor=";
      public static final String JBOSS_CACHE_DOMAIN = "jboss.cache";
      public static final String PREFIX = JBOSS_CACHE_DOMAIN + ":service=Cache,clusterName=";
      private static final String JBOSS_SERVER_DOMAIN = "jboss";