[WebMacro-cvs] webmacro/webmacro/src/main/java/org/webmacro/broker DefaultContextAutoLoader.java, 1.3, 1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/broker

Modified Files:
	DefaultContextAutoLoader.java 
Log Message:
Remove logging

Index: DefaultContextAutoLoader.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker/DefaultContextAutoLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultContextAutoLoader.java	21 Feb 2010 01:49:49 -0000	1.3
--- DefaultContextAutoLoader.java	24 Feb 2010 21:02:05 -0000	1.4
***************
*** 5,11 ****
  import java.util.concurrent.ConcurrentHashMap;
  
  import org.webmacro.Broker;
  import org.webmacro.Context;
- import org.webmacro.Log;
  import org.webmacro.PropertyException;
  import org.webmacro.util.Settings;
--- 5,12 ----
  import java.util.concurrent.ConcurrentHashMap;
  
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
  import org.webmacro.Broker;
  import org.webmacro.Context;
  import org.webmacro.PropertyException;
  import org.webmacro.util.Settings;
***************
*** 19,23 ****
  public class DefaultContextAutoLoader implements ContextAutoLoader {
  
!     private Log _log;
      private Broker _broker;
      private Map _factories = new ConcurrentHashMap();
--- 20,24 ----
  public class DefaultContextAutoLoader implements ContextAutoLoader {
  
!     static Logger _log =  LoggerFactory.getLogger(DefaultContextAutoLoader.class);
      private Broker _broker;
      private Map _factories = new ConcurrentHashMap();
***************
*** 25,29 ****
      public void init(Broker b, String name) {
          _broker = b;
-         _log = b.getLog("broker");
          loadFactories(name);
      }
--- 26,29 ----
***************
*** 86,90 ****
          catch (ClassNotFoundException e)
          {
!             _log.warning("Context: Could not locate class for context tool " + className);
              return;
          }
--- 86,90 ----
          catch (ClassNotFoundException e)
          {
!             _log.warn("Context: Could not locate class for context tool " + className);
              return;
          }
***************
*** 144,148 ****
          }
          else {
!             _log.warning("Context object " + toolName + " is not of type ContextObjectFactory");
          }
      }
--- 144,148 ----
          }
          else {
!             _log.warn("Context object " + toolName + " is not of type ContextObjectFactory");
          }
      }