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

[Elias Ross]

  User: genman  
  Date: 06/11/26 23:49:46

  Modified:    src/org/jboss/cache/config   ConfigurationException.java
                        EvictionConfig.java
  Log:
  JBCACHE-880 clean up for adding per-node eviction timeout
  
  Revision  Changes    Path
  1.3       +2 -1      JBossCache/src/org/jboss/cache/config/ConfigurationException.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConfigurationException.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/ConfigurationException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ConfigurationException.java	19 Jul 2006 21:34:43 -0000	1.2
  +++ ConfigurationException.java	27 Nov 2006 04:49:46 -0000	1.3
  @@ -20,8 +20,9 @@
   {
       private List<String> erroneousAttributes = new ArrayList<String>();
   
  -    public ConfigurationException()
  +    public ConfigurationException(Exception e)
       {
  +       super(e);
       }
   
       public ConfigurationException(String string)
  
  
  
  1.6       +47 -14    JBossCache/src/org/jboss/cache/config/EvictionConfig.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EvictionConfig.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/EvictionConfig.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- EvictionConfig.java	15 Nov 2006 15:16:40 -0000	1.5
  +++ EvictionConfig.java	27 Nov 2006 04:49:46 -0000	1.6
  @@ -21,29 +21,43 @@
    */
   package org.jboss.cache.config;
   
  +import java.util.Collections;
   import java.util.Iterator;
   import java.util.List;
   
  +import org.jboss.cache.RegionImpl;
  +import org.jboss.cache.RegionManager;
  +import org.jboss.cache.eviction.EvictionPolicy;
  +import org.jboss.cache.eviction.EvictionPolicyConfig;
  +
   public class EvictionConfig extends ConfigurationComponent
   {
      /** The serialVersionUID */
      private static final long serialVersionUID = -7979639000026975201L;
   
      public static final String WAKEUP_INTERVAL_SECONDS = "wakeUpIntervalSeconds";
  +
      public static final int WAKEUP_DEFAULT = 5;
  +
      public static final String EVENT_QUEUE_SIZE = "eventQueueSize";
  +
      public static final String EVICTION_POLICY_CLASS = "policyClass";
  +
      public static final int EVENT_QUEUE_SIZE_DEFAULT = 200000;
      
      private String defaultEvictionPolicyClass;
  +
      private int wakeupIntervalSeconds = WAKEUP_DEFAULT;
  +
      private int defaultEventQueueSize = EVENT_QUEUE_SIZE_DEFAULT;
      
      // Dynamic to support runtime adds/removes of regions
      @Dynamic
      private List<EvictionRegionConfig> evictionRegionConfigs;
      
  -   public EvictionConfig() {}
  +   public EvictionConfig()
  +   {
  +   }
      
      public EvictionConfig(String defaultEvictionClass)
      {
  @@ -69,10 +83,29 @@
   
      public List<EvictionRegionConfig> getEvictionRegionConfigs()
      {
  +      if (evictionRegionConfigs == null && defaultEvictionPolicyClass != null)
  +      {
  +		 // TODO this needs to be refactored obviously ... 
  +         try
  +         {
  +            Class<EvictionPolicy> cpolicy = (Class<EvictionPolicy>) Class.forName(defaultEvictionPolicyClass);
  +            EvictionPolicy policy;
  +            policy = cpolicy.newInstance();
  +            EvictionRegionConfig erc = new EvictionRegionConfig();
  +            EvictionPolicyConfig epc = policy.getEvictionConfigurationClass().newInstance();
  +            // epc.set
  +            erc.setEvictionPolicyConfig(epc);
  +            erc.setRegionFqn(RegionManager.DEFAULT_REGION);
  +            return Collections.singletonList(erc);
  +         }
  +         catch (Exception e)
  +         {
  +            throw new ConfigurationException(e);
  +         }
  +      }
         return evictionRegionConfigs;
      }
   
  -
      public int getDefaultEventQueueSize()
      {
         return defaultEventQueueSize;