From f35871cf481d273b9de979a2034aa96458334b32 Mon Sep 17 00:00:00 2001
From: Rick Kellogg <rmkellogg@comcast.net>
Date: Fri, 5 Jun 2015 11:39:26 -0400
Subject: [PATCH] STORM-852 - Replaced Apache Log4j Logger with SLF4J API.

---
 .../security/serialization/BlowfishTupleSerializer.java   | 5 +++--
 storm-core/src/jvm/backtype/storm/utils/ShellProcess.java | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
index ae90f33125f..8e66cdf0e95 100644
--- a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
@@ -19,7 +19,8 @@
 
 import java.util.Map;
 import org.apache.commons.codec.binary.Hex;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
@@ -43,7 +44,7 @@ public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
      * You should use in via "storm -c topology.tuple.serializer.blowfish.key=YOURKEY -c topology.tuple.serializer=backtype.storm.security.serialization.BlowfishTupleSerializer jar ...".
      */
     public static String SECRET_KEY = "topology.tuple.serializer.blowfish.key";
-    private static final Logger LOG = Logger.getLogger(BlowfishTupleSerializer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BlowfishTupleSerializer.class);
     private BlowfishSerializer _serializer;
 
     public BlowfishTupleSerializer(Kryo kryo, Map storm_conf) {
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
index 811d5b96abe..82eabf18225 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
@@ -31,11 +31,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ShellProcess implements Serializable {
-    public static Logger LOG = Logger.getLogger(ShellProcess.class);
+    public static Logger LOG = LoggerFactory.getLogger(ShellProcess.class);
     public static Logger ShellLogger;
     private Process      _subprocess;
     private InputStream  processErrorStream;
@@ -52,7 +52,7 @@ public Number launch(Map conf, TopologyContext context) {
         ProcessBuilder builder = new ProcessBuilder(command);
         builder.directory(new File(context.getCodeDir()));
 
-        ShellLogger = Logger.getLogger(context.getThisComponentId());
+        ShellLogger = LoggerFactory.getLogger(context.getThisComponentId());
 
         this.componentName = context.getThisComponentId();
         this.serializer = getSerializer(conf);