From 0e7f6cec04dd77ba1ae91f43a35d3cf202aba796 Mon Sep 17 00:00:00 2001
From: coach88 <alexsemenyuk88@gmail.com>
Date: Wed, 29 Jul 2015 19:12:56 +0300
Subject: [PATCH] Added logging, fixed some dependencies in pom, deleted unused
 files.

---
 spring-data-mongodb/.classpath                |  1 +
 spring-data-mongodb/pom.xml                   | 64 +++++++++----------
 .../src/main/resources/logback.xml            | 20 ++++++
 .../mongoConfig.xml}                          |  4 +-
 .../src/main/webapp/WEB-INF/web.xml           | 26 --------
 ...ava => UserRepositoryIntegrationTest.java} |  4 +-
 6 files changed, 55 insertions(+), 64 deletions(-)
 create mode 100644 spring-data-mongodb/src/main/resources/logback.xml
 rename spring-data-mongodb/src/main/{webapp/WEB-INF/dispatcher-servlet.xml => resources/mongoConfig.xml} (87%)
 delete mode 100644 spring-data-mongodb/src/main/webapp/WEB-INF/web.xml
 rename spring-data-mongodb/src/test/java/org/baeldung/repository/{UserRepositoryTest.java => UserRepositoryIntegrationTest.java} (97%)

diff --git a/spring-data-mongodb/.classpath b/spring-data-mongodb/.classpath
index 83dd2f44a7..8df09bc858 100644
--- a/spring-data-mongodb/.classpath
+++ b/spring-data-mongodb/.classpath
@@ -12,6 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index b4abb56fd5..d04c717916 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -4,50 +4,28 @@
     <groupId>org.baeldung</groupId>
     <artifactId>spring-data-mongodb</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <name>spring-data-mongodb</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+        <org.springframework.data.version>1.7.1.RELEASE</org.springframework.data.version>
+        <org.springframework.version>4.1.7.RELEASE</org.springframework.version>
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.11</junit.version>
         <rest-assured.version>2.4.1</rest-assured.version>
+
+        <org.slf4j.version>1.7.12</org.slf4j.version>
+        <logback.version>1.1.3</logback.version>
     </properties>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-
+ 
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
-            <version>1.7.1.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
+            <version>${org.springframework.data.version}</version>
         </dependency>
 
         <dependency>
@@ -74,15 +52,33 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>3.2.0.RELEASE</version>
+            <version>${org.springframework.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
diff --git a/spring-data-mongodb/src/main/resources/logback.xml b/spring-data-mongodb/src/main/resources/logback.xml
new file mode 100644
index 0000000000..215eeede64
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/logback.xml
@@ -0,0 +1,20 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/spring-data-mongodb/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/spring-data-mongodb/src/main/resources/mongoConfig.xml
similarity index 87%
rename from spring-data-mongodb/src/main/webapp/WEB-INF/dispatcher-servlet.xml
rename to spring-data-mongodb/src/main/resources/mongoConfig.xml
index 1b118d18d4..e9523a2ca6 100644
--- a/spring-data-mongodb/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/spring-data-mongodb/src/main/resources/mongoConfig.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
        http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-	   http://www.springframework.org/schema/context 
-	   http://www.springframework.org/schema/context/spring-context-3.2.xsd"
+       http://www.springframework.org/schema/context 
+       http://www.springframework.org/schema/context/spring-context-3.2.xsd"
 >
 
     <context:component-scan base-package="org.baeldung"/>
diff --git a/spring-data-mongodb/src/main/webapp/WEB-INF/web.xml b/spring-data-mongodb/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 79550fcbab..0000000000
--- a/spring-data-mongodb/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-	     http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    version="2.5"
->
-
-    <servlet>
-        <servlet-name>dispatcher</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>dispatcher</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>/WEB-INF/dispatcher-servlet.xml</param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-
-</web-app>
\ No newline at end of file
diff --git a/spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryTest.java b/spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
similarity index 97%
rename from spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryTest.java
rename to spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
index cabfa09fc1..4d29befa88 100644
--- a/spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryTest.java
+++ b/spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
@@ -17,8 +17,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("file:src/main/webapp/WEB-INF/dispatcher-servlet.xml")
-public class UserRepositoryTest {
+@ContextConfiguration("file:src/main/resources/mongoConfig.xml")
+public class UserRepositoryIntegrationTest {
     @Autowired
     private UserRepository userRepository;