Skip to content

Commit 4051be2

Browse files
author
Eugen
committed
Merge pull request eugenp#227 from alex-semenyuk/master
Introduction to Spring Data Mongodb
2 parents 21b973d + 0e7f6ce commit 4051be2

File tree

6 files changed

+55
-64
lines changed

6 files changed

+55
-64
lines changed

‎spring-data-mongodb/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<attribute name="maven.pomderived" value="true"/>
1313
</attributes>
1414
</classpathentry>
15+
<classpathentry kind="src" path="src/main/resources"/>
1516
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>

‎spring-data-mongodb/pom.xml‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,28 @@
44
<groupId>org.baeldung</groupId>
55
<artifactId>spring-data-mongodb</artifactId>
66
<version>0.0.1-SNAPSHOT</version>
7-
<packaging>jar</packaging>
87

98
<name>spring-data-mongodb</name>
109

1110
<properties>
1211
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1312

14-
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
13+
<org.springframework.data.version>1.7.1.RELEASE</org.springframework.data.version>
14+
<org.springframework.version>4.1.7.RELEASE</org.springframework.version>
1515
<org.hamcrest.version>1.3</org.hamcrest.version>
1616
<junit.version>4.11</junit.version>
1717
<rest-assured.version>2.4.1</rest-assured.version>
18+
19+
<org.slf4j.version>1.7.12</org.slf4j.version>
20+
<logback.version>1.1.3</logback.version>
1821
</properties>
1922

2023
<dependencies>
21-
22-
<dependency>
23-
<groupId>org.springframework</groupId>
24-
<artifactId>spring-orm</artifactId>
25-
<version>${org.springframework.version}</version>
26-
</dependency>
27-
28-
<dependency>
29-
<groupId>org.springframework</groupId>
30-
<artifactId>spring-webmvc</artifactId>
31-
<version>${org.springframework.version}</version>
32-
</dependency>
33-
24+
3425
<dependency>
3526
<groupId>org.springframework.data</groupId>
3627
<artifactId>spring-data-mongodb</artifactId>
37-
<version>1.7.1.RELEASE</version>
38-
</dependency>
39-
40-
<dependency>
41-
<groupId>jstl</groupId>
42-
<artifactId>jstl</artifactId>
43-
<version>1.2</version>
44-
</dependency>
45-
46-
<dependency>
47-
<groupId>junit</groupId>
48-
<artifactId>junit</artifactId>
49-
<version>3.8.1</version>
50-
<scope>test</scope>
28+
<version>${org.springframework.data.version}</version>
5129
</dependency>
5230

5331
<dependency>
@@ -74,15 +52,33 @@
7452
<dependency>
7553
<groupId>org.springframework</groupId>
7654
<artifactId>spring-test</artifactId>
77-
<version>3.2.0.RELEASE</version>
55+
<version>${org.springframework.version}</version>
7856
</dependency>
7957

8058
<dependency>
81-
<groupId>javax.servlet</groupId>
82-
<artifactId>javax.servlet-api</artifactId>
83-
<version>3.0.1</version>
84-
<scope>provided</scope>
59+
<groupId>org.slf4j</groupId>
60+
<artifactId>slf4j-api</artifactId>
61+
<version>${org.slf4j.version}</version>
8562
</dependency>
63+
64+
<dependency>
65+
<groupId>ch.qos.logback</groupId>
66+
<artifactId>logback-classic</artifactId>
67+
<version>${logback.version}</version>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>org.slf4j</groupId>
72+
<artifactId>jcl-over-slf4j</artifactId>
73+
<version>${org.slf4j.version}</version>
74+
</dependency>
75+
76+
<dependency>
77+
<groupId>org.slf4j</groupId>
78+
<artifactId>log4j-over-slf4j</artifactId>
79+
<version>${org.slf4j.version}</version>
80+
</dependency>
81+
8682
</dependencies>
8783
<build>
8884
<plugins>

‎spring-data-mongodb/src/main/resources/logback.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<configuration>
2+
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
15+
16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
19+
20+
</configuration>

spring-data-mongodb/src/main/webapp/WEB-INF/dispatcher-servlet.xml renamed to spring-data-mongodb/src/main/resources/mongoConfig.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xsi:schemaLocation="
55
http://www.springframework.org/schema/beans
66
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
7-
http://www.springframework.org/schema/context
8-
http://www.springframework.org/schema/context/spring-context-3.2.xsd"
7+
http://www.springframework.org/schema/context
8+
http://www.springframework.org/schema/context/spring-context-3.2.xsd"
99
>
1010

1111
<context:component-scan base-package="org.baeldung"/>

‎spring-data-mongodb/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryTest.java renamed to spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1818

1919
@RunWith(SpringJUnit4ClassRunner.class)
20-
@ContextConfiguration("file:src/main/webapp/WEB-INF/dispatcher-servlet.xml")
21-
public class UserRepositoryTest {
20+
@ContextConfiguration("file:src/main/resources/mongoConfig.xml")
21+
public class UserRepositoryIntegrationTest {
2222
@Autowired
2323
private UserRepository userRepository;
2424

0 commit comments

Comments
 (0)