Author: cbrisson
Date: Wed Jun 22 16:34:11 2016
New Revision: 1749738
URL: http://svn.apache.org/viewvc?rev=1749738&view=rev
Log:
[tools] review logging:
- fix some parametrized logger messages for slf4j '{}' placeholders
- add parametrization whenever possible
- got rid of o.a.v.config.LogSupport (was only used in ConfigurationCleaner,
and was in the way of using slf4j placeholders)
Removed:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/LogSupport.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ListTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java
Wed Jun 22 16:34:11 2016
@@ -22,6 +22,7 @@ package org.apache.velocity.tools;
import java.util.Map;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.tools.Scope;
@@ -131,7 +132,7 @@ public class ToolManager
{
throw new NullPointerException("ToolboxFactory cannot be
null");
}
- debug("ToolboxFactory instance was changed to %s", factory);
+ getLog().debug("ToolboxFactory instance was changed to {}",
factory);
this.factory = factory;
}
}
@@ -145,7 +146,7 @@ public class ToolManager
{
if (velocity != engine)
{
- debug("VelocityEngine instance was changed to %s", engine);
+ getLog().debug("VelocityEngine instance was changed to {}",
engine);
this.velocity = engine;
}
}
@@ -169,17 +170,11 @@ public class ToolManager
{
if (velocity == null)
{
- return null;
+ return LoggerFactory.getLogger(ToolManager.class);
}
- return velocity.getLog();
- }
-
- protected final void debug(String msg, Object... args)
- {
- Logger log = getLog();
- if (log != null && log.isDebugEnabled())
+ else
{
- log.debug(String.format(msg, args));
+ return velocity.getLog();
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java
Wed Jun 22 16:34:11 2016
@@ -1,5 +1,7 @@
package org.apache.velocity.tools.config;
+import org.slf4j.Logger;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,21 +29,24 @@ import java.util.Iterator;
* @author Nathan Bubna
* @version $Id: Configuration.java 511959 2007-02-26 19:24:39Z nbubna $
*/
-public class ConfigurationCleaner extends LogSupport
+public class ConfigurationCleaner
{
- private static final String LOG_PREFIX = "ConfigurationCleaner : ";
+ private Logger LOG = null;
- @Override
- protected String logPrefix()
+ public void setLog(Logger log)
{
- return LOG_PREFIX;
+ if (log == null)
+ {
+ throw new NullPointerException("log should not be set to null");
+ }
+ LOG = log;
}
public void clean(FactoryConfiguration factory)
{
- if (isTraceEnabled())
+ if (LOG != null)
{
- trace("Cleaning factory: "+factory);
+ LOG.trace("ConfigurationCleaner : Cleaning factory: {}", factory);
}
cleanProperties(factory);
@@ -57,13 +62,10 @@ public class ConfigurationCleaner extend
}
catch (ConfigurationException ce)
{
- if (isDebugEnabled())
- {
- debug(ce.getMessage());
- }
- if (isWarnEnabled())
+ if (LOG != null)
{
- warn("Removing "+datum);
+ LOG.debug("ConfigurationCleaner : ", ce);
+ LOG.warn("ConfigurationCleaner : Removing {}", datum);
}
i.remove();
}
@@ -92,13 +94,10 @@ public class ConfigurationCleaner extend
}
catch (ConfigurationException ce)
{
- if (isDebugEnabled())
+ if (LOG != null)
{
- debug(ce.getMessage());
- }
- if (isWarnEnabled())
- {
- warn("Removing "+tool);
+ LOG.debug("ConfigurationCleaner : ", ce);
+ LOG.warn("ConfigurationCleaner : Removing {}", tool);
}
i.remove();
}
@@ -137,13 +136,10 @@ public class ConfigurationCleaner extend
}
catch (ConfigurationException ce)
{
- if (isDebugEnabled())
- {
- debug(ce.getMessage());
- }
- if (isWarnEnabled())
+ if (LOG != null)
{
- warn("Removing "+prop);
+ LOG.debug("ConfigurationCleaner : ", ce);
+ LOG.warn("ConfigurationCleaner : Removing {}", prop);
}
i.remove();
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java
Wed Jun 22 16:34:11 2016
@@ -84,7 +84,7 @@ public abstract class FileFactoryConfigu
}
if (log != null && log.isTraceEnabled())
{
- log.trace("Attempting to read configuration file at: "+path);
+ log.trace("Attempting to read configuration file at: {}", path);
}
URL url = findURL(path);
@@ -166,7 +166,7 @@ public abstract class FileFactoryConfigu
{
if (log != null)
{
- log.error("Failed to close input stream for "+source, ioe);
+ log.error("Failed to close input stream for {}", source,
ioe);
}
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
Wed Jun 22 16:34:11 2016
@@ -131,7 +131,7 @@ public class ClassTool extends SafeConfi
{
if (this.log != null)
{
- this.log.error("Could not load Class for "+name);
+ this.log.error("Could not load Class for {}", name);
}
return null;
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
Wed Jun 22 16:34:11 2016
@@ -150,7 +150,7 @@ public class FieldTool extends SafeConfi
{
if (log != null)
{
- log.debug("Unable to retrieve value of field at "+name, e);
+ log.debug("Unable to retrieve value of field at {}", name,
e);
}
}
}
@@ -235,8 +235,7 @@ public class FieldTool extends SafeConfi
if (log != null && log.isDebugEnabled() &&
results.containsKey(field.getName()))
{
- log.debug("FieldTool: "+field.getName()+
- " is being overridden by "+clazz.getName());
+ log.debug("FieldTool: {} is being overridden by {}",
field.getName(), clazz.getName());
}
// if the field is final
if (Modifier.isFinal(mod))
@@ -271,7 +270,7 @@ public class FieldTool extends SafeConfi
{
if (log != null)
{
- log.warn("IllegalAccessException while trying to access " +
field.getName(), iae);
+ log.warn("IllegalAccessException while trying to access {}",
field.getName(), iae);
}
return null;
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
Wed Jun 22 16:34:11 2016
@@ -106,7 +106,7 @@ public class LinkTool extends SafeConfig
public static final String CHARSET_KEY = "charset";
public static final String XHTML_MODE_KEY = "xhtml";
- protected Logger LOG;
+ protected Logger LOG = null;
protected String scheme;
protected String user;
protected String host;
@@ -142,22 +142,11 @@ public class LinkTool extends SafeConfig
self = this;
}
- protected final void debug(String msg, Object... args)
- {
- debug(msg, null, args);
- }
-
- protected final void debug(String msg, Throwable t, Object... args)
- {
- if (LOG != null && LOG.isDebugEnabled())
- {
- LOG.debug("LinkTool: "+String.format(msg, args), t);
- }
- }
-
-
// --------------------------------------- Setup Methods -------------
+ /**
+ * Configuration
+ */
protected void configure(ValueParser props)
{
this.LOG = (Logger)props.getValue(ToolContext.LOG_KEY);
@@ -367,7 +356,10 @@ public class LinkTool extends SafeConfig
}
catch (NumberFormatException nfe)
{
- debug("Could not convert '%s' to int", nfe, obj);
+ if (LOG != null)
+ {
+ LOG.debug("Could not convert '{}' to int", obj, nfe);
+ }
this.port = -2; // use this to mean error
}
}
@@ -922,7 +914,10 @@ public class LinkTool extends SafeConfig
}
catch (Exception e)
{
- debug("Could not convert '%s' to URI", e, obj);
+ if (LOG != null)
+ {
+ LOG.debug("Could not convert '{}' to URI", obj, e);
+ }
return null;
}
}
@@ -967,7 +962,10 @@ public class LinkTool extends SafeConfig
}
catch (Exception e)
{
- debug("Could not create URI", e);
+ if (LOG != null)
+ {
+ LOG.debug("Could not create URI", e);
+ }
}
return null;
}
@@ -1759,7 +1757,10 @@ public class LinkTool extends SafeConfig
}
catch (UnsupportedEncodingException uee)
{
- debug("Character encoding '%s' is unsupported", uee, charset);
+ if (LOG != null)
+ {
+ LOG.debug("Character encoding '{}' is unsupported", charset,
uee);
+ }
return null;
}
}
@@ -1782,7 +1783,10 @@ public class LinkTool extends SafeConfig
}
catch (UnsupportedEncodingException uee)
{
- debug("Character encoding '%s' is unsupported", uee, charset);
+ if (LOG != null)
+ {
+ LOG.debug("Character encoding '{}' is unsupported", charset,
uee);
+ }
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ListTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ListTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ListTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ListTool.java
Wed Jun 22 16:34:11 2016
@@ -40,13 +40,13 @@ import org.apache.velocity.tools.config.
* </p>
* <p><pre>
* Example uses:
- * $primes -> new int[] {2, 3, 5, 7}
- * $lists.size($primes) -> 4
- * $lists.get($primes, 2) -> 5
- * $lists.set($primes, 2, 1) -> (primes[2] becomes 1)
- * $lists.get($primes, 2) -> 1
- * $lists.isEmpty($primes) -> false
- * $lists.contains($primes, 7) -> true
+ * $primes -> new int[] {2, 3, 5, 7}
+ * $lists.size($primes) -> 4
+ * $lists.get($primes, 2) -> 5
+ * $lists.set($primes, 2, 1) -> (primes[2] becomes 1)
+ * $lists.get($primes, 2) -> 1
+ * $lists.isEmpty($primes) -> false
+ * $lists.contains($primes, 7) -> true
*
* Example tools.xml config (if you want to use this with VelocityView):
* <tools>
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
Wed Jun 22 16:34:11 2016
@@ -95,7 +95,7 @@ public class LoopTool
private Stack<ManagedIterator> iterators = new Stack<ManagedIterator>();
private ManagedIterator last;
private Map<String,Object> lastSyncedValues;
-
+
/**
* <p>Tells the LoopTool to watch the specified Array, Collection, Map,
* Iterator, Iterable, Enumeration or POJO with an iterator() method
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
Wed Jun 22 16:34:11 2016
@@ -23,6 +23,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import org.slf4j.Logger;
+
+import org.apache.velocity.tools.ToolContext;
import org.apache.velocity.tools.config.DefaultKey;
import org.apache.velocity.tools.generic.SafeConfig;
@@ -69,12 +73,21 @@ public class MarkupTool extends SafeConf
private String tab = DEFAULT_TAB;
private String delim = DEFAULT_DELIMITER;
+ private Logger LOG = null;
+ /**
+ * Configuration
+ */
+ protected void configure(ValueParser props)
+ {
+ this.LOG = (Logger)props.getValue(ToolContext.LOG_KEY);
+ }
+
public void setTab(String tab)
{
if (isConfigLocked())
{
- //TODO: log setTab failure
+ LOG.error("MarkupTool: setTab() failure: configuration is locked");
}
else
{
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
Wed Jun 22 16:34:11 2016
@@ -20,11 +20,15 @@ package org.apache.velocity.tools.generi
*/
import java.io.StringWriter;
+
+import org.slf4j.Logger;
+
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.Scope;
+import org.apache.velocity.tools.ToolContext;
import org.apache.velocity.tools.config.DefaultKey;
/**
@@ -113,8 +117,7 @@ public class RenderTool extends SafeConf
public static final String KEY_FORCE_THREAD_SAFE = "forceThreadSafe";
- private static final String LOG_TAG = "RenderTool.eval()";
-
+ protected Logger LOG = null;
private VelocityEngine engine = null;
private Context context;
private int parseDepth = DEFAULT_PARSE_DEPTH;
@@ -149,6 +152,8 @@ public class RenderTool extends SafeConf
{
this.forceThreadSafe = false;
}
+
+ this.LOG = (Logger)parser.getValue(ToolContext.LOG_KEY);
}
/**
@@ -158,6 +163,7 @@ public class RenderTool extends SafeConf
public void setVelocityEngine(VelocityEngine ve)
{
this.engine = ve;
+ this.LOG = ve.getLog();
}
/**
@@ -173,7 +179,10 @@ public class RenderTool extends SafeConf
}
else if (this.parseDepth != depth)
{
- debug("RenderTool: Attempt was made to alter parse depth while
config was locked.");
+ if (LOG != null)
+ {
+ LOG.debug("RenderTool: Attempt was made to alter parse depth
while config was locked.");
+ }
}
}
@@ -193,7 +202,10 @@ public class RenderTool extends SafeConf
}
else if (this.context != context)
{
- debug("RenderTool: Attempt was made to set a new context while
config was locked.");
+ if (LOG != null)
+ {
+ LOG.debug("RenderTool: Attempt was made to set a new context
while config was locked.");
+ }
}
}
@@ -220,7 +232,10 @@ public class RenderTool extends SafeConf
}
else if (this.catchExceptions != catchExceptions)
{
- debug("RenderTool: Attempt was made to alter catchE while config
was locked.");
+ if (LOG != null)
+ {
+ LOG.debug("RenderTool: Attempt was made to alter catchE while
config was locked.");
+ }
}
}
@@ -292,7 +307,10 @@ public class RenderTool extends SafeConf
}
catch (Exception e)
{
- debug(LOG_TAG+" failed due to "+e, e);
+ if (LOG != null)
+ {
+ LOG.debug("RenderTool.eval(): failed due to ", e);
+ }
return null;
}
}
@@ -314,11 +332,11 @@ public class RenderTool extends SafeConf
boolean success;
if (engine == null)
{
- success = Velocity.evaluate(ctx, sw, LOG_TAG, vtl);
+ success = Velocity.evaluate(ctx, sw, "RenderTool.eval()", vtl);
}
else
{
- success = engine.evaluate(ctx, sw, LOG_TAG, vtl);
+ success = engine.evaluate(ctx, sw, "RenderTool.eval()", vtl);
}
if (success)
{
@@ -363,36 +381,14 @@ public class RenderTool extends SafeConf
else
{
// abort, log and return what we have so far
- debug("RenderTool.recurse() exceeded the maximum parse depth
of "
- + parseDepth + "on the following template: "+vtl);
+ if (LOG != null)
+ {
+ LOG.debug("RenderTool.recurse() exceeded the maximum parse
depth" +
+ " of {} on the following template: {}",
+ parseDepth, vtl);
+ }
return result;
}
}
}
-
- // internal convenience methods
- private void debug(String message)
- {
- if (engine == null)
- {
- Velocity.getLog().debug(message);
- }
- else
- {
- engine.getLog().debug(message);
- }
- }
-
- private void debug(String message, Throwable t)
- {
- if (engine == null)
- {
- Velocity.getLog().debug(message, t);
- }
- else
- {
- engine.getLog().debug(message, t);
- }
- }
-
}
Modified:
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
Wed Jun 22 16:34:11 2016
@@ -262,8 +262,7 @@ public class ActionMessagesTool extends
if (message == null)
{
- LOG.warn("ActionMessagesTool : Message for key " +
msg.getKey() +
- " could not be found in message resources.");
+ LOG.warn("ActionMessagesTool : Message for key {} could
not be found in message resources.", msg.getKey());
}
}
Modified:
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
Wed Jun 22 16:34:11 2016
@@ -110,7 +110,7 @@ public abstract class MessageResourcesTo
StrutsUtils.getMessageResources(request, application, bundle);
if (res == null)
{
- LOG.error("MessageResourcesTool : MessageResources bundle '" +
bundle + "' is not available.");
+ LOG.error("MessageResourcesTool : MessageResources bundle '{}' is
not available.", bundle);
}
return res;
}
Modified:
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/StrutsLinkTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
Wed Jun 22 16:34:11 2016
@@ -116,8 +116,9 @@ public class StrutsLinkTool extends Link
StrutsUtils.getActionMappingURL(application, request, action);
if (url == null)
{
- debug("StrutsLinkTool : In method setAction("+action+
- "): Parameter does not map to a valid action.");
+ LOG.debug("StrutsLinkTool : In method setAction({}): " +
+ "Parameter does not map to a valid action."
+ , action);
return null;
}
return (StrutsLinkTool)absolute(url);
@@ -157,8 +158,8 @@ public class StrutsLinkTool extends Link
String url = StrutsUtils.getForwardURL(request, application, forward);
if (url == null)
{
- debug("StrutsLinkTool : In method setForward(" + forward +
- "): Parameter does not map to a valid forward.");
+ LOG.debug("StrutsLinkTool : In method setForward({}): " +
+ "): Parameter does not map to a valid forward.",
forward);
return null;
}
return (StrutsLinkTool)absolute(url);
Modified:
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/TilesTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-struts/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
Wed Jun 22 16:34:11 2016
@@ -154,7 +154,7 @@ public class TilesTool extends ImportSup
}
catch (Exception e)
{
- LOG.error("TilesTool : Exeption while rendering Tile " + obj, e);
+ LOG.error("TilesTool : Exeption while rendering Tile {}", obj, e);
/* delegate exception handling to an EventHandler if present. */
if (!this.catchExceptions) {
@@ -179,7 +179,7 @@ public class TilesTool extends ImportSup
Object value = getCurrentContext().getAttribute(name);
if (value == null)
{
- LOG.warn("TilesTool : Tile attribute '" + name + "' wasn't found
in context.");
+ LOG.warn("TilesTool : Tile attribute '{}' wasn't found in
context.", name);
}
return value;
}
@@ -213,7 +213,7 @@ public class TilesTool extends ImportSup
Object value = getCurrentContext().getAttribute(name);
if (value == null)
{
- LOG.warn("TilesTool : Tile attribute '" + name + "' wasn't found
in context.");
+ LOG.warn("TilesTool : Tile attribute '{}' wasn't found in
context.", name);
}
if (scope.equals(PAGE_SCOPE))
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
Wed Jun 22 16:34:11 2016
@@ -241,8 +241,7 @@ public abstract class AbstractSearchTool
{
if (LOG != null)
{
- LOG.error("AbstractSearchTool: executeQuery(" + findMe +
- ") failed", t);
+ LOG.error("AbstractSearchTool: executeQuery({}) failed",
findMe, t);
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
Wed Jun 22 16:34:11 2016
@@ -1157,7 +1157,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser version
for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser version
for User-Agent: {}", userAgent, nfe);
}
}
@@ -1183,7 +1183,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
@@ -1211,7 +1211,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
@@ -1231,7 +1231,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
@@ -1258,7 +1258,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
@@ -1277,7 +1277,7 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
@@ -1306,14 +1306,14 @@ public class BrowserTool extends FormatC
}
catch (NumberFormatException nfe)
{
- LOG.error("BrowserTool: Could not parse browser
version for User-Agent: "+userAgent,nfe);
+ LOG.error("BrowserTool: Could not parse browser
version for User-Agent: {}", userAgent, nfe);
}
}
}
}
catch (PatternSyntaxException pse)
{
- LOG.error("BrowserTool: Could not parse browser version for
User-Agent: "+userAgent,pse);
+ LOG.error("BrowserTool: Could not parse browser version for
User-Agent: {}", userAgent, pse);
}
}
@@ -1366,7 +1366,7 @@ public class BrowserTool extends FormatC
}
else
{
- LOG.error("BrowserTool: could not parse language
quality value: "+language);
+ LOG.error("BrowserTool: could not parse language
quality value: {}", language);
}
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
Wed Jun 22 16:34:11 2016
@@ -219,10 +219,7 @@ public class CookieTool
}
catch (IllegalArgumentException iae)
{
- if (log != null && log.isDebugEnabled())
- {
- log.debug("CookieTool: Could not create cookie with name
\""+name+"\"", iae);
- }
+ log.debug("CookieTool: Could not create cookie with name \"{}\"",
name, iae);
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
Wed Jun 22 16:34:11 2016
@@ -71,7 +71,7 @@ public class ImportTool extends ImportSu
}
catch (Exception ex)
{
- LOG.error("ImportTool.read(): Exception while aquiring '"+url+"'",
ex);
+ LOG.error("ImportTool.read(): Exception while aquiring '{}'", url,
ex);
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
Wed Jun 22 16:34:11 2016
@@ -136,18 +136,6 @@ public class UiDependencyTool {
private Logger LOG;
private String context = "";
- private void debug(String msg, Object... args) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("UiDependencyTool: "+msg, args));
- }
- }
-
- protected static final void trace(Logger log, String msg, Object... args) {
- if (log.isTraceEnabled()) {
- log.trace(String.format("UiDependencyTool: "+msg, args));
- }
- }
-
public void configure(Map params) {
ServletContext app =
(ServletContext)params.get(ViewContext.SERVLET_CONTEXT_KEY);
LOG = (Logger)params.get(ToolContext.LOG_KEY);
@@ -159,7 +147,7 @@ public class UiDependencyTool {
if (file == null) {
file = DEFAULT_SOURCE_FILE;
} else {
- debug("Loading file: %s", file);
+ LOG.debug("UiDependencyTool: Loading file: {}", file);
}
synchronized (app) {
@@ -380,7 +368,7 @@ public class UiDependencyTool {
* wrapped as {@link RuntimeException}s.
*/
protected void read(String file, boolean required) {
- debug("UiDependencyTool: Reading file from %s", file);
+ LOG.debug("UiDependencyTool: Reading file from {}", file);
URL url = toURL(file);
if (url == null) {
String msg = "UiDependencyTool: Could not read file from
'"+file+"'";
@@ -398,12 +386,12 @@ public class UiDependencyTool {
}
catch (SAXException saxe)
{
- LOG.error("UiDependencyTool: Failed to parse '"+file+"'",
saxe);
+ LOG.error("UiDependencyTool: Failed to parse '{}'", file,
saxe);
throw new RuntimeException("While parsing the InputStream",
saxe);
}
catch (IOException ioe)
{
- LOG.error("UiDependencyTool: Failed to read '"+file+"'", ioe);
+ LOG.error("UiDependencyTool: Failed to read '{}'", file, ioe);
throw new RuntimeException("While handling the InputStream",
ioe);
}
}
@@ -453,7 +441,7 @@ public class UiDependencyTool {
* on it unless you're willing to update your code whenever this changes.
*/
protected Group makeGroup(String name) {
- trace(LOG, "Creating group '%s'", name);
+ LOG.trace("UiDependencyTool: Creating group '{}'", name);
Group group = new Group(name, LOG);
groups.put(name, group);
return group;
@@ -470,7 +458,7 @@ public class UiDependencyTool {
for (Map.Entry<String,List<String>> entry : fbt.entrySet()) {
String type = entry.getKey();
if (getType(type) == null) {
- LOG.error("UiDependencyTool: Type '"+type+"' is unknown and
will not be printed unless defined.");
+ LOG.error("UiDependencyTool: Type '{}' is unknown and will not
be printed unless defined.", type);
}
List<String> existing = dependencies.get(type);
if (existing == null) {
@@ -479,7 +467,7 @@ public class UiDependencyTool {
}
for (String file : entry.getValue()) {
if (!existing.contains(file)) {
- trace(LOG, "Adding %s: %s", type, file);
+ LOG.trace("UiDependencyTool: Adding {}: {}", type, file);
existing.add(file);
}
}
@@ -501,7 +489,7 @@ public class UiDependencyTool {
dependencies.put(type, files);
}
if (!files.contains(file)) {
- trace(LOG, "Adding %s: %s", type, file);
+ LOG.trace("UiDependencyTool: Adding {}: {}", type, file);
files.add(file);
}
}
@@ -550,12 +538,6 @@ public class UiDependencyTool {
this.LOG = log;
}
- private void trace(String msg, Object... args) {
- if (LOG.isTraceEnabled()) {
- UiDependencyTool.trace(LOG, "Group "+name+": "+msg, args);
- }
- }
-
public void addFile(String type, String value) {
List<String> files = dependencies.get(type);
if (files == null) {
@@ -563,7 +545,7 @@ public class UiDependencyTool {
dependencies.put(type, files);
}
if (!files.contains(value)) {
- trace("Adding %s: %s", type, value);
+ LOG.trace("Group {}: Adding {}: {}", name, type, value);
files.add(value);
}
}
@@ -574,7 +556,7 @@ public class UiDependencyTool {
this.groups = new ArrayList<String>();
}
if (!this.groups.contains(group)) {
- trace("Adding group %s", group, name);
+ LOG.trace("Group {}: Adding group {}", name, group);
this.groups.add(group);
}
}
@@ -588,7 +570,7 @@ public class UiDependencyTool {
if (!resolved) {
// mark first to keep circular from becoming infinite
resolved = true;
- trace("resolving...");
+ LOG.trace("Group {}: resolving...", name);
for (String name : groups) {
Group group = parent.getGroup(name);
if (group == null) {
@@ -601,7 +583,7 @@ public class UiDependencyTool {
}
}
}
- trace(" is resolved.");
+ LOG.trace("Group {}: is resolved.", name);
}
}
@@ -610,7 +592,7 @@ public class UiDependencyTool {
if (files == null) {
files = new ArrayList<String>();
files.add(value);
- trace("adding %s '%s' first", type, value);
+ LOG.trace("Group {}: adding {} '{}' first", name, type, value);
dependencies.put(type, files);
typeCounts.put(type, 1);
} else if (!files.contains(value)) {
@@ -619,7 +601,7 @@ public class UiDependencyTool {
count = 0;
}
files.add(count, value);
- trace("adding %s '%s' at %s", type, value, count);
+ LOG.trace("Group {}: adding {} '{}' at {}", name, type, value,
count);
typeCounts.put(type, ++count);
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
Wed Jun 22 16:34:11 2016
@@ -147,9 +147,9 @@ public class VelocityLayoutServlet exten
}
// log the current settings
- getLog().info("VelocityLayoutServlet: Error screen is
'"+errorTemplate+"'");
- getLog().info("VelocityLayoutServlet: Layout directory is
'"+layoutDir+"'");
- getLog().info("VelocityLayoutServlet: Default layout template is
'"+defaultLayout+"'");
+ getLog().info("VelocityLayoutServlet: Error screen is '{}'",
errorTemplate);
+ getLog().info("VelocityLayoutServlet: Layout directory is '{}'",
layoutDir);
+ getLog().info("VelocityLayoutServlet: Default layout template is
'{}'", defaultLayout);
// for efficiency's sake, make defaultLayout a full path now
defaultLayout = layoutDir + defaultLayout;
@@ -232,7 +232,7 @@ public class VelocityLayoutServlet exten
}
catch (Exception e)
{
- getLog().error("Can't load layout \"" + layout + "\"", e);
+ getLog().error("Can't load layout \"{}\"", layout, e);
// if it was an alternate layout we couldn't get...
if (!layout.equals(defaultLayout))
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Wed Jun 22 16:34:11 2016
@@ -220,7 +220,7 @@ public class VelocityView extends ViewTo
if (deprecationSupportMode != support)
{
this.deprecationSupportMode = support;
- debug("deprecationSupportMode is now %s", (support ? "on" :
"off"));
+ getLog().debug("deprecationSupportMode is now {}", (support ? "on"
: "off"));
}
}
@@ -253,7 +253,7 @@ public class VelocityView extends ViewTo
if (!defaultContentType.equals(type))
{
this.defaultContentType = type;
- debug("Default Content-Type was changed to %s", type);
+ getLog().debug("Default Content-Type was changed to {}", type);
}
}
@@ -398,7 +398,7 @@ public class VelocityView extends ViewTo
return false;
}
- debug("Configuring Velocity with properties at: %s", path);
+ getLog().debug("Configuring Velocity with properties at: {}", path);
// these props will override those already set
velocity.setExtendedProperties(props);
@@ -457,7 +457,7 @@ public class VelocityView extends ViewTo
else
{
// let the user know that the defaults were suppressed
- debug("Default tools configuration has been suppressed%s",
+ getLog().debug("Default tools configuration has been suppressed{}",
(hasOldToolbox ?
" to avoid conflicts with older application's context and
toolbox definition." :
"."));
@@ -486,7 +486,7 @@ public class VelocityView extends ViewTo
FactoryConfiguration injected =
ServletUtils.getConfiguration(servletContext);
if (injected != null)
{
- debug("Adding configuration instance in servletContext attributes
as '%s'", TOOLS_KEY);
+ getLog().debug("Adding configuration instance in servletContext
attributes as '{}'", TOOLS_KEY);
factoryConfig.addConfiguration(injected);
}
@@ -501,7 +501,7 @@ public class VelocityView extends ViewTo
}
// apply this configuration to the specified factory
- debug("Configuring factory with: %s", factoryConfig);
+ getLog().debug("Configuring factory with: {}", factoryConfig);
configure(factoryConfig);
}
@@ -536,7 +536,7 @@ public class VelocityView extends ViewTo
if (toolbox != null)
{
- debug("Loaded deprecated configuration from: %s", oldPath);
+ getLog().debug("Loaded deprecated configuration from: {}",
oldPath);
getLog().warn("Please upgrade to new \"/WEB-INF/tools.xml\" format
and conventional location."+
" Support for \"/WEB-INF/toolbox.xml\" format and
conventional file name will "+
"be removed in a future version.");
@@ -561,7 +561,7 @@ public class VelocityView extends ViewTo
return false;
}
- debug("Loaded configuration from: %s", path);
+ getLog().debug("Loaded configuration from: {}", path);
factory.addConfiguration(config);
// notify that new config was added
@@ -583,7 +583,10 @@ public class VelocityView extends ViewTo
getLog().error(msg);
throw new ResourceNotFoundException(msg);
}
- debug(msg);
+ else
+ {
+ getLog().debug(msg);
+ }
return null;
}
return inputStream;
@@ -599,7 +602,7 @@ public class VelocityView extends ViewTo
{
if (getLog().isTraceEnabled())
{
- getLog().trace("Searching for properties at: "+path);
+ getLog().trace("Searching for properties at {} ", path);
}
InputStream inputStream = getInputStream(path, required);
@@ -633,7 +636,7 @@ public class VelocityView extends ViewTo
}
catch (IOException ioe)
{
- getLog().error("Failed to close input stream for "+path, ioe);
+ getLog().error("Failed to close input stream for {}", path,
ioe);
}
}
return properties;
@@ -649,7 +652,7 @@ public class VelocityView extends ViewTo
{
if (getLog().isTraceEnabled())
{
- getLog().trace("Searching for configuration at: "+path);
+ getLog().trace("Searching for configuration at: {}", path);
}
FactoryConfiguration config = null;
@@ -668,7 +671,7 @@ public class VelocityView extends ViewTo
}
else
{
- debug(msg);
+ getLog().debug(msg);
}
}
}
@@ -684,7 +687,10 @@ public class VelocityView extends ViewTo
getLog().error(re.getMessage(), re);
throw re;
}
- getLog().debug(re.getMessage(), re);
+ else
+ {
+ getLog().debug(re.getMessage(), re);
+ }
}
return config;
}
@@ -719,7 +725,7 @@ public class VelocityView extends ViewTo
}
}
- debug("Default Content-Type is: %s", defaultContentType);
+ getLog().debug("Default Content-Type is: {}", defaultContentType);
}
@@ -924,8 +930,7 @@ public class VelocityView extends ViewTo
}
catch (Exception e)
{
- getLog().error("Trouble releasing VelocityWriter: " +
- e.getMessage(), e);
+ getLog().error("Trouble releasing VelocityWriter: ", e);
}
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
Wed Jun 22 16:34:11 2016
@@ -343,13 +343,13 @@ public class VelocityViewServlet extends
if (response.isCommitted())
{
getLog().error("An error occured but the response headers have
already been sent.");
- getLog().error("Error processing a template for path '" + path +
"'", e);
+ getLog().error("Error processing a template for path '{}'", path,
e);
return;
}
try
{
- getLog().error("Error processing a template for path '" + path +
"'", e);
+ getLog().error("Error processing a template for path '{}'", path,
e);
StringBuilder html = new StringBuilder();
html.append("<html>\n");
html.append("<head><title>Error</title></head>\n");
@@ -411,10 +411,7 @@ public class VelocityViewServlet extends
throws IOException
{
String path = ServletUtils.getPath(request);
- if (getLog().isDebugEnabled())
- {
- getLog().debug("Resource not found for path '" + path + "'", e);
- }
+ getLog().debug("Resource not found for path '{}'", path, e);
String message = e.getMessage();
if (!response.isCommitted() && path != null &&
message != null && message.contains("'" + path + "'"))
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
Wed Jun 22 16:34:11 2016
@@ -23,8 +23,9 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ToolInfo implementation for view tools. New instances
@@ -42,7 +43,7 @@ import org.apache.commons.logging.LogFac
@Deprecated
public class ViewToolInfo implements ToolInfo
{
- protected static final Log LOG = LogFactory.getLog(ViewToolInfo.class);
+ protected static final Logger LOG =
LoggerFactory.getLogger(ViewToolInfo.class);
private String key;
private Class clazz;
@@ -179,7 +180,7 @@ public class ViewToolInfo implements Too
{
if (clazz == null)
{
- LOG.error("Tool "+this.key+" has no Class definition!");
+ LOG.error("Tool {} has no Class definition!", key);
return null;
}
@@ -195,13 +196,11 @@ public class ViewToolInfo implements Too
* notice of them, and let other exceptions slip by. */
catch (IllegalAccessException e)
{
- LOG.error("Exception while instantiating instance of \"" +
- getClassname() + "\"", e);
+ LOG.error("Exception while instantiating instance of \"{}\"",
getClassname(), e);
}
catch (InstantiationException e)
{
- LOG.error("Exception while instantiating instance of \"" +
- getClassname() + "\"", e);
+ LOG.error("Exception while instantiating instance of \"{}\"",
getClassname(), e);
}
/* if the tool is configurable and we have parameters... */
@@ -214,11 +213,11 @@ public class ViewToolInfo implements Too
}
catch (IllegalAccessException iae)
{
- LOG.error("Exception when calling configure(Map) on "+tool,
iae);
+ LOG.error("Exception when calling configure(Map) on {}", tool,
iae);
}
catch (InvocationTargetException ite)
{
- LOG.error("Exception when calling configure(Map) on "+tool,
ite);
+ LOG.error("Exception when calling configure(Map) on {}", tool,
ite);
}
}
@@ -232,11 +231,11 @@ public class ViewToolInfo implements Too
}
catch (IllegalAccessException iae)
{
- LOG.error("Exception when calling init(Object) on "+tool, iae);
+ LOG.error("Exception when calling init(Object) on {}", tool,
iae);
}
catch (InvocationTargetException ite)
{
- LOG.error("Exception when calling init(Object) on "+tool, ite);
+ LOG.error("Exception when calling init(Object) on {}", tool,
ite);
}
}
return tool;
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
Wed Jun 22 16:34:11 2016
@@ -121,7 +121,7 @@ public class ViewToolManager extends Too
{
if (publish != this.publishToolboxes)
{
- debug("Publish toolboxes setting was changed to %s", publish);
+ getLog().debug("Publish toolboxes setting was changed to {}",
publish);
this.publishToolboxes = publish;
}
}
@@ -146,7 +146,7 @@ public class ViewToolManager extends Too
{
this.toolboxKey = key;
unpublishApplicationTools();
- debug("Toolbox key was changed to %s", key);
+ getLog().debug("Toolbox key was changed to {}", key);
}
}
@@ -165,7 +165,7 @@ public class ViewToolManager extends Too
{
if (create != this.createSession)
{
- debug("Create session setting was changed to %s", create);
+ getLog().debug("Create session setting was changed to {}", create);
this.createSession = create;
}
}
@@ -251,7 +251,7 @@ public class ViewToolManager extends Too
{
ToolContext context = super.createContext(toolProps);
context.putToolProperty(ViewContext.SERVLET_CONTEXT_KEY,
servletContext);
- debug("Non-ViewToolContext was requested from ViewToolManager.");
+ getLog().debug("Non-ViewToolContext was requested from
ViewToolManager.");
return context;
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
Wed Jun 22 16:34:11 2016
@@ -89,7 +89,7 @@ public class WebappResourceLoader extend
{
paths[i] += '/';
}
- log.info("WebappResourceLoader: added template path - '" +
paths[i] + "'");
+ log.info("WebappResourceLoader: added template path - '{}'",
paths[i]);
}
}
@@ -161,10 +161,7 @@ public class WebappResourceLoader extend
/* only save the first one for later throwing */
if (exception == null)
{
- if (log.isDebugEnabled())
- {
- log.debug("WebappResourceLoader: Could not load
"+path, e);
- }
+ log.debug("WebappResourceLoader: Could not load {}", path,
e);
exception = e;
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
Wed Jun 22 16:34:11 2016
@@ -164,7 +164,7 @@ public class WebappUberspector extends A
}
catch(Exception e)
{
- log.error("While looking for getAttribute('" + params[0] + "')
method:", e);
+ log.error("While looking for getAttribute('{}') method:",
params[0], e);
}
}
@@ -224,7 +224,7 @@ public class WebappUberspector extends A
}
catch(Exception e)
{
- log.error("While looking for put('" + params[0] + "')
method:", e);
+ log.error("While looking for put('{}') method:", params[0], e);
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
Wed Jun 22 16:34:11 2016
@@ -30,8 +30,8 @@ import java.util.Map;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -81,7 +81,7 @@ import org.apache.commons.logging.LogFac
@Deprecated
public class XMLToolboxManager implements ToolboxManager
{
- protected static final Log LOG =
LogFactory.getLog(XMLToolboxManager.class);
+ protected static final Logger LOG =
LoggerFactory.getLogger(XMLToolboxManager.class);
private List toolinfo;
private Map data;
@@ -110,10 +110,7 @@ public class XMLToolboxManager implement
if (validateToolInfo(info))
{
toolinfo.add(info);
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Added "+info.getClassname()+" to the toolbox as
"+info.getKey());
- }
+ LOG.debug("Added {} to the toolbox as {}", info.getClassname(),
info.getKey());
}
}
@@ -122,10 +119,7 @@ public class XMLToolboxManager implement
if (validateToolInfo(info))
{
data.put(info.getKey(), info.getInstance(null));
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Added '"+info.getInstance(null)+"' to the toolbox
as "+info.getKey());
- }
+ LOG.debug("Added '{}' to the toolbox as {}",
info.getInstance(null), info.getKey());
}
}
@@ -151,7 +145,7 @@ public class XMLToolboxManager implement
}
if (info.getClassname() == null)
{
- LOG.error("Tool " + info.getKey() + " has no Class definition!");
+ LOG.error("Tool {} has no Class definition!", info.getKey());
return false;
}
return true;
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
Wed Jun 22 16:34:11 2016
@@ -28,9 +28,10 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.commons.digester.RuleSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.velocity.tools.view.ToolInfo;
import org.apache.velocity.tools.view.XMLToolboxManager;
import org.apache.velocity.tools.view.context.ViewContext;
@@ -101,7 +102,7 @@ public class ServletToolboxManager exten
public static final String SESSION_TOOLS_KEY =
ServletToolboxManager.class.getName() + ":session-tools";
- protected static final Log LOG =
LogFactory.getLog(ServletToolboxManager.class);
+ protected static final Logger LOG =
LoggerFactory.getLogger(ServletToolboxManager.class);
private ServletContext servletContext;
private Map appTools;
@@ -167,7 +168,7 @@ public class ServletToolboxManager exten
if (is != null)
{
- LOG.info("Using config file '" + toolboxFile + "'");
+ LOG.info("Using config file '{}'", toolboxFile);
toolboxManager = new ServletToolboxManager(servletContext);
toolboxManager.load(is);
@@ -179,12 +180,12 @@ public class ServletToolboxManager exten
}
else
{
- LOG.debug("No toolbox was found at '" + toolboxFile + "'");
+ LOG.debug("No toolbox was found at '{}'", toolboxFile);
}
}
catch(Exception e)
{
- LOG.error("Problem loading toolbox '" + toolboxFile + "'", e);
+ LOG.error("Problem loading toolbox '{}'", toolboxFile, e);
}
finally
{
@@ -222,7 +223,7 @@ public class ServletToolboxManager exten
public void setCreateSession(boolean b)
{
createSession = b;
- LOG.debug("create-session is set to " + b);
+ LOG.debug("create-session is set to {} ", b);
}
@@ -236,7 +237,7 @@ public class ServletToolboxManager exten
public void setXhtml(Boolean value)
{
servletContext.setAttribute(ViewContext.XHTML, value);
- LOG.info(ViewContext.XHTML + " is set to " + value);
+ LOG.info("{} is set to {}", ViewContext.XHTML, value);
}
@@ -291,7 +292,7 @@ public class ServletToolboxManager exten
if (sti.getRequestPath() != null &&
!ViewContext.REQUEST.equalsIgnoreCase(sti.getScope()))
{
- LOG.error(sti.getKey() + " must be a request-scoped tool to
have a request path restriction!");
+ LOG.error("{} must be a request-scoped tool to have a request
path restriction!", sti.getKey());
return false;
}
}
@@ -330,8 +331,7 @@ public class ServletToolboxManager exten
}
else
{
- LOG.warn("Unknown scope '" + sti.getScope() + "' - " +
- sti.getKey() + " will be request scoped.");
+ LOG.warn("Unknown scope '{}' - {} will be request
scoped.", sti.getScope(), sti.getKey());
//default is request scope
requestToolInfo.add(info);
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
Wed Jun 22 16:34:11 2016
@@ -39,9 +39,7 @@ public class VelocityLayoutServlet
{
super.init(config);
- getLog().debug(this.getClass().getName() +
- " has been deprecated. Use " +
- super.getClass().getName() + " instead.");
+ getLog().debug("{} has been deprecated. Use {} instead.",
this.getClass().getName(), super.getClass().getName());
}
/**
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Wed Jun 22 16:34:11 2016
@@ -49,10 +49,7 @@ public class VelocityViewServlet
public void init(ServletConfig config) throws ServletException
{
super.init(config);
-
- getLog().debug(this.getClass().getName() +
- " has been deprecated. Use " +
- super.getClass().getName() + " instead.");
+ getLog().debug("{} has been deprecated. Use {} instead.",
this.getClass().getName(), super.getClass().getName());
}
/**
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
Wed Jun 22 16:34:11 2016
@@ -36,8 +36,7 @@ public class WebappLoader extends Webapp
{
public void init(ExtendedProperties configuration)
{
- log.warn("WebappLoader is deprecated. Use "+
- WebappResourceLoader.class.getName()+" instead.");
+ log.warn("WebappLoader is deprecated. Use {} instead.",
WebappResourceLoader.class.getName());
super.init(configuration);
}
}
Modified:
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java?rev=1749738&r1=1749737&r2=1749738&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
Wed Jun 22 16:34:11 2016
@@ -80,7 +80,7 @@ public class XmlTool extends SafeConfig
{
public static final String FILE_KEY = "file";
- protected Logger LOG;
+ protected Logger LOG = null;
private List<Node> nodes;
@@ -138,14 +138,6 @@ public class XmlTool extends SafeConfig
this.nodes.add(node);
}
- private void log(Object o, Throwable t)
- {
- if (LOG != null)
- {
- LOG.debug("XmlTool - "+o, t);
- }
- }
-
/**
* Creates a {@link URL} from the string and passes it to {@link
#read(URL)}.
*/
@@ -209,7 +201,10 @@ public class XmlTool extends SafeConfig
}
catch (Exception e)
{
- log("Failed to read XML from : "+o, e);
+ if (LOG != null)
+ {
+ LOG.debug("XmlTool - Failed to read XML from : {}", o, e);
+ }
return null;
}
}
@@ -235,7 +230,10 @@ public class XmlTool extends SafeConfig
}
catch (Exception e)
{
- log("Failed to parse XML from : "+o, e);
+ if (LOG != null)
+ {
+ LOG.debug("XmlTool - Failed to parse XML from : {}", o, e);
+ }
return null;
}
}
