[WebMacro-cvs] webmacro/src/org/webmacro Broker.java,1.39,1.40

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

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

Modified Files:
	Broker.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: Broker.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Broker.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Broker.java	17 Jul 2003 05:25:06 -0000	1.39
--- Broker.java	30 Jul 2003 02:28:13 -0000	1.40
***************
*** 38,41 ****
--- 38,42 ----
  import org.webmacro.util.Settings;
  import org.webmacro.util.SubSettings;
+ import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
  
  /**
***************
*** 83,93 ****
  
      /** a local map for one to dump stuff into, specific to this Broker */
!     private Map _brokerLocal = Collections.synchronizedMap(new HashMap());
  
      /** a local map for "global functions" */
!     private Map _functionMap = Collections.synchronizedMap(new HashMap());
  
      /** a local map for context tools */
!     private Map _tools = Collections.synchronizedMap(new HashMap());
  
  
--- 84,94 ----
  
      /** a local map for one to dump stuff into, specific to this Broker */
!     private Map _brokerLocal = new ConcurrentHashMap();
  
      /** a local map for "global functions" */
!     private Map _functionMap = new ConcurrentHashMap();
  
      /** a local map for context tools */
!     private Map _tools = new ConcurrentHashMap();