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

[Brian Stansberry]

  User: bstansberry
  Date: 07/05/23 23:52:04

  Modified:    src/org/jboss/cache/factories  XmlConfigurationParser.java
  Log:
  Add CacheLoaderConfiguration to renamed attrib handling
  Old attrib was UseInterceptorMbeans, not UseMbeans
  
  Revision  Changes    Path
  1.20      +10 -2     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.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- XmlConfigurationParser.java	23 May 2007 04:28:33 -0000	1.19
  +++ XmlConfigurationParser.java	24 May 2007 03:52:04 -0000	1.20
  @@ -157,14 +157,22 @@
       */
      private void handleRenamedAttributes(ParsedAttributes attributes)
      {
  -      String keepStats = attributes.stringAttribs.remove("UseMbean");
  +      String keepStats = attributes.stringAttribs.remove("UseInterceptorMbeans");
         if (keepStats != null && attributes.stringAttribs.get("ExposeManagementStatistics") == null)
         {
  -         log.warn("Found non-existent JBC 1.x attribute 'UseMbean' and replaced " +
  +         log.warn("Found non-existent JBC 1.x attribute 'UseInterceptorMbeans' and replaced " +
                   "with 'ExposeManagementStatistics'. Please update your config " +
                   "to use the new attribute name");
            attributes.stringAttribs.put("ExposeManagementStatistics", keepStats);
         }
  +      Element clc = attributes.xmlAttribs.remove("CacheLoaderConfiguration");
  +      if (clc != null && attributes.xmlAttribs.get("CacheLoaderConfig") == null)
  +      {
  +         log.warn("Found non-existent JBC 1.x attribute 'CacheLoaderConfiguration' and replaced " +
  +                "with 'CacheLoaderConfig'. Please update your config " +
  +                "to use the new attribute name");
  +         attributes.xmlAttribs.put("CacheLoaderConfig", clc);
  +      }
      }
   
      protected InputStream getAsInputStreamFromClassLoader(String filename)