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

[Brian Stansberry]

  User: bstansberry
  Date: 06/10/23 01:46:40

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  [JBCACHE-809] Pojo-style configuration for use by Microcontainer
  
  Revision  Changes    Path
  1.255     +6 -5      JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.254
  retrieving revision 1.255
  diff -u -b -r1.254 -r1.255
  --- TreeCache.java	19 Oct 2006 13:29:57 -0000	1.254
  +++ TreeCache.java	23 Oct 2006 05:46:40 -0000	1.255
  @@ -12,6 +12,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.buddyreplication.BuddyGroup;
   import org.jboss.cache.buddyreplication.BuddyManager;
  +import org.jboss.cache.config.BuddyReplicationConfig;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Configuration;
   import org.jboss.cache.factories.InterceptorChainFactory;
  @@ -91,7 +92,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.254 2006/10/19 13:29:57 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.255 2006/10/23 05:46:40 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -669,7 +670,7 @@
               disp = new RpcDispatcher(channel, ml, this, this);
               disp.setMarshaller(getMarshaller());
   
  -            setBuddyReplicationConfig(configuration.getBuddyReplicationConfig());
  +            setBuddyReplicationConfig(configuration.getBuddyReplicationConfiguration());
               break;
            default:
               throw new IllegalArgumentException("cache mode " + configuration.getCacheMode() + " is invalid");
  @@ -852,7 +853,7 @@
       *
       * @param config
       */
  -   private void setBuddyReplicationConfig(Element config)
  +   private void setBuddyReplicationConfig(BuddyReplicationConfig config)
      {
         if (config != null)
         {
  @@ -897,8 +898,8 @@
      {
         // Configure if eviction policy is set (we test the old style 1.2.x style config and 1.3 style config.
         evictionRegionManager_ = new org.jboss.cache.eviction.RegionManager();
  -      if ((configuration.getEvictionPolicyClass() != null && configuration.getEvictionPolicyClass().length() > 0) ||
  -              (org.jboss.cache.eviction.RegionManager.isUsingNewStyleConfiguration(configuration.getEvictionPolicyConfig())))
  +      if (configuration.getEvictionConfig() != null 
  +            && configuration.getEvictionConfig().isValidConfig())
         {
            evictionRegionManager_.configure(this);
            this.usingEviction = true;