Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java Sun Mar 3 10:36:42 2019 @@ -26,8 +26,8 @@ import java.io.UnsupportedEncodingExcept import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.util.LocaleUtils; import org.apache.turbine.util.TurbineException; @@ -46,7 +46,7 @@ import org.apache.turbine.util.TurbineEx public class DefaultSetEncodingValve extends AbstractValve { - private static final Log log = LogFactory.getLog(DefaultSetEncodingValve.class); + private static final Logger log = LogManager.getLogger(DefaultSetEncodingValve.class); /** * @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext) @@ -65,10 +65,7 @@ public class DefaultSetEncodingValve { requestEncoding = LocaleUtils.getDefaultInputEncoding(); - if (log.isDebugEnabled()) - { - log.debug("Changing Input Encoding to " + requestEncoding); - } + log.debug("Changing Input Encoding to {}", requestEncoding); try {
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java Sun Mar 3 10:36:42 2019 @@ -23,8 +23,8 @@ package org.apache.turbine.pipeline; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; import org.apache.turbine.util.uri.URIConstants; @@ -40,12 +40,13 @@ import org.apache.turbine.util.uri.URICo public class DetermineActionValve extends AbstractValve { - private static final Log log - = LogFactory.getLog(DetermineActionValve.class); + private static final Logger log + = LogManager.getLogger(DetermineActionValve.class); /** * @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext) */ + @Override public void invoke(PipelineData pipelineData, ValveContext context) throws IOException, TurbineException { @@ -67,10 +68,7 @@ public class DetermineActionValve } } - if (log.isDebugEnabled()) - { - log.debug("Action is now: " + data.getAction()); - } + log.debug("Action is now: {}", data::getAction); // Pass control to the next Valve in the Pipeline context.invokeNext(pipelineData); Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java Sun Mar 3 10:36:42 2019 @@ -24,8 +24,8 @@ package org.apache.turbine.pipeline; import java.io.IOException; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; @@ -40,7 +40,7 @@ import org.apache.turbine.util.TurbineEx public class DetermineRedirectRequestedValve extends AbstractValve { - private static final Log log = LogFactory.getLog(DetermineRedirectRequestedValve.class); + private static final Logger log = LogManager.getLogger(DetermineRedirectRequestedValve.class); /** * Creates a new instance. @@ -80,7 +80,7 @@ public class DetermineRedirectRequestedV { if (data.getResponse().isCommitted()) { - log.warn("redirect requested, response already committed: " + data.getRedirectURI()); + log.warn("redirect requested, response already committed: {}", data.getRedirectURI()); } else { Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java Sun Mar 3 10:36:42 2019 @@ -23,8 +23,8 @@ package org.apache.turbine.pipeline; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; import org.apache.turbine.util.uri.URIConstants; @@ -44,12 +44,13 @@ import org.apache.turbine.util.uri.URICo public class DetermineTargetValve extends AbstractValve { - private static final Log log - = LogFactory.getLog(DetermineTargetValve.class); + private static final Logger log + = LogManager.getLogger(DetermineTargetValve.class); /** * @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext) */ + @Override public void invoke(PipelineData pipelineData, ValveContext context) throws IOException, TurbineException { @@ -76,10 +77,7 @@ public class DetermineTargetValve } - if (log.isDebugEnabled()) - { - log.debug("Screen Target is now: " + runData.getScreen()); - } + log.debug("Screen Target is now: {}", runData::getScreen); // Pass control to the next Valve in the Pipeline context.invokeNext(pipelineData); Modified: turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java Sun Mar 3 10:36:42 2019 @@ -24,8 +24,8 @@ package org.apache.turbine.services; import java.util.Hashtable; import java.util.Stack; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * A generic implementation of <code>InitableBroker</code>. @@ -70,7 +70,7 @@ public abstract class BaseInitableBroker protected Stack<String> stack = new Stack<String>(); /** Logging */ - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger log = LogManager.getLogger(this.getClass()); /** * Default constructor of InitableBroker. @@ -155,8 +155,7 @@ public abstract class BaseInitableBroker { // Shutdown of a nonexistent class was requested. // This does not hurt anything, so we log the error and continue. - log.error("Shutdown of a nonexistent class " + - className + " was requested", e); + log.error("Shutdown of a nonexistent class {} was requested", className, e); } } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java Sun Mar 3 10:36:42 2019 @@ -31,8 +31,8 @@ import java.util.concurrent.locks.Reentr import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * A generic implementation of a <code>ServiceBroker</code> which @@ -105,7 +105,7 @@ public abstract class BaseServiceBroker private final ConcurrentHashMap<String, Object> serviceObjects = new ConcurrentHashMap<String, Object>(); /** Logging */ - private static Log log = LogFactory.getLog(BaseServiceBroker.class); + private static final Logger log = LogManager.getLogger(BaseServiceBroker.class); /** * Application root path as set by the @@ -263,7 +263,7 @@ public abstract class BaseServiceBroker && ("." + keyParts[2]).equals(CLASSNAME_SUFFIX)) { String serviceKey = keyParts[1]; - log.info("Added Mapping for Service: " + serviceKey); + log.info("Added Mapping for Service: {}", serviceKey); if (!mapping.containsKey(serviceKey)) { @@ -276,7 +276,7 @@ public abstract class BaseServiceBroker // detect TurbineServiceProviders if (checkForInterface(TurbineServiceProvider.class, clazz.getInterfaces())) { - log.info("Found a TurbineServiceProvider: " + serviceKey + " - initializing it early"); + log.info("Found a TurbineServiceProvider: {} - initializing it early", serviceKey); earlyInitFlags.put(SERVICE_PREFIX + serviceKey + ".earlyInit", "true"); } } @@ -289,12 +289,7 @@ public abstract class BaseServiceBroker { throw t; } - catch (ClassNotFoundException e) - { - throw new InitializationException("Class " + className + - " is unavailable. Check your jars and classes.", e); - } - catch (NoClassDefFoundError e) + catch (ClassNotFoundException | NoClassDefFoundError e) { throw new InitializationException("Class " + className + " is unavailable. Check your jars and classes.", e); @@ -390,11 +385,7 @@ public abstract class BaseServiceBroker { initServices(false); } - catch (InstantiationException notThrown) - { - log.debug("Caught non fatal exception", notThrown); - } - catch (InitializationException notThrown) + catch (InstantiationException | InitializationException notThrown) { log.debug("Caught non fatal exception", notThrown); } @@ -432,11 +423,7 @@ public abstract class BaseServiceBroker } // In case of an exception, file an error message; the // system may be still functional, though. - catch (InstantiationException e) - { - log.error(e); - } - catch (InitializationException e) + catch (InstantiationException | InitializationException e) { log.error(e); } @@ -455,9 +442,9 @@ public abstract class BaseServiceBroker // Only start up services that have their earlyInit flag set. if (getConfiguration(name).getBoolean("earlyInit", false)) { - log.info("Start Initializing service (early): " + name); + log.info("Start Initializing service (early): {}", name); initService(name); - log.info("Finish Initializing service (early): " + name); + log.info("Finish Initializing service (early): {}", name); } } @@ -524,7 +511,7 @@ public abstract class BaseServiceBroker for (Iterator<String> serviceNames = reverseServicesList.iterator(); serviceNames.hasNext();) { serviceName = serviceNames.next(); - log.info("Shutting down service: " + serviceName); + log.info("Shutting down service: {}", serviceName); shutdownService(serviceName); } } @@ -553,9 +540,9 @@ public abstract class BaseServiceBroker { if (!service.getInit()) { - log.info("Start Initializing service (late): " + name); + log.info("Start Initializing service (late): {}", name); service.init(); - log.info("Finish Initializing service (late): " + name); + log.info("Finish Initializing service (late): {}", name); } } } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java Sun Mar 3 10:36:42 2019 @@ -30,8 +30,8 @@ import java.util.concurrent.ConcurrentHa import java.util.concurrent.ConcurrentMap; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.TurbineConstants; import org.apache.turbine.annotation.AnnotationProcessor; @@ -57,8 +57,8 @@ public class TurbineAssemblerBrokerServi implements AssemblerBrokerService { /** Logging */ - private static Log log - = LogFactory.getLog(TurbineAssemblerBrokerService.class); + private static Logger log + = LogManager.getLogger(TurbineAssemblerBrokerService.class); /** A structure that holds the registered AssemblerFactories */ private Map<Class<?>, List<?>> factories = null; @@ -102,7 +102,7 @@ public class TurbineAssemblerBrokerServi { List<Object> names = getConfiguration().getList(type); - log.info("Registering " + names.size() + " " + type + " factories."); + log.info("Registering {} {} factories.", Integer.valueOf(names.size()), type); for (Iterator<Object> it = names.iterator(); it.hasNext(); ) { @@ -217,17 +217,11 @@ public class TurbineAssemblerBrokerServi if (isCaching && assemblerCache.containsKey(key)) { assembler = (T) assemblerCache.get(key); - if (log.isDebugEnabled()) - { - log.debug("Found " + key + " in the cache!"); - } + log.debug("Found {} in the cache!", key); } else { - if (log.isDebugEnabled()) - { - log.debug("Loading " + key); - } + log.debug("Loading {}", key); List<AssemblerFactory<T>> facs = getFactoryGroup(type); for (Iterator<AssemblerFactory<T>> it = facs.iterator(); (assembler == null) && it.hasNext();) @@ -283,11 +277,11 @@ public class TurbineAssemblerBrokerServi if (isCaching && loaderCache.containsKey(type)) { loader = (Loader<T>) loaderCache.get(type); - log.debug("Found " + type + " loader in the cache!"); + log.debug("Found {} loader in the cache!", type); } else { - log.debug("Getting Loader for " + type); + log.debug("Getting Loader for {}", type); List<AssemblerFactory<T>> facs = getFactoryGroup(type); for (Iterator<AssemblerFactory<T>> it = facs.iterator(); (loader == null) && it.hasNext();) @@ -304,7 +298,7 @@ public class TurbineAssemblerBrokerServi if (loader == null) { - log.warn("Loader for " + type + " is null."); + log.warn("Loader for {} is null.", type); } return loader; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java Sun Mar 3 10:36:42 2019 @@ -24,8 +24,8 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.Assembler; import org.apache.turbine.modules.GenericLoader; import org.apache.turbine.modules.Loader; @@ -46,7 +46,7 @@ public abstract class JavaBaseFactory<T private static List<String> packages = GenericLoader.getPackages(); /** Logging */ - protected Log log = LogFactory.getLog(this.getClass()); + protected Logger log = LogManager.getLogger(this.getClass()); /** * A cache for previously obtained Class instances, which we keep in order @@ -66,10 +66,7 @@ public abstract class JavaBaseFactory<T { T assembler = null; - if (log.isDebugEnabled()) - { - log.debug("Class Fragment is " + name); - } + log.debug("Class Fragment is {}", name); if (StringUtils.isNotEmpty(name)) { @@ -80,10 +77,7 @@ public abstract class JavaBaseFactory<T sb.append(p).append('.').append(packageName).append('.').append(name); String className = sb.toString(); - if (log.isDebugEnabled()) - { - log.debug("Trying " + className); - } + log.debug("Trying {}", className); try { @@ -103,45 +97,26 @@ public abstract class JavaBaseFactory<T catch (ClassNotFoundException cnfe) { // Do this so we loop through all the packages. - log.debug(className + ": Not found"); + log.debug("{}: Not found", className); } catch (NoClassDefFoundError ncdfe) { // Do this so we loop through all the packages. - log.debug(className + ": No Class Definition found"); - } - catch (ClassCastException cce) - { - // This means trouble! - // Alternatively we can throw this exception so - // that it will appear on the client browser - log.error("Could not load "+className, cce); - break; // for() + log.debug("{}: No Class Definition found", className); } - catch (InstantiationException ine) - { - // This means trouble! - // Alternatively we can throw this exception so - // that it will appear on the client browser - log.error("Could not load "+className, ine); - break; // for() - } - catch (IllegalAccessException ilae) + // With ClassCastException, InstantiationException we hit big problems + catch (ClassCastException | InstantiationException | IllegalAccessException e) { // This means trouble! // Alternatively we can throw this exception so // that it will appear on the client browser - log.error("Could not load "+className, ilae); + log.error("Could not load {}", className, e); break; // for() } - // With ClassCastException, InstantiationException we hit big problems } } - if (log.isDebugEnabled()) - { - log.debug("Returning: " + assembler); - } + log.debug("Returning: {}", assembler); return assembler; } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java Sun Mar 3 10:36:42 2019 @@ -25,8 +25,8 @@ import java.io.File; import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.Assembler; import org.apache.turbine.modules.Loader; import org.apache.turbine.services.TurbineServices; @@ -55,7 +55,7 @@ public abstract class PythonBaseFactory< public static final String PYTHON_CONFIG_FILE = "conf.py"; /** Logging */ - private static Log log = LogFactory.getLog(PythonBaseFactory.class); + private static Logger log = LogManager.getLogger(PythonBaseFactory.class); /** Our configuration */ private final Configuration conf = TurbineServices.getInstance().getConfiguration(AssemblerBrokerService.SERVICE_NAME); @@ -79,7 +79,7 @@ public abstract class PythonBaseFactory< "Python path not found - check your Properties"); } - log.debug("Screen name for JPython: " + name); + log.debug("Screen name for JPython: {}", name); T assembler = null; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java Sun Mar 3 10:36:42 2019 @@ -114,7 +114,7 @@ public class TurbineYaafiComponentServic // determine the home directory File home = new File(getServiceBroker().getApplicationRoot()); - log.info("Using the following home : " + home.getAbsolutePath()); + log.info("Using the following home : {}", home::getAbsolutePath); // create the configuration for YAAFI ServiceContainerConfiguration config = @@ -130,8 +130,7 @@ public class TurbineYaafiComponentServic } catch (Exception e) { - String msg = "Initializing YAAFI failed"; - log.error(msg,e); + log.error("Initializing YAAFI failed", e); throw e; } } @@ -284,12 +283,6 @@ public class TurbineYaafiComponentServic { return this.lookup(roleName); } - catch (ServiceException e) - { - String msg = "Unable to get the following service : " + roleName; - log.error(msg); - throw new InstantiationException(msg); - } catch (Throwable t) { String msg = "Unable to get the following service : " + roleName; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java Sun Mar 3 10:36:42 2019 @@ -25,14 +25,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.commons.lang.ArrayUtils; import org.apache.fulcrum.intake.IntakeException; import org.apache.fulcrum.intake.IntakeService; import org.apache.fulcrum.intake.Retrievable; import org.apache.fulcrum.intake.model.Group; import org.apache.fulcrum.parser.ValueParser; import org.apache.fulcrum.pool.Recyclable; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.annotation.TurbineService; import org.apache.turbine.services.pull.ApplicationTool; import org.apache.turbine.util.RunData; @@ -52,7 +53,7 @@ public class IntakeTool implements ApplicationTool, Recyclable { /** Used for logging */ - protected static final Log log = LogFactory.getLog(IntakeTool.class); + protected static final Logger log = LogManager.getLogger(IntakeTool.class); /** Constant for default key */ public static final String DEFAULT_KEY = "_0"; @@ -113,7 +114,7 @@ public class IntakeTool String[] groupKeys = pp.getStrings(INTAKE_GRP); String[] groupNames = null; - if (groupKeys == null || groupKeys.length == 0) + if (ArrayUtils.isEmpty(groupKeys)) { groupNames = intakeService.getGroupNames(); } @@ -124,7 +125,6 @@ public class IntakeTool { groupNames[i] = intakeService.getGroupName(groupKeys[i]); } - } for (int i = groupNames.length - 1; i >= 0; i--) @@ -136,10 +136,8 @@ public class IntakeTool if (foundGroups != null) { - for (Group group : foundGroups) - { - groups.put(group.getObjectKey(), group); - } + foundGroups.forEach( + group -> groups.put(group.getObjectKey(), group)); } } catch (IntakeException e) @@ -462,7 +460,7 @@ public class IntakeTool } catch (IntakeException ie) { - log.error("Tried to release unknown group " + group.getIntakeGroupName(), ie); + log.error("Tried to release unknown group {}", group.getIntakeGroupName(), ie); } } } @@ -528,8 +526,8 @@ public class IntakeTool } catch (IntakeException ie) { - log.error("Tried to release unknown group " - + group.getIntakeGroupName()); + log.error("Tried to release unknown group {}", + group.getIntakeGroupName(), ie); } } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsonrpc/JSONProcessor.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsonrpc/JSONProcessor.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/jsonrpc/JSONProcessor.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/jsonrpc/JSONProcessor.java Sun Mar 3 10:36:42 2019 @@ -23,8 +23,8 @@ import java.io.CharArrayWriter; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jabsorb.JSONRPCBridge; import org.jabsorb.JSONRPCResult; import org.json.JSONArray; @@ -39,7 +39,7 @@ import org.json.JSONObject; public class JSONProcessor { /** Log. */ - private static Log log = LogFactory.getLog(JSONProcessor.class); + private static Logger log = LogManager.getLogger(JSONProcessor.class); /** * Process a JSON RPC call @@ -76,14 +76,11 @@ public class JSONProcessor } catch (JSONException e) { - log.error(".processCall(): can't parse call: " + cdata, e); + log.error(".processCall(): can't parse call: {}", cdata, e); json_res = JSONRPCResult.MSG_ERR_PARSE; } // Write the response - if (log.isDebugEnabled()) - { - log.debug(".processCall(): returns " + json_res.toString()); - } + log.debug(".processCall(): returns ", json_res::toString); return json_res; } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java Sun Mar 3 10:36:42 2019 @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletReq import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.services.InitializationException; @@ -63,7 +63,7 @@ public class TurbineJspService private int bufferSize; /** Logging */ - private static Log log = LogFactory.getLog(TurbineJspService.class); + private static Logger log = LogManager.getLogger(TurbineJspService.class); /** * Load all configured components and initialize them. This is @@ -278,16 +278,16 @@ public class TurbineJspService @Override public String getRelativeTemplateName(String template) { - template = warnAbsolute(template); + String relativeTemplate = warnAbsolute(template); // Find which template path the template is in // We have a 1:1 match between relative and absolute // pathes so we can use the index for translation. for (int i = 0; i < templatePaths.length; i++) { - if (templateExists(templatePaths[i], template)) + if (templateExists(templatePaths[i], relativeTemplate)) { - return relativeTemplatePaths[i] + "/" + template; + return relativeTemplatePaths[i] + "/" + relativeTemplate; } } return null; @@ -303,8 +303,7 @@ public class TurbineJspService { if (template.startsWith("/")) { - log.warn("Template " + template - + " has a leading /, which is wrong!"); + log.warn("Template {} has a leading /, which is wrong!", template); return template.substring(1); } return template; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java Sun Mar 3 10:36:42 2019 @@ -1,6 +1,8 @@ package org.apache.turbine.services.jsp.util; +import org.apache.logging.log4j.LogManager; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,8 +23,7 @@ package org.apache.turbine.services.jsp. */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.NavigationLoader; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateService; @@ -46,7 +47,7 @@ import org.apache.turbine.util.RunData; public class JspNavigation { /** Logging */ - private static Log log = LogFactory.getLog(JspNavigation.class); + private static Logger log = LogManager.getLogger(JspNavigation.class); /* The RunData object */ private final RunData data; @@ -82,8 +83,7 @@ public class JspNavigation log.error(message, e); try { - data.getResponse().getWriter().print("Error processing navigation template: " - + template + " using module: " + module); + data.getResponse().getWriter().print(message); } catch (java.io.IOException ioe) { Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java Sun Mar 3 10:36:42 2019 @@ -1,6 +1,8 @@ package org.apache.turbine.services.jsp.util; +import org.apache.logging.log4j.LogManager; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,8 +23,7 @@ package org.apache.turbine.services.jsp. */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.Screen; import org.apache.turbine.modules.ScreenLoader; import org.apache.turbine.services.TurbineServices; @@ -48,7 +49,7 @@ import org.apache.turbine.util.RunData; public class JspScreenPlaceholder { /** Logging */ - private static Log log = LogFactory.getLog(JspNavigation.class); + private static Logger log = LogManager.getLogger(JspNavigation.class); /* The RunData object */ private final RunData data; @@ -84,13 +85,12 @@ public class JspScreenPlaceholder } catch (Exception e) { - String message = "Error processing navigation template:" + + String message = "Error processing screen template:" + template + " using module: " + module; log.error(message, e); try { - data.getResponse().getWriter().print("Error processing navigation template: " - + template + " using module: " + module); + data.getResponse().getWriter().print(message); } catch (java.io.IOException ioe) { Modified: turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java Sun Mar 3 10:36:42 2019 @@ -22,8 +22,8 @@ package org.apache.turbine.services.loca import java.util.Locale; import java.util.MissingResourceException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fulcrum.localization.LocalizationService; import org.apache.turbine.annotation.TurbineService; import org.apache.turbine.services.pull.ApplicationTool; @@ -39,7 +39,7 @@ import org.apache.turbine.util.RunData; public class LocalizationTool implements ApplicationTool { /** Logging */ - private static Log log = LogFactory.getLog(LocalizationTool.class); + private static Logger log = LogManager.getLogger(LocalizationTool.class); /** Fulcrum Localization component */ @TurbineService Modified: turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java Sun Mar 3 10:36:42 2019 @@ -31,8 +31,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.turbine.Turbine; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.TurbineBaseService; @@ -52,7 +52,7 @@ public class TurbineNamingService implements NamingService { /** Logging */ - private static Log log = LogFactory.getLog(TurbineNamingService.class); + private static Logger log = LogManager.getLogger(TurbineNamingService.class); /** * A global Map of Property objects which are initialised using Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java Sun Mar 3 10:36:42 2019 @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.pool.PoolService; import org.apache.fulcrum.security.model.turbine.TurbineUserManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.annotation.AnnotationProcessor; import org.apache.turbine.om.security.User; @@ -123,7 +123,7 @@ public class TurbinePullService implements PullService { /** Logging */ - private static Log log = LogFactory.getLog(TurbinePullService.class); + private static Logger log = LogManager.getLogger(TurbinePullService.class); /** Reference to the pool service */ private PoolService pool = null; @@ -250,8 +250,7 @@ public class TurbinePullService // be refreshed on a per request basis. if (refreshToolsPerRequest) { - log.info("Pull Model tools will " - + "be refreshed on a per request basis."); + log.info("Pull Model tools will be refreshed on a per request basis."); } } @@ -338,14 +337,12 @@ public class TurbinePullService // Add the tool to the list being built. tools.add(new ToolData(toolName, toolClassName, toolClass)); - log.info("Tool " + toolClassName - + " to add to the context as '$" + toolName + "'"); + log.info("Tool {} to add to the context as '${}'", toolClassName, toolName); } // NoClassDefFoundError + ClassNotFoundException catch (Throwable e) { - log.error("Cannot instantiate tool class " - + toolClassName + ": ", e); + log.error("Cannot instantiate tool class {}", toolClassName, e); } } @@ -489,9 +486,8 @@ public class TurbinePullService } catch (Exception e) { - log.error("Could not instantiate global tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate global tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -521,9 +517,8 @@ public class TurbinePullService } catch (Exception e) { - log.error("Could not instantiate request tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate request tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -553,9 +548,8 @@ public class TurbinePullService } catch (Exception e) { - log.error("Could not instantiate request tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate request tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -629,22 +623,19 @@ public class TurbinePullService } // put the tool in the context - log.debug("Adding " + tool + " to ctx as " - + toolData.toolName); + log.debug("Adding {} to ctx as {}", tool, toolData.toolName); context.put(toolData.toolName, tool); } else { - log.info("Tool " + toolData.toolName - + " was null, skipping it."); + log.info("Tool {} was null, skipping it.", toolData.toolName); } } } catch (Exception e) { - log.error("Could not instantiate session tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate session tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -715,22 +706,19 @@ public class TurbinePullService } // put the tool in the context - log.debug("Adding " + tool + " to ctx as " - + toolData.toolName); + log.debug("Adding {} to ctx as {}", tool, toolData.toolName); context.put(toolData.toolName, tool); } else { - log.info("Tool " + toolData.toolName - + " was null, skipping it."); + log.info("Tool {} was null, skipping it.", toolData.toolName); } } } catch (Exception e) { - log.error("Could not instantiate session tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate session tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -799,23 +787,20 @@ public class TurbinePullService } // put the tool in the context - log.debug("Adding " + tool + " to ctx as " - + toolData.toolName); + log.debug("Adding {} to ctx as {}", tool, toolData.toolName); log.warn("Persistent scope tools are deprecated."); context.put(toolData.toolName, tool); } else { - log.info("Tool " + toolData.toolName - + " was null, skipping it."); + log.info("Tool {} was null, skipping it.", toolData.toolName); } } } catch (Exception e) { - log.error("Could not instantiate perm tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate perm tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } @@ -882,23 +867,20 @@ public class TurbinePullService } // put the tool in the context - log.debug("Adding " + tool + " to ctx as " - + toolData.toolName); + log.debug("Adding {} to ctx as {}", tool, toolData.toolName); log.warn("Persistent scope tools are deprecated."); context.put(toolData.toolName, tool); } else { - log.info("Tool " + toolData.toolName - + " was null, skipping it."); + log.info("Tool {} was null, skipping it.", toolData.toolName); } } } catch (Exception e) { - log.error("Could not instantiate perm tool " - + toolData.toolName + " from a " - + toolData.toolClassName + " object", e); + log.error("Could not instantiate perm tool {} from a {} object", + toolData.toolName, toolData.toolClassName, e); } } } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java Sun Mar 3 10:36:42 2019 @@ -22,9 +22,9 @@ package org.apache.turbine.services.pull import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.parser.ParameterParser; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.services.pull.ApplicationTool; @@ -79,7 +79,7 @@ public class TemplateLink protected TemplateURI templateURI = null; /** Logging */ - private static Log log = LogFactory.getLog(TemplateLink.class); + private static final Logger log = LogManager.getLogger(TemplateLink.class); /** * Default constructor @@ -175,7 +175,7 @@ public class TemplateLink */ public TemplateLink setPage(String template) { - log.debug("setPage(" + template + ")"); + log.debug("setPage({})", template); this.template = template; templateURI.setTemplate(template); return this; @@ -203,7 +203,7 @@ public class TemplateLink */ public TemplateLink setAction(String action) { - log.debug("setAction(" + action + ")"); + log.debug("setAction({})", action); templateURI.setAction(action); return this; } @@ -220,7 +220,7 @@ public class TemplateLink */ public TemplateLink setActionEvent(String action, String event) { - log.debug("setActionEvent(" + action + ", "+ event +")"); + log.debug("setActionEvent({}, {})", action, event); templateURI.setActionEvent(action, event); return this; } @@ -236,7 +236,7 @@ public class TemplateLink */ public TemplateLink setScreen(String screen) { - log.debug("setScreen(" + screen + ")"); + log.debug("setScreen({})", screen); templateURI.setScreen(screen); return this; } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/UITool.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/UITool.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/UITool.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/UITool.java Sun Mar 3 10:36:42 2019 @@ -1,5 +1,7 @@ package org.apache.turbine.services.pull.tools; +import org.apache.logging.log4j.LogManager; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,8 +21,7 @@ package org.apache.turbine.services.pull * under the License. */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; import org.apache.turbine.annotation.TurbineService; import org.apache.turbine.om.security.User; import org.apache.turbine.pipeline.PipelineData; @@ -64,7 +65,7 @@ import org.apache.turbine.util.ServerDat public class UITool implements ApplicationTool { /** Logging */ - private static Log log = LogFactory.getLog(UITool.class); + private static final Logger log = LogManager.getLogger(UITool.class); /** * Attribute name of skinName value in User's temp hashmap. @@ -89,7 +90,7 @@ public class UITool implements Applicati public void refresh() { uiService.refresh(getSkin()); - log.debug("UITool refreshed for skin: " + getSkin()); + log.debug("UITool refreshed for skin: {}", this::getSkin); } /** Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Sun Mar 3 10:36:42 2019 @@ -35,12 +35,12 @@ import javax.servlet.http.HttpServletRes import javax.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.parser.CookieParser; import org.apache.fulcrum.parser.ParameterParser; import org.apache.fulcrum.security.acl.AccessControlList; import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.TurbineConstants; import org.apache.turbine.om.security.User; @@ -150,7 +150,7 @@ public class DefaultTurbineRunData private final Map<String, Object> debugVariables = new HashMap<String, Object>(); /** Logging */ - private static final Log log = LogFactory.getLog(DefaultTurbineRunData.class); + private static final Logger log = LogManager.getLogger(DefaultTurbineRunData.class); /** * Attempts to get the User object from the session. If it does @@ -751,7 +751,7 @@ public class DefaultTurbineRunData @Override public void setUser(User user) { - log.debug("user set: " + user.getName()); + log.debug("user set: {}", user::getName); get(Turbine.class).put(User.class, user); } @@ -899,7 +899,7 @@ public class DefaultTurbineRunData @Override public void setCharSet(String charSet) { - log.debug("setCharSet(" + charSet + ")"); + log.debug("setCharSet({})", charSet); this.charSet = charSet; } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java Sun Mar 3 10:36:42 2019 @@ -23,8 +23,8 @@ import java.util.Calendar; import java.util.Date; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.util.TurbineException; /** @@ -35,7 +35,7 @@ import org.apache.turbine.util.TurbineEx public abstract class AbstractJobEntry implements JobEntry { /** Logging */ - protected static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME); + protected static final Logger log = LogManager.getLogger(ScheduleService.LOGGER_NAME); /** indicates if job is currently running */ private boolean jobIsActive = false; @@ -288,7 +288,7 @@ public abstract class AbstractJobEntry i // Do nothing. } - log.info("Next runtime for task " + this.getTask() + " is " + this.getNextRunDate()); + log.info("Next runtime for task {} is {}", this::getTask, this::getNextRunDate); } /** Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java Sun Mar 3 10:36:42 2019 @@ -21,8 +21,8 @@ package org.apache.turbine.services.sche import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.TurbineBaseService; import org.apache.turbine.util.TurbineException; @@ -37,7 +37,7 @@ import org.apache.turbine.util.TurbineEx public abstract class AbstractSchedulerService extends TurbineBaseService implements ScheduleService { /** Logging */ - protected static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME); + protected static final Logger log = LogManager.getLogger(ScheduleService.LOGGER_NAME); /** The queue */ protected JobQueue<JobEntry> scheduleQueue = null; @@ -359,7 +359,7 @@ public abstract class AbstractSchedulerS } catch (Exception e) { - log.error("Error running a Scheduled Job: " + taskName, e); + log.error("Error running a Scheduled Job: {}", taskName, e); enabled = false; } finally Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java Sun Mar 3 10:36:42 2019 @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.quartz.QuartzScheduler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.TurbineBaseService; import org.apache.turbine.services.TurbineServices; @@ -51,7 +51,7 @@ public class QuartzSchedulerService implements ScheduleService { /** Logging */ - protected static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME); + protected static final Logger log = LogManager.getLogger(ScheduleService.LOGGER_NAME); /** Current status of the scheduler */ protected boolean enabled = false; @@ -264,7 +264,6 @@ public class QuartzSchedulerService try { - @SuppressWarnings("unchecked") // See QTZ-184 GroupMatcher<JobKey> groupMatcher = GroupMatcher.groupEquals(JobEntryQuartz.DEFAULT_JOB_GROUP_NAME); Set<JobKey> jobKeys = scheduler.getJobKeys(groupMatcher); for (JobKey jk : jobKeys) Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java Sun Mar 3 10:36:42 2019 @@ -23,8 +23,8 @@ package org.apache.turbine.services.sche import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.annotation.TurbineService; import org.apache.turbine.services.pull.ApplicationTool; import org.apache.turbine.util.TurbineException; @@ -38,7 +38,7 @@ import org.apache.turbine.util.TurbineEx public class SchedulerTool implements ApplicationTool { /** Used for logging */ - private static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME); + private static final Logger log = LogManager.getLogger(ScheduleService.LOGGER_NAME); /** * The scheduler service. @@ -104,7 +104,7 @@ public class SchedulerTool implements Ap } catch (TurbineException e) { - log.error("Could not retreive job id #" + jobId, e); + log.error("Could not retreive job id #{}", jobId, e); } return je; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java Sun Mar 3 10:36:42 2019 @@ -1,5 +1,7 @@ package org.apache.turbine.services.schedule; +import org.apache.logging.log4j.LogManager; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,8 +21,7 @@ package org.apache.turbine.services.sche * under the License. */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.ScheduledJobLoader; /** @@ -41,7 +42,7 @@ public class WorkerThread private JobEntry je = null; /** Logging */ - private static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME); + private static final Logger log = LogManager.getLogger(ScheduleService.LOGGER_NAME); /** * Creates a new worker to run the specified <code>JobEntry</code>. @@ -75,8 +76,8 @@ public class WorkerThread } catch (Exception e) { - log.error("Error in WorkerThread for scheduled job #" + - je.getJobId() + ", task: " + je.getTask(), e); + log.error("Error in WorkerThread for scheduled job #{}, task: {}", + Integer.valueOf(je.getJobId()), je.getTask(), e); } finally { @@ -95,7 +96,7 @@ public class WorkerThread */ private final void logStateChange(String state) { - log.debug("Scheduled job #" + je.getJobId() + ' ' + state + - ", task: " + je.getTask()); + log.error("Scheduled job #{} {}, task: {}", + Integer.valueOf(je.getJobId()), state, je.getTask()); } } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java Sun Mar 3 10:36:42 2019 @@ -22,8 +22,6 @@ package org.apache.turbine.services.secu import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.security.GroupManager; import org.apache.fulcrum.security.PermissionManager; import org.apache.fulcrum.security.RoleManager; @@ -40,6 +38,8 @@ import org.apache.fulcrum.security.util. import org.apache.fulcrum.security.util.PermissionSet; import org.apache.fulcrum.security.util.RoleSet; import org.apache.fulcrum.security.util.UnknownEntityException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.om.security.User; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.ServiceManager; @@ -95,7 +95,7 @@ public class DefaultSecurityService private static volatile Group globalGroup = null; /** Logging */ - private static Log log = LogFactory.getLog(DefaultSecurityService.class); + private static final Logger log = LogManager.getLogger(DefaultSecurityService.class); /** * Initializes the SecurityService, locating the appropriate UserManager @@ -371,8 +371,8 @@ public class DefaultSecurityService } /** - * Retrieves a User object representing an individual who has - * properly identified themselves with their verified + * Retrieves a User object representing an individual who has + * properly identified themselves with their verified * username and password * * @param username The user name. @@ -853,14 +853,14 @@ public class DefaultSecurityService } modelManager.revoke(user.getUserDelegate(), group, role); } - + /** - * Replaces transactionally the first role with second role for the given user. - * + * Replaces transactionally the first role with second role for the given user. + * * @param user the user. * @param role the old role * @param newRole the new role - * + * * @throws DataBackendException if there was an error accessing the data * backend. * @throws UnknownEntityException if user account, group or role is not @@ -941,13 +941,13 @@ public class DefaultSecurityService { modelManager.revokeAll(role); } - + /** * Revokes by default all permissions from a Role and if flag is set * all group and user relationships with this role - * + * * This method is used when deleting a Role. - * + * * @param role * the Role * @param cascadeDelete @@ -959,7 +959,7 @@ public class DefaultSecurityService */ @Override public void revokeAll( Role role, boolean cascadeDelete ) - throws DataBackendException, UnknownEntityException + throws DataBackendException, UnknownEntityException { modelManager.revokeAll(role, cascadeDelete); } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java Sun Mar 3 10:36:42 2019 @@ -25,8 +25,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.factory.FactoryService; import org.apache.fulcrum.security.acl.AccessControlList; import org.apache.fulcrum.security.model.turbine.TurbineUserManager; @@ -36,6 +34,8 @@ import org.apache.fulcrum.security.util. import org.apache.fulcrum.security.util.PasswordMismatchException; import org.apache.fulcrum.security.util.UnknownEntityException; import org.apache.fulcrum.security.util.UserSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.om.security.TurbineUserDelegate; import org.apache.turbine.om.security.User; import org.apache.turbine.services.InitializationException; @@ -53,7 +53,7 @@ import org.apache.turbine.util.ObjectUti * <ol> * <li>either in a method with the same name (and very similar signature)</li> * <li>or mapped to method names as listed below: - * + * * <ul> * <li>method(s) in this manager -> Fulcrum manager method(s) * <li>{@link #createAccount(User, String)}createAccount -> addUser(User, String) @@ -63,10 +63,10 @@ import org.apache.turbine.util.ObjectUti * <li>{@link #retrieveList(Object)} -> getAllUsers() * <li>{@link #accountExists(String)}, {@link #accountExists(User)} -> checkExists(String), checkExists(User) * </ul> - * + * * </li> * </ol> - * + * * In this way all public methods of Fulcrum {@link TurbineUserManager} interface are used by reference of the Fulcrum delegate {@link #umDelegate} * and wrapped by this manager. * @@ -85,7 +85,7 @@ public class DefaultUserManager implemen /** Logging */ - private static Log log = LogFactory.getLog(DefaultUserManager.class); + private static final Logger log = LogManager.getLogger(DefaultUserManager.class); /** * Wrap a Fulcrum user object into a Turbine user object Modified: turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java Sun Mar 3 10:36:42 2019 @@ -28,8 +28,8 @@ import java.net.URL; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.services.TurbineBaseService; import org.apache.turbine.util.ServletUtils; @@ -52,7 +52,7 @@ public class TurbineServletService extends TurbineBaseService implements ServletService { /** Logging */ - private static Log log = LogFactory.getLog(TurbineServletService.class); + private static final Logger log = LogManager.getLogger(TurbineServletService.class); /** The servlet context for this servlet */ private ServletContext servletContext = null; @@ -91,6 +91,7 @@ public class TurbineServletService * @return an URL object or null is the uri is malformed or * can't be resolved */ + @Override public URL getResource(String uri) { if (servletContext == null) @@ -128,6 +129,7 @@ public class TurbineServletService * @param uri the URI to resolve * @return an InputStream on the URI content or null */ + @Override public InputStream getResourceAsStream(String uri) { if (servletContext == null) @@ -148,6 +150,7 @@ public class TurbineServletService * @param uri the URI to resolve * @return the full system path of this URI */ + @Override public String getRealPath(String uri) { if (getServletContext() == null || uri == null) @@ -166,6 +169,7 @@ public class TurbineServletService * * @return turbine servlet config */ + @Override public ServletConfig getServletConfig() { return servletConfig; @@ -177,6 +181,7 @@ public class TurbineServletService * * @return turbine servlet context */ + @Override public ServletContext getServletContext() { return servletContext; @@ -189,6 +194,7 @@ public class TurbineServletService * * @return String */ + @Override public String getServerScheme() { return Turbine.getServerScheme(); @@ -201,6 +207,7 @@ public class TurbineServletService * * @return String */ + @Override public String getServerName() { return Turbine.getServerName(); @@ -213,6 +220,7 @@ public class TurbineServletService * * @return String */ + @Override public String getServerPort() { return Turbine.getServerPort(); @@ -224,6 +232,7 @@ public class TurbineServletService * * @return String */ + @Override public String getContextPath() { return Turbine.getContextPath(); Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Sun Mar 3 10:36:42 2019 @@ -27,11 +27,11 @@ import java.util.concurrent.ConcurrentMa import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.factory.FactoryException; import org.apache.fulcrum.factory.FactoryService; import org.apache.fulcrum.parser.ParameterParser; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.TurbineConstants; import org.apache.turbine.modules.Assembler; @@ -182,7 +182,7 @@ public class TurbineTemplateService implements TemplateService { /** Logging */ - private static Log log = LogFactory.getLog(TurbineTemplateService.class); + private static final Logger log = LogManager.getLogger(TurbineTemplateService.class); /** Represents Page Objects */ public static final int PAGE_KEY = 0; @@ -289,9 +289,9 @@ public class TurbineTemplateService useCache = Turbine.getConfiguration().getBoolean(TurbineConstants.MODULE_CACHE_KEY, TurbineConstants.MODULE_CACHE_DEFAULT); - log.debug("Default Extension: " + defaultExtension); - log.debug("Default Template: " + defaultTemplate); - log.debug("Use Caching: " + useCache); + log.debug("Default Extension: {}", defaultExtension); + log.debug("Default Template: {}", defaultTemplate); + log.debug("Use Caching: {}", Boolean.valueOf(useCache)); templateEngineRegistry = new ConcurrentHashMap<String, TemplateEngineService>(); @@ -788,7 +788,7 @@ public class TurbineTemplateService String mapperClass = conf.getString(mapperProperty.toString(), mapperClasses[i]); - log.info("Using " + mapperClass + " to map " + mapperNames[i] + " elements"); + log.info("Using {} to map {} elements", mapperClass, mapperNames[i]); Mapper tm = null; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java Sun Mar 3 10:36:42 2019 @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.modules.Assembler; import org.apache.turbine.modules.Loader; import org.apache.turbine.services.template.TemplateService; @@ -60,7 +60,7 @@ public class ClassMapper private Loader<? extends Assembler> loader = null; /** Logging */ - private static Log log = LogFactory.getLog(ClassMapper.class); + private static final Logger log = LogManager.getLogger(ClassMapper.class); /** * Default C'tor. If you use this C'tor, you must use @@ -88,7 +88,7 @@ public class ClassMapper public void setLoader(Loader<? extends Assembler> loader) { this.loader = loader; - log.debug("Loader is " + this.loader); + log.debug("Loader is {}", this.loader); } /** @@ -101,7 +101,7 @@ public class ClassMapper @Override public String doMapping(String template) { - log.debug("doMapping(" + template + ")"); + log.debug("doMapping({})", template); // Copy our elements into an array List<String> components @@ -115,7 +115,7 @@ public class ClassMapper String className = components.get(componentSize); components.remove(componentSize--); - log.debug("className is " + className); + log.debug("className is {}", className); // Strip off a possible Extension int dotIndex = className.lastIndexOf(TemplateService.EXTENSION_SEPARATOR); @@ -131,7 +131,7 @@ public class ClassMapper String pkg = StringUtils.join(components.iterator(), String.valueOf(separator)); StringBuilder testName = new StringBuilder(); - log.debug("classPackage is now: " + pkg); + log.debug("classPackage is now: {}", pkg); if (!components.isEmpty()) { @@ -143,16 +143,16 @@ public class ClassMapper ? className : TemplateService.DEFAULT_NAME); - log.debug("Looking for " + testName); + log.debug("Looking for {}", testName); try { loader.getAssembler(testName.toString()); - log.debug("Found it, returning " + testName); + log.debug("Found it, returning {}", testName); return testName.toString(); } catch (TurbineException e) { - log.error("Turbine Exception Class mapping ",e); + log.error("Turbine Exception Class mapping", e); } catch (Exception e) { Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java Sun Mar 3 10:36:42 2019 @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateEngineService; import org.apache.turbine.services.template.TemplateService; @@ -52,7 +52,7 @@ public class LayoutTemplateMapper implements Mapper { /** Logging */ - private static Log log = LogFactory.getLog(LayoutTemplateMapper.class); + private static final Logger log = LogManager.getLogger(LayoutTemplateMapper.class); /** * Default C'tor. If you use this C'tor, you must use @@ -74,7 +74,7 @@ public class LayoutTemplateMapper @Override public String doMapping(String template) { - log.debug("doMapping(" + template + ")"); + log.debug("doMapping({})", template); // Copy our elements into an array List<String> components = new ArrayList<String>(Arrays.asList(StringUtils.split( @@ -87,7 +87,7 @@ public class LayoutTemplateMapper String templateName = components.get(componentSize); components.remove(componentSize--); - log.debug("templateName is " + templateName); + log.debug("templateName is {}", templateName); // Last element decides, which template Service to use... TemplateService templateService = (TemplateService)TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME); @@ -110,7 +110,7 @@ public class LayoutTemplateMapper { String templatePackage = StringUtils.join(components.iterator(), String.valueOf(separator)); - log.debug("templatePackage is now: " + templatePackage); + log.debug("templatePackage is now: {}", templatePackage); StringBuilder testName = new StringBuilder(); @@ -133,11 +133,11 @@ public class LayoutTemplateMapper } templatePath.append(testName); - log.debug("Looking for " + templatePath); + log.debug("Looking for {}", templatePath); if (tes.templateExists(templatePath.toString())) { - log.debug("Found it, returning " + testName); + log.debug("Found it, returning {}", testName); return testName.toString(); } Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java?rev=1854688&r1=1854687&r2=1854688&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java Sun Mar 3 10:36:42 2019 @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateEngineService; import org.apache.turbine.services.template.TemplateService; @@ -48,7 +48,7 @@ public class ScreenDefaultTemplateMapper implements Mapper { /** Logging */ - private static Log log = LogFactory.getLog(ScreenDefaultTemplateMapper.class); + private static final Logger log = LogManager.getLogger(ScreenDefaultTemplateMapper.class); /** * Default C'tor. If you use this C'tor, you must use @@ -70,7 +70,7 @@ public class ScreenDefaultTemplateMapper @Override public String doMapping(String template) { - log.debug("doMapping(" + template + ")"); + log.debug("doMapping({})", template); // Copy our elements into an array List<String> components = new ArrayList<String>(Arrays.asList(StringUtils.split( @@ -83,7 +83,7 @@ public class ScreenDefaultTemplateMapper String templateName = components.get(componentSize); components.remove(componentSize--); - log.debug("templateName is " + templateName); + log.debug("templateName is {}", templateName); // Last element decides, which template Service to use... TemplateService templateService = (TemplateService)TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME); @@ -105,7 +105,7 @@ public class ScreenDefaultTemplateMapper { String templatePackage = StringUtils.join(components.iterator(), String.valueOf(separator)); - log.debug("templatePackage is now: " + templatePackage); + log.debug("templatePackage is now: {}", templatePackage); StringBuilder testName = new StringBuilder(); @@ -128,11 +128,11 @@ public class ScreenDefaultTemplateMapper } templatePath.append(testName); - log.debug("Looking for " + templatePath); + log.debug("Looking for {}", templatePath); if (tes.templateExists(templatePath.toString())) { - log.debug("Found it, returning " + testName); + log.debug("Found it, returning {}", testName); return testName.toString(); }
