diff --git a/pom.xml b/pom.xml index 2926dbed7..1879f76fa 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ spring-data-document-parent spring-data-document-core + spring-data-mongo-log4j spring-data-mongodb spring-data-mongodb-cross-store spring-data-couchdb @@ -51,6 +52,17 @@ +1 + + jbrisbin + Jon Brisbin + jbrisbin at vmware.com + SpringSource + http://www.springsource.com + + Developer + + -6 + diff --git a/spring-data-log4j-appender/README.md b/spring-data-mongo-log4j/README.md similarity index 100% rename from spring-data-log4j-appender/README.md rename to spring-data-mongo-log4j/README.md diff --git a/spring-data-log4j-appender/pom.xml b/spring-data-mongo-log4j/pom.xml similarity index 67% rename from spring-data-log4j-appender/pom.xml rename to spring-data-mongo-log4j/pom.xml index d73e5e185..c292c67ac 100644 --- a/spring-data-log4j-appender/pom.xml +++ b/spring-data-mongo-log4j/pom.xml @@ -18,37 +18,6 @@ - - - org.springframework - spring-beans - - - org.springframework - spring-tx - - - org.springframework - spring-expression - - - org.springframework - spring-test - test - - - - - org.springframework.data - spring-data-document-core - ${project.version} - - - org.springframework.data - spring-data-commons-core - ${data.commons.version} - - org.mongodb @@ -57,20 +26,6 @@ - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - compile - - - org.slf4j - slf4j-log4j12 - runtime - log4j log4j @@ -115,14 +70,8 @@ test - - joda-time - joda-time - 1.6 - test - - + diff --git a/spring-data-log4j-appender/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java b/spring-data-mongo-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java similarity index 100% rename from spring-data-log4j-appender/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java rename to spring-data-mongo-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java diff --git a/spring-data-log4j-appender/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java b/spring-data-mongo-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java similarity index 100% rename from spring-data-log4j-appender/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java rename to spring-data-mongo-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java diff --git a/spring-data-log4j-appender/src/test/resources/log4j.properties b/spring-data-mongo-log4j/src/test/resources/log4j.properties similarity index 100% rename from spring-data-log4j-appender/src/test/resources/log4j.properties rename to spring-data-mongo-log4j/src/test/resources/log4j.properties diff --git a/spring-data-mongo-log4j/template.mf b/spring-data-mongo-log4j/template.mf new file mode 100644 index 000000000..322786505 --- /dev/null +++ b/spring-data-mongo-log4j/template.mf @@ -0,0 +1,10 @@ +Bundle-SymbolicName: org.springframework.data.mongodb.log4j +Bundle-Name: Spring Data Mongo DB Log4J Appender +Bundle-Vendor: SpringSource +Bundle-ManifestVersion: 2 +Import-Package: + sun.reflect;version="0";resolution:=optional +Import-Template: + com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}", + org.apache.log4j.*;version="[1.2.15, 2.0.0)", + org.apache.log4j.spi.*;version="[1.2.15, 2.0.0)"