Menu
▾
▴
[WebMacro-cvs] webmacro/webmacro/src/main/java/org/webmacro/util Encoder.java, 1.7, 1.8 Instantiator.java, 1.3, 1.4 WMEval.java, 1.29, 1.30 AbstractLogFile.java, 1.6, NONE CommonsLoggingTarget.java, 1.3, NONE LogFile.java, 1.15, NONE LogSource.java, 1.10, NONE LogSystem.java, 1.8, NONE LogTarget.java, 1.9, NONE LogTargetFactory.java, 1.7, NONE
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:58
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/util Modified Files: Encoder.java Instantiator.java WMEval.java Removed Files: AbstractLogFile.java CommonsLoggingTarget.java LogFile.java LogSource.java LogSystem.java LogTarget.java LogTargetFactory.java Log Message: Remove logging --- LogSource.java DELETED --- --- LogSystem.java DELETED --- --- LogTargetFactory.java DELETED --- Index: Instantiator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/Instantiator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Instantiator.java 20 Feb 2010 17:53:50 -0000 1.3 --- Instantiator.java 24 Feb 2010 21:02:20 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- import java.util.Collections; import java.util.List; + + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.WebMacroException; *************** *** 45,48 **** --- 48,52 ---- final public class Instantiator { + static Logger _log = LoggerFactory.getLogger(Instantiator.class); private static final String IMPLIED_PACKAGES = "ImpliedPackages"; *************** *** 71,75 **** if (s != null) { ! b.getLog("engine").warning( "The configuration parameter \"" + DEPRECATED_IMPLIED_PACKAGES --- 75,79 ---- if (s != null) { ! _log.warn( "The configuration parameter \"" + DEPRECATED_IMPLIED_PACKAGES *************** *** 95,99 **** if (s != null) { ! b.getLog("engine").warning( "The configuration parameter \"" + DEPRECATED_ALLOWED_PACKAGES --- 99,103 ---- if (s != null) { ! _log.warn( "The configuration parameter \"" + DEPRECATED_ALLOWED_PACKAGES --- LogTarget.java DELETED --- --- CommonsLoggingTarget.java DELETED --- --- AbstractLogFile.java DELETED --- Index: Encoder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/Encoder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Encoder.java 18 Mar 2008 11:07:56 -0000 1.7 --- Encoder.java 24 Feb 2010 21:02:20 -0000 1.8 *************** *** 23,29 **** package org.webmacro.util; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.ResourceException; import org.webmacro.resource.CacheElement; --- 23,30 ---- package org.webmacro.util; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.ResourceException; import org.webmacro.resource.CacheElement; *************** *** 59,63 **** private String _encoding; private CacheManager _cache; ! private Log _log; /** --- 60,64 ---- private String _encoding; private CacheManager _cache; ! static Logger _log = LoggerFactory.getLogger(Encoder.class); /** *************** *** 101,105 **** { String cacheManager; - _log = b.getLog("resource", "Object loading and caching"); cacheManager = b.getSetting("Encoder." + _encoding + ".CacheManager"); --- 102,105 ---- *************** *** 121,125 **** catch (Exception e) { ! _log.warning("Unable to load cache manager " + cacheManager + " for encoding type " + _encoding + ", using TrivialCacheManager. Reason:\n" + e); --- 121,125 ---- catch (Exception e) { ! _log.warn("Unable to load cache manager " + cacheManager + " for encoding type " + _encoding + ", using TrivialCacheManager. Reason:\n" + e); Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/WMEval.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** WMEval.java 28 Mar 2008 20:12:18 -0000 1.29 --- WMEval.java 24 Feb 2010 21:02:20 -0000 1.30 *************** *** 32,37 **** import javax.servlet.http.HttpServletResponse; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.Template; import org.webmacro.WM; --- 32,39 ---- import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Context; import org.webmacro.Template; import org.webmacro.WM; *************** *** 39,42 **** --- 41,46 ---- import org.webmacro.WebMacro; import org.webmacro.engine.StreamTemplate; + import org.webmacro.resource.AbstractTemplateLoader; + import org.webmacro.servlet.WMServlet; import org.webmacro.servlet.WebContext; *************** *** 73,77 **** private WebMacro wm; ! private Log log; private Template currentTemplate; --- 77,81 ---- private WebMacro wm; ! static Logger _log = LoggerFactory.getLogger(WMEval.class); private Template currentTemplate; *************** *** 135,139 **** private void init() { context = wm.getContext(); - log = wm.getBroker().getBrokerLog(); } /** --- 139,142 ---- *************** *** 148,154 **** * Return the log associated with this instance of WMEval. */ ! public Log getLog () { ! return this.log; } --- 151,157 ---- * Return the log associated with this instance of WMEval. */ ! public Logger getLog () { ! return _log; } *************** *** 184,188 **** public void error (String msg, Exception e) { ! wm.getLog("ERROR").error(msg, e); } --- 187,191 ---- public void error (String msg, Exception e) { ! _log.error(msg, e); } --- LogFile.java DELETED --- |