Menu
▾
▴
[WebMacro-cvs] webmacro/webmacro/src/main/java/org/webmacro/directive BeanDirective.java, 1.16, 1.17 Directive.java, 1.24, 1.25 DirectiveProvider.java, 1.19, 1.20 IncludeDirective.java, 1.27, 1.28
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/directive Modified Files: BeanDirective.java Directive.java DirectiveProvider.java IncludeDirective.java Log Message: Remove logging Index: IncludeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/IncludeDirective.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** IncludeDirective.java 18 Feb 2010 22:50:12 -0000 1.27 --- IncludeDirective.java 24 Feb 2010 21:02:07 -0000 1.28 *************** *** 29,36 **** import java.util.StringTokenizer; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; - import org.webmacro.Log; import org.webmacro.Macro; import org.webmacro.NotFoundException; --- 29,37 ---- import java.util.StringTokenizer; + import org.slf4j.Logger; + import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.Macro; import org.webmacro.NotFoundException; *************** *** 220,224 **** /** Logging can be good */ ! protected Log _log; /** The included file type. * One of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC. */ --- 221,225 ---- /** Logging can be good */ ! protected Logger _log; /** The included file type. * One of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC. */ *************** *** 288,292 **** if (_type == TYPE_TEXT || _type == TYPE_MACRO) { ! _log.warning("Included a 'static' file type using a dynamic filename. " + "File will be included, but any included #macro's will not at " + bc.getCurrentLocation()); } --- 289,293 ---- if (_type == TYPE_TEXT || _type == TYPE_MACRO) { ! _log.warn("Included a 'static' file type using a dynamic filename. " + "File will be included, but any included #macro's will not at " + bc.getCurrentLocation()); } *************** *** 372,381 **** } ! if (_log.loggingDebug() && context.getCurrentLocation().indexOf(_strFilename) > -1) { // when in debug mode, output a warning if a template tries to include itself ! // there are situtations where this is desired, but it's good to make // the user aware of what they're doing ! _log.warning(context.getCurrentLocation() + " includes itself."); } --- 373,382 ---- } ! if (_log.isDebugEnabled() && context.getCurrentLocation().indexOf(_strFilename) > -1) { // when in debug mode, output a warning if a template tries to include itself ! // there are situations where this is desired, but it's good to make // the user aware of what they're doing ! _log.warn(context.getCurrentLocation() + " includes itself."); } *************** *** 385,396 **** _type = guessType(broker, _strFilename); ! if (_log.loggingDebug()) ! { ! _log.debug("Including '" + _strFilename + "' as " + ((_type == TYPE_MACRO) ? "MACRO" : (_type == TYPE_TEMPLATE) ? "TEMPLATE" : (_type == TYPE_TEXT) ? "TEXT" : "UNKNOWN. Throwing exception")); - } Object toInclude = getThingToInclude(broker, _type, _strFilename); --- 386,394 ---- _type = guessType(broker, _strFilename); ! _log.debug("Including '" + _strFilename + "' as " + ((_type == TYPE_MACRO) ? "MACRO" : (_type == TYPE_TEMPLATE) ? "TEMPLATE" : (_type == TYPE_TEXT) ? "TEXT" : "UNKNOWN. Throwing exception")); Object toInclude = getThingToInclude(broker, _type, _strFilename); Index: BeanDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/BeanDirective.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BeanDirective.java 18 Mar 2008 20:03:13 -0000 1.16 --- BeanDirective.java 24 Feb 2010 21:02:05 -0000 1.17 *************** *** 31,38 **** import java.util.Map; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; - import org.webmacro.Log; import org.webmacro.Macro; import org.webmacro.PropertyException; --- 31,39 ---- import java.util.Map; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.Macro; import org.webmacro.PropertyException; *************** *** 57,60 **** --- 58,63 ---- { + static Logger _log = LoggerFactory.getLogger(BeanDirective.class); + private static final String APP_BEANS_KEY = "org.webmacro.directive.BeanDirective.appBeans"; *************** *** 107,112 **** private Block onNewBlock; - private Log _log; - private Broker _broker; --- 110,113 ---- *************** *** 143,147 **** { _broker = bc.getBroker(); - _log = _broker.getLog("directive"); // appBeans map is created by the init method when this directive // is registered by the DirectiveProvider --- 144,147 ---- Index: DirectiveProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/DirectiveProvider.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DirectiveProvider.java 27 May 2005 19:44:58 -0000 1.19 --- DirectiveProvider.java 24 Feb 2010 21:02:07 -0000 1.20 *************** *** 23,29 **** package org.webmacro.directive; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.Provider; import org.webmacro.engine.IntrospectionException; --- 23,30 ---- package org.webmacro.directive; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.Provider; import org.webmacro.engine.IntrospectionException; *************** *** 38,41 **** --- 39,44 ---- { + static Logger _log = LoggerFactory.getLogger(DirectiveProvider.class); + public static final String DIRECTIVE_KEY = "directive"; *************** *** 43,47 **** private final Hashtable _descriptors = new Hashtable(); - private Log _log; private Broker _broker; --- 46,49 ---- *************** *** 62,66 **** catch (Exception ce) { ! _log.warning("Exception loading directive " + settingValue, ce); } } --- 64,68 ---- catch (Exception ce) { ! _log.warn("Exception loading directive " + settingValue, ce); } } *************** *** 143,147 **** catch (Exception e) { ! _log.warning("Unable to invoke the init method for the directive " + directive.getName(), e); } --- 145,149 ---- catch (Exception e) { ! _log.warn("Unable to invoke the init method for the directive " + directive.getName(), e); } *************** *** 188,192 **** { _broker = broker; - _log = broker.getLog("directive"); try { --- 190,193 ---- *************** *** 195,199 **** catch (Exception e) { ! _log.warning("Error initializing DirectiveProvider", e); throw new InitException("Could not initialize DirectiveProvider", e); } --- 196,200 ---- catch (Exception e) { ! _log.warn("Error initializing DirectiveProvider", e); throw new InitException("Could not initialize DirectiveProvider", e); } Index: Directive.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/Directive.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Directive.java 19 Mar 2008 09:38:05 -0000 1.24 --- Directive.java 24 Feb 2010 21:02:07 -0000 1.25 *************** *** 25,28 **** --- 25,30 ---- import java.io.IOException; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Context; import org.webmacro.FastWriter; *************** *** 56,59 **** --- 58,62 ---- { + static Logger _log = LoggerFactory.getLogger(Directive.class); public static final int ArgType_CONDITION = 1; public static final int ArgType_LVALUE = 2; *************** *** 100,104 **** catch (IOException e) { ! context.getBroker().getLog("engine").error( "Directive.evaluate: IO exception on write to StringWriter", e); return ""; --- 103,107 ---- catch (IOException e) { ! _log.error( "Directive.evaluate: IO exception on write to StringWriter", e); return ""; *************** *** 130,134 **** FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warning(warning + " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); --- 133,137 ---- FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warn(warning + " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); |