From 084424778d6aad25704e30879b47860d0e1dd5ba Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Tue, 29 Mar 2011 11:26:46 -0500
Subject: [PATCH] Renamed log4j appender module

---
 .../README.md                                            | 0
 .../pom.xml                                              | 0
 .../data/document/mongodb/log4j/MongoLog4jAppender.java  | 9 +++++----
 .../data/document/mongodb/log4j/AppenderTest.java        | 0
 .../src/test/resources/log4j.properties                  | 1 +
 .../template.mf                                          | 0
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/README.md (100%)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/pom.xml (100%)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java (96%)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java (100%)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/src/test/resources/log4j.properties (93%)
 rename {spring-data-mongo-log4j => spring-data-mongodb-log4j}/template.mf (100%)

diff --git a/spring-data-mongo-log4j/README.md b/spring-data-mongodb-log4j/README.md
similarity index 100%
rename from spring-data-mongo-log4j/README.md
rename to spring-data-mongodb-log4j/README.md
diff --git a/spring-data-mongo-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml
similarity index 100%
rename from spring-data-mongo-log4j/pom.xml
rename to spring-data-mongodb-log4j/pom.xml
diff --git a/spring-data-mongo-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java
similarity index 96%
rename from spring-data-mongo-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java
rename to spring-data-mongodb-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java
index 74e69e338..183df1080 100644
--- a/spring-data-mongo-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java
+++ b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java
@@ -162,14 +162,15 @@ public class MongoLog4jAppender extends AppenderSkeleton {
     dbo.put(MESSAGE, event.getRenderedMessage());
 
     // Insert the document
+    String coll;
     if (null == collection) {
       // Use the category name
-      collection = event.getLogger().getName();
+      coll = event.getLogger().getName();
     } else {
       Calendar now = Calendar.getInstance();
-      collection = String.format(collection,
+      coll = String.format(collection,
           now.get(Calendar.YEAR),
-          now.get(Calendar.MONTH),
+          now.get(Calendar.MONTH + 1),
           now.get(Calendar.DAY_OF_MONTH),
           now.get(Calendar.HOUR_OF_DAY),
           event.getLevel().toString(),
@@ -182,7 +183,7 @@ public class MongoLog4jAppender extends AppenderSkeleton {
     } else {
       wc = infoOrLowerWriteConcern;
     }
-    db.getCollection(collection).insert(dbo, wc);
+    db.getCollection(coll).insert(dbo, wc);
   }
 
   public void close() {
diff --git a/spring-data-mongo-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java
similarity index 100%
rename from spring-data-mongo-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java
rename to spring-data-mongodb-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java
diff --git a/spring-data-mongo-log4j/src/test/resources/log4j.properties b/spring-data-mongodb-log4j/src/test/resources/log4j.properties
similarity index 93%
rename from spring-data-mongo-log4j/src/test/resources/log4j.properties
rename to spring-data-mongodb-log4j/src/test/resources/log4j.properties
index c82981c8e..c04114cbc 100644
--- a/spring-data-mongo-log4j/src/test/resources/log4j.properties
+++ b/spring-data-mongodb-log4j/src/test/resources/log4j.properties
@@ -6,6 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 log4j.appender.stdout.host = localhost
 log4j.appender.stdout.port = 27017
 log4j.appender.stdout.database = logs
+log4j.appender.stdout.collection = %1$4d%2$02d%3$02d
 log4j.appender.stdout.applicationId = my.application
 log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
 
diff --git a/spring-data-mongo-log4j/template.mf b/spring-data-mongodb-log4j/template.mf
similarity index 100%
rename from spring-data-mongo-log4j/template.mf
rename to spring-data-mongodb-log4j/template.mf