Martin Peřina has uploaded a new change for review. Change subject: core: Replace log4j with slf4j in docs ......................................................................
core: Replace log4j with slf4j in docs Replaces log4j with slf4j in docs module. Change-Id: I3b7ebf1740eb46aa6e03925ca3530ecf1296f5fe Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/docs/pom.xml M backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java M backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF 3 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/34178/1 diff --git a/backend/manager/modules/docs/pom.xml b/backend/manager/modules/docs/pom.xml index 7d35a8f..65c99f8 100644 --- a/backend/manager/modules/docs/pom.xml +++ b/backend/manager/modules/docs/pom.xml @@ -32,12 +32,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <scope>provided</scope> diff --git a/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java b/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java index 2a56f949..3523cf2 100644 --- a/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java +++ b/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java @@ -23,12 +23,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.node.ObjectNode; import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.servlet.ServletUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This servlet serves the help tag JSON files for easy consumption by GWT. It can merge @@ -36,7 +37,7 @@ */ public class HelpTagJsonServlet extends HttpServlet { private static final long serialVersionUID = -3938947636590096259L; - private static final Logger log = Logger.getLogger(HelpTagJsonServlet.class); + private static final Logger log = LoggerFactory.getLogger(HelpTagJsonServlet.class); private static final String CONFIG_FILE = "configFile"; //$NON-NLS-1$ @@ -69,7 +70,8 @@ properties = p.entrySet(); } catch (IOException e) { - log.error("problem parsing Properties file: " + configFile.getAbsolutePath(), e); //$NON-NLS-1$ + log.error("Problem parsing Properties file '{}'", configFile.getAbsolutePath()); //$NON-NLS-1$ + log.error("Exception", e); //$NON-NLS-1$ } } @@ -92,7 +94,8 @@ nodes.add(mapper.readTree(reader)); } catch (IOException e) { - log.error("problem parsing documentation mapping file: " + file.getAbsolutePath(), e); //$NON-NLS-1$ + log.error("Problem parsing documentation mapping file '{}'", file.getAbsolutePath()); //$NON-NLS-1$ + log.error("Exception", e); //$NON-NLS-1$ } } } diff --git a/backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF b/backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF index 6ac93cb..c20d3be 100644 --- a/backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF +++ b/backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Dependencies: org.apache.log4j \ No newline at end of file +Dependencies: org.slf4j -- To view, visit http://gerrit.ovirt.org/34178 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b7ebf1740eb46aa6e03925ca3530ecf1296f5fe 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
