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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/09 21:48:46

  Modified:    src/org/jboss/cache/factories   XmlConfigurationParser.java
                        InterceptorChainFactory.java
  Log:
  Rename config property used to control CacheMgmtInterceptor
  
  Revision  Changes    Path
  1.5       +7 -0      JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XmlConfigurationParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- XmlConfigurationParser.java	27 Oct 2006 19:26:07 -0000	1.4
  +++ XmlConfigurationParser.java	10 Nov 2006 02:48:46 -0000	1.5
  @@ -72,6 +72,13 @@
           // eviction policy -- just cache it and use with the eviction XML
           String defaultEvictionClass = (String) attributes.stringAttribs.remove("EvictionPolicyClass");
   
  +        // Deal with rename of the old property that controlled MBean registration
  +        String keepStats = (String) attributes.stringAttribs.remove("UseMbean");
  +        if (keepStats != null && attributes.stringAttribs.get("ExposeManagementStatistics") == null)
  +        {
  +           attributes.stringAttribs.put("ExposeManagementStatistics", keepStats);
  +        }
  +        
           Configuration c = new Configuration();
           setValues(c, attributes.stringAttribs, false);
           // Special handling for XML elements -- we hard code the parsing
  
  
  
  1.33      +3 -3      JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorChainFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- InterceptorChainFactory.java	25 Oct 2006 04:45:12 -0000	1.32
  +++ InterceptorChainFactory.java	10 Nov 2006 02:48:46 -0000	1.33
  @@ -60,7 +60,7 @@
      {
         Interceptor i = (Interceptor) clazz.newInstance();
         i.setCache(cache);
  -      i.setStatisticsEnabled(cache.getConfiguration().isUseMbean());
  +      i.setStatisticsEnabled(cache.getConfiguration().getExposeManagementStatistics());
         return i;
      }
   
  @@ -192,7 +192,7 @@
         if (first == null) first = invocationCtxInterceptor;
   
         // load the cache management interceptor next
  -      if (cache.getConfiguration().isUseMbean())
  +      if (cache.getConfiguration().getExposeManagementStatistics())
         {
            if (first == null)
            {
  @@ -452,7 +452,7 @@
   
         if (first == null) first = invocationCtxInterceptor;
   
  -      if (cache.getConfiguration().isUseMbean())
  +      if (cache.getConfiguration().getExposeManagementStatistics())
         {
            cacheMgmtInterceptor = createInterceptor(CacheMgmtInterceptor.class, cache);
            if (first == null)