[WebMacro-cvs] webmacro WebMacro.defaults,1.40,1.41

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

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

Modified Files:
	WebMacro.defaults 
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: WebMacro.defaults
===================================================================
RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** WebMacro.defaults	23 Jul 2003 19:22:00 -0000	1.40
--- WebMacro.defaults	30 Jul 2003 02:28:13 -0000	1.41
***************
*** 284,289 ****
  #
  
! CachingProvider.template.CacheManager: org.webmacro.resource.SMapCacheManager
! CachingProvider.url.CacheManager:      org.webmacro.resource.SMapCacheManager
  #CachingProvider.template.CacheManager: org.webmacro.resource.GenerationalCacheManager
  #CachingProvider.url.CacheManager: org.webmacro.resource.GenerationalCacheManager
--- 284,289 ----
  #
  
! CachingProvider.template.CacheManager: org.webmacro.resource.ReloadingCacheManager
! CachingProvider.url.CacheManager:      org.webmacro.resource.ReloadingCacheManager
  #CachingProvider.template.CacheManager: org.webmacro.resource.GenerationalCacheManager
  #CachingProvider.url.CacheManager: org.webmacro.resource.GenerationalCacheManager
***************
*** 293,305 ****
  #
  
! Encoder.*.CacheManager: org.webmacro.resource.StaticSMapCacheManager
! #Encoder.*.CacheManager: org.webmacro.resource.StaticIdentityCacheManager
  #Encoder.*.CacheManager: org.webmacro.resource.GenerationalCacheManager
  
! PropertyOperator.CacheManager: org.webmacro.resource.StaticSMapCacheManager
! # Larger bucket size for the PropertyOperator cache seems to speed test runs
! StaticSMapCacheManager.PropertyOperator.CacheBuckets: 10001
  
! # SMapCacheManager properties (if used)
  #    - An ExpireTime of 0 (zero) means WebMacro will never cache the resource
  #    - A positive ExpireTime means WebMacro will re-fetch the resource every
--- 293,302 ----
  #
  
! Encoder.*.CacheManager: org.webmacro.resource.SimpleCacheManager
  #Encoder.*.CacheManager: org.webmacro.resource.GenerationalCacheManager
  
! PropertyOperator.CacheManager: org.webmacro.resource.SimpleCacheManager
  
! # ReloadingCacheManager properties (if used)
  #    - An ExpireTime of 0 (zero) means WebMacro will never cache the resource
  #    - A positive ExpireTime means WebMacro will re-fetch the resource every
***************
*** 308,321 ****
  #        when they change.
  
! SMapCacheManager.*.ExpireTime: 30000
! SMapCacheManager.*.ReloadOnChange: true
  
  # Advanced properties:
! SMapCacheManager.*.CacheBuckets: 1001
! SMapCacheManager.*.CacheFactor: 5
! SMapCacheManager.*.UseSoftReferences: TRUE
! 
! StaticSMapCacheManager.*.CacheBuckets: 1001
! StaticSMapCacheManager.*.CacheFactor: 5
  
  # CheckForReloadDelay sets, how often a cached template should
--- 305,313 ----
  #        when they change.
  
! ReloadingCacheManager.*.ExpireTime: 30000
! ReloadingCacheManager.*.ReloadOnChange: true
  
  # Advanced properties:
! ReloadingCacheManager.*.UseSoftReferences: TRUE
  
  # CheckForReloadDelay sets, how often a cached template should