migrate mongeez from log4j to slf4j

mongeez · Jan 27, 2013 · 01128b8 · 01128b8
1 parent 8c5d583
commit 01128b8
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 40 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -35,11 +35,19 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
+
+        <!-- logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		<!-- /logging -->
 
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/pom.xml b/pom.xml
@@ -79,12 +79,26 @@
             <version>3.1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <scope>provided</scope>
-        </dependency>
+
+        <!-- logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- /logging -->
 
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/src/main/java/org/mongeez/ChangeSetExecutor.java b/src/main/java/org/mongeez/ChangeSetExecutor.java
@@ -12,17 +12,19 @@
 
 package org.mongeez;
 
-import com.mongodb.Mongo;
-import org.apache.log4j.Logger;
 import org.mongeez.commands.ChangeSet;
 import org.mongeez.commands.Script;
 import org.mongeez.dao.MongeezDao;
 
+import com.mongodb.Mongo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.List;
 
 
 public class ChangeSetExecutor {
-    private final Logger logger = Logger.getLogger(ChangeSetExecutor.class);
+    private final Logger logger = LoggerFactory.getLogger(ChangeSetExecutor.class);
 
     private MongeezDao dao = null;
 

diff --git a/src/main/java/org/mongeez/Mongeez.java b/src/main/java/org/mongeez/Mongeez.java
@@ -12,30 +12,29 @@
 
 package org.mongeez;
 
-import com.mongodb.Mongo;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.mongeez.commands.ChangeSet;
 import org.mongeez.commands.Script;
 import org.mongeez.reader.ChangeSetFileProvider;
 import org.mongeez.reader.ChangeSetReaderFactory;
 import org.mongeez.reader.FilesetXMLChangeSetFileProvider;
+
+import com.mongodb.Mongo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 public class Mongeez {
-    private final static Logger logger = Logger.getLogger(Mongeez.class);
+    private final static Logger logger = LoggerFactory.getLogger(Mongeez.class);
 
     private Mongo mongo = null;
     private String dbName;
     private MongoAuth auth = null;
     private ChangeSetFileProvider changeSetFileProvider;
 
-    private boolean isVerbose = false;
-
     public void process() {
         List<ChangeSet> changeSets = getChangeSets();
         new ChangeSetExecutor(mongo, dbName, auth).execute(changeSets);
@@ -54,7 +53,7 @@ private List<ChangeSet> getChangeSets() {
     }
 
     private void logChangeSets(List<ChangeSet> changeSets) {
-        if (isVerbose) {
+        if (logger.isTraceEnabled()) {
             for (ChangeSet changeSet : changeSets) {
                 logger.trace("Changeset");
                 logger.trace("id: " + changeSet.getChangeId());
@@ -90,10 +89,4 @@ public void setChangeSetFileProvider(ChangeSetFileProvider changeSetFileProvider
         this.changeSetFileProvider = changeSetFileProvider;
     }
 
-    public void setVerbose(boolean isVerbose) {
-        this.isVerbose = isVerbose;
-        if (isVerbose) {
-            logger.setLevel(Level.TRACE);
-        }
-    }
 }
diff --git a/src/main/java/org/mongeez/reader/FilesetXMLReader.java b/src/main/java/org/mongeez/reader/FilesetXMLReader.java
@@ -12,20 +12,21 @@
 
 package org.mongeez.reader;
 
-import org.apache.commons.digester3.Digester;
-import org.apache.log4j.Logger;
-import org.springframework.core.io.Resource;
-
 import org.mongeez.commands.ChangeFile;
 import org.mongeez.commands.ChangeFileSet;
 
+import org.apache.commons.digester3.Digester;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class FilesetXMLReader {
 
-    private static final Logger logger = Logger.getLogger(FilesetXMLReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(FilesetXMLReader.class);
 
     public List<Resource> getFiles(Resource file) {
         List<Resource> files = new ArrayList<Resource>();

diff --git a/src/main/java/org/mongeez/reader/FormattedJavascriptChangeSetReader.java b/src/main/java/org/mongeez/reader/FormattedJavascriptChangeSetReader.java
@@ -10,9 +10,11 @@
 
 package org.mongeez.reader;
 
-import org.apache.log4j.Logger;
 import org.mongeez.commands.ChangeSet;
 import org.mongeez.commands.Script;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 
 import java.io.BufferedReader;
@@ -38,7 +40,7 @@ public class FormattedJavascriptChangeSetReader implements ChangeSetReader {
             Pattern.compile(".*runAlways:(\\w+).*",
                     Pattern.CASE_INSENSITIVE);
 
-    private static final Logger logger = Logger.getLogger(FormattedJavascriptChangeSetReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(FormattedJavascriptChangeSetReader.class);
 
     private final Charset cs;
 

diff --git a/src/main/java/org/mongeez/reader/XmlChangeSetReader.java b/src/main/java/org/mongeez/reader/XmlChangeSetReader.java
@@ -12,20 +12,21 @@
 
 package org.mongeez.reader;
 
-import org.apache.commons.digester3.Digester;
-import org.apache.log4j.Logger;
-import org.springframework.core.io.Resource;
-
 import org.mongeez.commands.ChangeSet;
 import org.mongeez.commands.ChangeSetList;
 import org.mongeez.commands.Script;
 
+import org.apache.commons.digester3.Digester;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class XmlChangeSetReader implements ChangeSetReader {
-    private static final Logger logger = Logger.getLogger(XmlChangeSetReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(XmlChangeSetReader.class);
 
     private Digester digester;
 

diff --git a/src/test/java/org/mongeez/MongeezTest.java b/src/test/java/org/mongeez/MongeezTest.java
@@ -39,7 +39,6 @@ private Mongeez create(String path) {
         mongeez.setFile(new ClassPathResource(path));
         mongeez.setMongo(mongo);
         mongeez.setDbName(dbName);
-        mongeez.setVerbose(true);
         return mongeez;
     }
 

diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -0,0 +1,21 @@
+#
+# Copyright 2011 SecondMarket Labs, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+#
+
+log4j.rootLogger=info, stdout
+
+# Console output
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
+
+log4j.logger.org.mongeez=info
+