Martin Peřina has uploaded a new change for review. Change subject: core: Replace log4j with slf4j in utils ......................................................................
core: Replace log4j with slf4j in utils Replaces log4j with slf4j in utils module. Change-Id: If5801464dec97cf7b2c71b40cd157bc2bcf18d43 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/utils/pom.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java D backend/manager/modules/utils/src/test/resources/log4j.xml 8 files changed, 36 insertions(+), 211 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/34181/1 diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index dd0d084..274e62b 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -101,12 +101,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> </dependency> @@ -133,12 +127,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> </dependency> <dependency> diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java index a4d8ac5..d3220f2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java @@ -14,8 +14,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.LocaleUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class serves locale dependent documents. It takes the current selected locale @@ -24,7 +25,7 @@ */ public class DocsServlet extends FileServlet { // The log: - private static final Logger log = Logger.getLogger(FileServlet.class); + private static final Logger log = LoggerFactory.getLogger(FileServlet.class); private static final long serialVersionUID = 3804716423059474163L; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java index 34ee0a5..1bf7aaf 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java @@ -10,8 +10,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.EngineLocalConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is a very simple servlet that receives a mime type and a file name as @@ -54,7 +55,7 @@ private static final long serialVersionUID = -1794616863361641804L; // The log: - private static final Logger log = Logger.getLogger(FileServlet.class); + private static final Logger log = LoggerFactory.getLogger(FileServlet.class); // The names of the parameters: private static final String CACHE = "cache"; @@ -129,7 +130,7 @@ // corresponding index page (if it exists): if (file != null && file.isDirectory()) { File index = new File(file, INDEX); - log.info("Index is \"" + index.getAbsolutePath() + "\"."); + log.info("Index is '{}'.", index.getAbsolutePath()); if (index.isFile()) { String redirect = null; if (path == null) { @@ -142,7 +143,8 @@ file = new File(file, INDEX); } else { - log.error("There is no index page for directory \"" + file.getAbsolutePath() + "\", will send a 404 error response."); + log.error("There is no index page for directory '{}', will send a 404 error response.", + file.getAbsolutePath()); file = null; } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java index 5e7ed0c..56de8d5 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java @@ -11,8 +11,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.EngineLocalConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This Servlet is used to forward requests from one context to another context. You can define the target context @@ -42,7 +43,7 @@ /** * The logger instance. */ - private static final Logger log = Logger.getLogger(ForwardServlet.class); + private static final Logger log = LoggerFactory.getLogger(ForwardServlet.class); /** * serialVersionUID. diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java index 319d95c..ac1d967 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java @@ -17,9 +17,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.LocaleUtils; import org.ovirt.engine.core.utils.ResourceUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This filter attempts to detect the locale of the user based on the following criteria. @@ -34,7 +35,7 @@ /** * The logger. */ - private static final Logger log = Logger.getLogger(LocaleFilter.class); + private static final Logger log = LoggerFactory.getLogger(LocaleFilter.class); /** * Constant for parameter and cookie name. @@ -108,8 +109,8 @@ locale = DEFAULT_LOCALE; } Locale resolvedLocale = lookupSupportedLocale(locale, getLocaleKeys()); - log.debug(String.format("Incoming locale: %s. Filter determined locale to be: %s", - locale.toLanguageTag(), resolvedLocale.toLanguageTag())); + log.debug("Incoming locale '{}'. Filter determined locale to be '{}'", + locale.toLanguageTag(), resolvedLocale.toLanguageTag()); return resolvedLocale; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java index 9b7decf..f167545 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java @@ -11,11 +11,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServletUtils { // The log: - private static final Logger log = Logger.getLogger(ServletUtils.class); + private static final Logger log = LoggerFactory.getLogger(ServletUtils.class); // Map of MIME types: private static MimetypesFileTypeMap mimeMap; @@ -90,8 +91,9 @@ // response if it doesn't: if (!canReadFile(file)) { if (required) { - log.error("Can't read file \"" + (file != null ? file.getAbsolutePath() : "") + "\" for request \"" - + request.getRequestURI() + "\", will send a 404 error response."); + log.error("Can't read file '{}' for request '{}', will send a 404 error response.", + file != null ? file.getAbsolutePath() : "", + request.getRequestURI()); } response.sendError(HttpServletResponse.SC_NOT_FOUND); } @@ -157,7 +159,7 @@ } } catch (IOException exception) { - final String message = "Error sending file \"" + file.getAbsolutePath() + "\"."; + final String message = "Error sending file '" + file.getAbsolutePath() + "'."; log.error(message, exception); throw new IOException(message, exception); } @@ -177,7 +179,10 @@ // Advice against large files: final long length = file.length(); if (length > LARGE) { - log.warn("File \"" + file.getAbsolutePath() + " is " + length + " bytes long. Please reconsider using this servlet for files larger than " + LARGE + " bytes."); + log.warn("File '{}' is {} bytes long. Please reconsider using this servlet for files larger than {} bytes.", + file.getAbsolutePath(), + length, + LARGE); } return length; } @@ -195,7 +200,9 @@ // Check that the path is not too long: final int length = path.length(); if (length > PATH_MAX) { - log.error("The path is " + length + " characters long, which is longer than the maximum allowed " + PATH_MAX + "."); + log.error("The path is {} characters long, which is longer than the maximum allowed {}.", + length, + PATH_MAX); return false; } @@ -226,7 +233,7 @@ file = base; } else if (!isSane(path)) { - log.error("The path \"" + path + "\" is not sane, will return null."); + log.error("The path '{}' is not sane, will return null.", path); } else { file = new File(base, path); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java index 6bf3bb5..92f7555 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java @@ -5,12 +5,13 @@ import java.util.List; import org.apache.commons.lang.LocaleUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UnsupportedLocaleHelper { - private static final Logger log = Logger.getLogger(UnsupportedLocaleHelper.class); + private static final Logger log = LoggerFactory.getLogger(UnsupportedLocaleHelper.class); public static List<String> getDisplayedLocales(List<String> allLocales) { return getDisplayedLocales(allLocales, getLocalesKeys(ConfigValues.UnsupportedLocalesFilterOverrides), @@ -63,7 +64,7 @@ result.add(underScoredLocaleKey); } catch (IllegalArgumentException iae) { //The locale passed in is not valid, don't add it to the list. - log.info("Invalid locale found in configuration: " + localeKey); //$NON-NLS-1$ + log.info("Invalid locale found in configuration '{}'", localeKey); //$NON-NLS-1$ } } } diff --git a/backend/manager/modules/utils/src/test/resources/log4j.xml b/backend/manager/modules/utils/src/test/resources/log4j.xml deleted file mode 100644 index c5c36d9..0000000 --- a/backend/manager/modules/utils/src/test/resources/log4j.xml +++ /dev/null @@ -1,176 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - <param name="Threshold" value="INFO"/> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <category name="org.apache"> - <priority value="INFO"/> - </category> - - <!-- Limit the jacorb category to WARN as its INFO is verbose --> - <category name="jacorb"> - <priority value="WARN"/> - </category> - - <!-- Set the logging level of the JSF implementation that uses - | java.util.logging. The jdk logging levels can be controlled - | through the org.jboss.logging.log4j.JDKLevel class that - | in addition to the standard log4j levels it adds support for - | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST - --> - <!-- Limit the org.jgroups category to WARN as its INFO is verbose --> - <category name="org.jgroups"> - <priority value="WARN"/> - </category> - - <!-- Limit the org.quartz category to INFO as its DEBUG is verbose --> - <category name="org.quartz"> - <priority value="INFO"/> - </category> - - <!-- Limit the com.sun category to INFO as its FINE is verbose --> - <category name="com.sun"> - <priority value="INFO"/> - </category> - - <!-- Limit the sun category to INFO as its FINE is verbose --> - <category name="sun"> - <priority value="INFO"/> - </category> - - <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose --> - <category name="javax.xml.bind"> - <priority value="INFO"/> - </category> - - <!-- Limit the verbose facelets compiler --> - <category name="facelets.compiler"> - <priority value="WARN"/> - </category> - - <!-- Limit the verbose ajax4jsf cache initialization --> - <category name="org.ajax4jsf.cache"> - <priority value="WARN"/> - </category> - - <!-- Limit the verbose embedded jopr categories --> - <category name="org.rhq"> - <priority value="WARN"/> - </category> - - <!-- Limit the verbose MC4J EMS (lib used by admin-console) categories --> - <category name="org.mc4j.ems"> - <priority value="WARN"/> - </category> - - <!-- Limit the org.springframework categories --> - <category name="org.springframework"> - <priority value="WARN"/> - </category> - - <!-- - | An example of enabling the custom TRACE level priority that is used - | by the JBoss internals to diagnose low level details. This example - | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its - | subpackages. This will produce A LOT of logging output. - | - | Note: since jboss AS 4.2.x, the trace level is supported natively by - | log4j, so although the custom org.jboss.logging.XLevel priority will - | still work, there is no need to use it. The two examples that follow - | will both enable trace logging. - <category name="org.jboss.system"> - <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> - <category name="org.jboss.ejb.plugins"> - <priority value="TRACE"/> - </category> - --> - - <!-- ======================= --> - <!-- REVM categories --> - <!-- ======================= --> - - <!--TOP configuration for all REVM categories --> - <category name="org.ovirt.engine" additivity="false"> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </category> - - <!--utils --> - <category name="org.ovirt.engine.utils"> - <priority value="INFO"/> - </category> - - <!--Common --> - <category name="org.ovirt.engine.common"> - <priority value="INFO"/> - </category> - - <!--Compact --> - <category name="org.ovirt.engine.compact"> - <priority value="INFO"/> - </category> - - <!--Encrypt utils--> - <category name="org.ovirt.engine.utils.crypt"> - <priority value="INFO"/> - </category> - - <!-- ======================= --> - <!-- Third party categories --> - <!-- ======================= --> - - <category name="org.apache.xmlrpc" additivity="false"> - <priority value="WARN"/> - <appender-ref ref="CONSOLE"/> - </category> - - <category name="org.apache.sshd" additivity="false"> - <priority value="WARN"/> - <appender-ref ref="CONSOLE"/> - </category> - - <category name="org.apache.commons.httpclient" additivity="false"> - <priority value="WARN" /> - <appender-ref ref="CONSOLE" /> - </category> - - <category name="org.springframework.ldap" additivity="false"> - <priority value="WARN" /> - <appender-ref ref="CONSOLE" /> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <!-- - Set the root logger priority via a system property. Note this is parsed by log4j, - so the full JBoss system property format is not supported; e.g. - setting a default via ${jboss.server.log.threshold:WARN} will not work. - --> - <priority value="${jboss.server.log.threshold}"/> - <appender-ref ref="CONSOLE"/> - </root> - - -</log4j:configuration> -- To view, visit http://gerrit.ovirt.org/34181 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5801464dec97cf7b2c71b40cd157bc2bcf18d43 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
