[WebMacro-cvs] webmacro/src/org/webmacro/engine PropertyOperatorCache.java,1.20,1.21

[<bri...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv2401/src/org/webmacro/engine

Modified Files:
	PropertyOperatorCache.java 
Log Message:
Replace complicated cache manager options with SimpleCacheManager (simple cache backed by ConcurrentHashMap) and ReloadingCacheManager (complicated reloading/expiring, simplified version of SMapCacheManager); replace TimeLoop (used by ReloadingCacheManager) with ClockDaemon; eliminate all the silly pseudo-optimization associated with ScalableXxx.

Index: PropertyOperatorCache.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/PropertyOperatorCache.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** PropertyOperatorCache.java	23 Jul 2003 09:59:36 -0000	1.20
--- PropertyOperatorCache.java	30 Jul 2003 02:28:14 -0000	1.21
***************
*** 26,30 ****
  import org.webmacro.*;
  import org.webmacro.resource.CacheManager;
! import org.webmacro.resource.StaticSMapCacheManager;
  import org.webmacro.util.*;
  
--- 26,30 ----
  import org.webmacro.*;
  import org.webmacro.resource.CacheManager;
! import org.webmacro.resource.SimpleCacheManager;
  import org.webmacro.util.*;
  
***************
*** 55,60 ****
          if (cacheManager == null || cacheManager.equals(""))
          {
!             _log.info("CachingProvider: No cache manager specified for PropertyOperator, using StaticSMapCacheManager");
!             _cache = new StaticSMapCacheManager();
          }
          else
--- 55,60 ----
          if (cacheManager == null || cacheManager.equals(""))
          {
!             _log.info("CachingProvider: No cache manager specified for PropertyOperator, using SimpleCacheManager");
!             _cache = new SimpleCacheManager();
          }
          else
***************
*** 67,72 ****
              {
                  _log.warning("Unable to load cache manager " + cacheManager
!                         + " for PropertyOperator, using StaticSMapCacheManager.  Reason:\n" + e);
!                 _cache = new StaticSMapCacheManager();
              }
          }
--- 67,72 ----
              {
                  _log.warning("Unable to load cache manager " + cacheManager
!                         + " for PropertyOperator, using SimpleCacheManager.  Reason:\n" + e);
!                 _cache = new SimpleCacheManager();
              }
          }