DATAMONGO-729 - Release version 1.2.3.RELEASE.

DATAMONGO-729 - Prepare 1.2.3 release.
Upgraded to Spring Data Build 1.0.4.RELEASE, Spring Data Commons 1.5.2.RELEASE. Updated changelog, notice and readmes. Removed Snapshot repository in favor of the release one.
2013-07-24 06:32:22 -07:00 · 2013-07-24 12:40:47 +02:00 · 2013-07-23 16:33:39 +02:00 · 2013-07-19 06:37:58 -07:00 · 2013-07-19 06:37:54 -07:00 · 2013-07-19 15:21:57 +02:00
196 changed files with 4988 additions and 3817 deletions
--- a/README.md
+++ b/README.md
@@ -29,19 +29,13 @@ For those in a hurry:

 * Download the jar through Maven:

-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-mongodb</artifactId>
-        <version>1.0.0.BUILD-SNAPSHOT</version>
-      </dependency> 
-
-
-      <repository>
-        <id>spring-maven-snapshot</id>
-        <snapshots><enabled>true</enabled></snapshots>
-        <name>Springframework Maven SNAPSHOT Repository</name>
-        <url>http://maven.springframework.org/snapshot</url>
-      </repository> 
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>1.2.3.RELEASE</version>
+</dependency>
+```

 ### MongoTemplate
 MongoTemplate is the central support class for Mongo database operations.  It provides
@@ -54,93 +48,98 @@ Future plans are to support optional logging and/or exception throwing based on

 ### Easy Data Repository generation

-To simplify the creation of Data Repositories a generic Repository interface and default implementation is provided.  Furthermore, Spring will automatically create a Repository implementation for you that adds implementations of finder methods you specify on an interface.  
+To simplify the creation of data repositories a generic `Repository` interface and default implementation is provided.  Furthermore, Spring will automatically create a Repository implementation for you that adds implementations of finder methods you specify on an interface.  

 The Repository interface is

-        public interface Repository<T, ID extends Serializable> { 
+```java
+public interface Repository<T, ID extends Serializable> { 

-          T save(T entity);
+  T save(T entity);

-          List<T> save(Iterable<? extends T> entities);
+  List<T> save(Iterable<? extends T> entities);

-          T findById(ID id);
+  T findById(ID id);

-          boolean exists(ID id);
+  boolean exists(ID id);

-          List<T> findAll();
+  List<T> findAll();

-          Long count();
+  Long count();

-          void delete(T entity);
+  void delete(T entity);

-          void delete(Iterable<? extends T> entities);
+  void delete(Iterable<? extends T> entities);

-          void deleteAll();
-        }
+  void deleteAll();
+}
+```


-The MongoRepository extends Repository and will in future add more Mongo specific methods.
+The `MongoRepository` extends `Repository` and will in future add more Mongo specific methods.

-    public interface MongoRepository<T, ID extends Serializable> extends
-        Repository<T, ID> {
-    }
+```java
+public interface MongoRepository<T, ID extends Serializable> extends Repository<T, ID> {
+}
+```

-SimpleMongoRepository is the out of the box implementation of the MongoRepository you can use for basid CRUD operations.  
+`SimpleMongoRepository` is the out of the box implementation of the `MongoRepository` you can use for basid CRUD operations.  

-To go beyond basic CRUD, extend the MongoRepository interface and supply your own finder methods that follow simple naming conventions such that they can be easily converted into queries.  
+To go beyond basic CRUD, extend the `MongoRepository` interface and supply your own finder methods that follow simple naming conventions such that they can be easily converted into queries.  

-For example, given a Person class with first and last name properties, a PersonRepository interface that can query for Person by last name and when the first name matches a regular expression is shown below
+For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a regular expression is shown below

-    public interface PersonRepository extends MongoRepository<Person, Long> {
+```java
+public interface PersonRepository extends MongoRepository<Person, Long> {

-      List<Person> findByLastname(String lastname);
+  List<Person> findByLastname(String lastname);

-      List<Person> findByFirstnameLike(String firstname);
-    }
+  List<Person> findByFirstnameLike(String firstname);
+}
+```

-You can have Spring automatically generate the implemention as shown below
+You can have Spring automatically create a proxy for the interface as shown below:

-        <bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
-                <constructor-arg>
-                        <bean class="com.mongodb.Mongo">
-                                <constructor-arg value="localhost" />
-                                <constructor-arg value="27017" />
-                        </bean>
-                </constructor-arg>
-                <constructor-arg value="database" />
-                <property name="defaultCollectionName" value="springdata" />
-        </bean>
+```xml
+<bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
+        <constructor-arg>
+                <bean class="com.mongodb.Mongo">
+                        <constructor-arg value="localhost" />
+                        <constructor-arg value="27017" />
+                </bean>
+        </constructor-arg>
+        <constructor-arg value="database" />
+        <property name="defaultCollectionName" value="springdata" />
+</bean>

-        <bean class="org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean">
-                <property name="template" ref="template" />
-                <property name="repositoryInterface" value="org.springframework.data.document.mongodb.repository.PersonRepository" />
-        </bean>
+<mongo:repositories base-package="com.acme.repository" />
+```

-This will register an object in the container named PersonRepository.  You can use it as shown below
+This will find the repository interface and register a proxy object in the container.  You can use it as shown below:

-     @Service
-     public class MyService {
+``java
+@Service
+public class MyService {

-        @Autowired
-        PersonRepository repository;
+  @Autowired
+  private final PersonRepository repository;

+  public void doWork() {

-        public void doWork() {
+     repository.deleteAll();

-           repository.deleteAll();
+     Person person = new Person();
+     person.setFirstname("Oliver");
+     person.setLastname("Gierke");
+     person = repository.save(person);

-           Person person = new Person();
-           person.setFirstname("Oliver");
-           person.setLastname("Gierke");
-           person = repository.save(person);
+     List<Person> lastNameResults = repository.findByLastname("Gierke");

-           List<Person> lastNameResults = repository.findByLastname("Gierke");
+     List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");

-           List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
-
-       }
-    }
+ }
+}
+```


 Contributing to Spring Data
--- a/etc/formatting.xml
+++ b/etc/formatting.xml
@@ -73,7 +73,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
@@ -102,7 +102,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
@@ -124,7 +124,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
@@ -135,9 +135,9 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
@@ -150,12 +150,12 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
@@ -182,11 +182,11 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
@@ -237,7 +237,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
@@ -251,12 +251,12 @@
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
--- a/pom.xml
+++ b/pom.xml
@@ -1,297 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb-dist</artifactId>
-  <name>Spring Data MongoDB Distribution</name>
-  <description>Spring Data project for MongoDB</description>
-  <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.1.1.RELEASE</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>spring-data-mongodb</module>
-    <module>spring-data-mongodb-cross-store</module>
-    <module>spring-data-mongodb-log4j</module>
-    <module>spring-data-mongodb-parent</module>
-  </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-  <developers>
-    <developer>
-      <id>trisberg</id>
-      <name>Thomas Risberg</name>
-      <email>trisberg at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>mpollack</id>
-      <name>Mark Pollack</name>
-      <email>mpollack at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jbrisbin</id>
-      <name>Jon Brisbin</name>
-      <email>jbrisbin at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-  </developers>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-mongodb-parent</artifactId>
+	<version>1.2.3.RELEASE</version>
+	<packaging>pom</packaging>

-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        Copyright 2010 the original author or authors.
+	<name>Spring Data MongoDB</name>
+	<description>MongoDB support for Spring Data</description>
+	<url>http://www.springsource.org/spring-data/mongodb</url>

-        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
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.0.4.RELEASE</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+	</parent>
+	
+	<modules>
+		<module>spring-data-mongodb</module>
+		<module>spring-data-mongodb-cross-store</module>
+		<module>spring-data-mongodb-log4j</module>
+		<module>spring-data-mongodb-distribution</module>
+	</modules>

-        http://www.apache.org/licenses/LICENSE-2.0
+	<properties>
+		<project.type>multi</project.type>
+		<dist.id>spring-data-mongodb</dist.id>
+		<springdata.commons>1.5.2.RELEASE</springdata.commons>
+		<mongo>2.10.1</mongo>
+	</properties>
+	
+	<developers>
+		<developer>
+			<id>ogierke</id>
+			<name>Oliver Gierke</name>
+			<email>ogierke at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<roles>
+				<role>Project Lean</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>trisberg</id>
+			<name>Thomas Risberg</name>
+			<email>trisberg at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>mpollack</id>
+			<name>Mark Pollack</name>
+			<email>mpollack at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>jbrisbin</id>
+			<name>Jon Brisbin</name>
+			<email>jbrisbin at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-6</timezone>
+		</developer>
+	</developers>

-        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.
-      </comments>
-    </license>
-  </licenses>
+	<dependencies>
+		<!-- MongoDB -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo}</version>
+		</dependency>
+	</dependencies>

-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- dist.* properties are used by the antrun tasks below -->
-    <dist.id>spring-data-mongo</dist.id>
-    <dist.name>Spring Data Mongo</dist.name>
-    <dist.key>SDMONGO</dist.key>
-    <dist.version>${project.version}</dist.version>
-    <dist.releaseType>snapshot</dist.releaseType>
-    <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
-    <dist.fileName>${dist.finalName}.zip</dist.fileName>
-    <dist.filePath>target/${dist.fileName}</dist.filePath>
-    <dist.bucketName>dist.springframework.org</dist.bucketName>
-    <!-- these properties should be in ~/.m2/settings.xml
-      <dist.accessKey>s3 access key</dist.accessKey>
-      <dist.secretKey>s3 secret key</dist.secretKey>
-      -->
-  </properties>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>3.1.0.RELEASE</version>
-      </extension>
-    </extensions>
-
-    <plugins>
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-	<!-- yes it really needs to be this (2.0.7) otherwise pdf generation from a clean build doesn't work -->
-        <version>2.0.7</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-html</goal>
-              <goal>generate-pdf</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <includes>index.xml</includes>
-          <xincludeSupported>true</xincludeSupported>
-          <foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-          <htmlStylesheet>css/html.css</htmlStylesheet>
-          <chunkedOutput>false</chunkedOutput>
-          <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-          <useExtensions>1</useExtensions>
-          <highlightSource>1</highlightSource>
-          <highlightDefaultLanguage />
-          <!-- callouts -->
-          <entities>
-            <entity>
-              <name>version</name>
-              <value>${project.version}</value>
-            </entity>
-          </entities>
-          <postProcess>
-            <copy todir="${project.basedir}/target/site/reference">
-              <fileset dir="${project.basedir}/target/docbkx">
-                <include name="**/*.html" />
-                <include name="**/*.pdf" />
-              </fileset>
-            </copy>
-            <copy todir="${project.basedir}/target/site/reference/html">
-              <fileset dir="${project.basedir}/src/docbkx/resources">
-                <include name="**/*.css" />
-                <include name="**/*.png" />
-                <include name="**/*.gif" />
-                <include name="**/*.jpg" />
-              </fileset>
-            </copy>
-            <copy todir="${project.basedir}/target/site/reference/html">
-              <fileset dir="${project.basedir}/src/docbkx/resources/images">
-                <include name="*.png" />
-              </fileset>
-            </copy>
-            <move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf" failonerror="false" />
-          </postProcess>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <breakiterator>true</breakiterator>
-          <header>Spring Data Document</header>
-          <source>1.5</source>
-          <quiet>true</quiet>
-          <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-          <overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-          <stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-          <!-- copies doc-files subdirectory which contains image resources -->
-          <docfilessubdirs>true</docfilessubdirs>
-          <links>
-            <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
-            <link>http://api.mongodb.org/java/2.3</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin><!--
-				run `mvn package assembly:assembly` to trigger assembly creation.
-				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <id>distribution</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>false</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <id>upload-dist</id>
-            <phase>deploy</phase>
-            <configuration>
-              <tasks>
-                <ant antfile="${basedir}/src/ant/upload-dist.xml">
-                  <target name="upload-dist" />
-                </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.springframework.build</groupId>
-            <artifactId>org.springframework.build.aws.ant</artifactId>
-            <version>3.0.5.RELEASE</version>
-          </dependency>
-          <dependency>
-            <groupId>net.java.dev.jets3t</groupId>
-            <artifactId>jets3t</artifactId>
-            <version>0.7.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-    <!-- the name of this project is 'spring-data-mongo-dist';
-         make sure the zip file is just 'spring-data-mongo'. -->
-    <finalName>${dist.finalName}</finalName>
-  </build>
-
-  <pluginRepositories>
-    <!-- Necessary for the build extension -->
-    <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-release</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <scm>
-    <url>https://github.com/SpringSource/spring-data-mongodb</url>
-  </scm>
+	<repositories>
+		<repository>
+			<id>spring-libs-release</id>
+			<url>http://repo.springsource.org/libs-release</url>
+		</repository>
+	</repositories>

 </project>
--- a/spring-data-mongodb-cross-store/pom.xml
+++ b/spring-data-mongodb-cross-store/pom.xml
@@ -1,139 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.1.RELEASE</version>
-    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-cross-store</artifactId>
-  <name>Spring Data MongoDB Cross-store Persistence Support</name>
-  <dependencies>

-    <!--  Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aspects</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.2.3.RELEASE</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>spring-data-mongodb-cross-store</artifactId>
+	<name>Spring Data MongoDB - Cross-Store Persistence Support</name>
+	
+	<properties>
+		<jpa>1.0.0.Final</jpa>
+		<hibernate>3.6.10.Final</hibernate>
+	</properties>
+	
+	<dependencies>

-    <!--  Spring Data -->
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-commons-core</artifactId>
-      <version>${data.commons.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-mongodb</artifactId>
-      <version>1.1.1.RELEASE</version>
-    </dependency>
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${spring}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${spring}</version>
+		</dependency>

-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>${aspectj.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.2</version>
-    </dependency>
+		<!-- Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>1.2.3.RELEASE</version>
+		</dependency>

-    <!-- JPA -->
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-    </dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj}</version>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2</version>
+		</dependency>

-  <!-- For Tests -->
-    <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-entitymanager</artifactId>
-        <version>3.5.5-Final</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>1.8.0.10</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.0.0.GA</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-validator</artifactId>
-        <version>4.0.2.GA</version>
-        <scope>test</scope>
-    </dependency>
+		<!-- JPA -->
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<version>${jpa}</version>
+		</dependency>

-  </dependencies>
+		<!-- For Tests -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>${hibernate}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.10</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.0.2.GA</version>
+			<scope>test</scope>
+		</dependency>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.2</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outxml>true</outxml>
-          <aspectLibraries>
-            <aspectLibrary>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-aspects</artifactId>
-            </aspectLibrary>
-            <!-- <aspectLibrary>
-              <groupId>org.springframework.data</groupId>
-              <artifactId>spring-data-commons-aspects</artifactId>
-            </aspectLibrary> -->
-          </aspectLibraries>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+				<version>1.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjrt</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjtools</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outxml>true</outxml>
+					<aspectLibraries>
+						<aspectLibrary>
+							<groupId>org.springframework</groupId>
+							<artifactId>spring-aspects</artifactId>
+						</aspectLibrary>
+					</aspectLibraries>
+					<source>${source.level}</source>
+					<target>${source.level}</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>

 </project>
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ package org.springframework.data.mongodb.crossstore;

 import javax.persistence.EntityManagerFactory;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -34,6 +34,10 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.MongoException;

+/**
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {

 	private static final String ENTITY_CLASS = "_entity_class";
@@ -44,7 +48,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {

 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";

-	protected final Log log = LogFactory.getLog(getClass());
+	protected final Logger log = LoggerFactory.getLogger(getClass());

 	private MongoTemplate mongoTemplate;

@@ -58,6 +62,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		this.entityManagerFactory = entityManagerFactory;
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentState(java.lang.Class, java.lang.Object, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass, Object id, final ChangeSet changeSet)
 			throws DataAccessException, NotFoundException {

@@ -100,6 +108,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		});
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
 		log.debug("getPersistentId called on " + entity);
 		if (entityManagerFactory == null) {
@@ -109,6 +121,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		return o;
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#persistState(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
 		if (cs == null) {
 			log.debug("Flush: changeset was null, nothing to flush.");
@@ -169,8 +185,13 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		return 0L;
 	}

+	/**
+	 * Returns the collection the given entity type shall be persisted to.
+	 * 
+	 * @param entityClass must not be {@literal null}.
+	 * @return
+	 */
 	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
-		return ClassUtils.getQualifiedName(entityClass);
+		return mongoTemplate.getCollectionName(entityClass);
 	}
-
 }
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
@@ -21,13 +21,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.Transient;
 import javax.persistence.Entity;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-
 import org.springframework.data.mongodb.crossstore.RelatedDocument;
 import org.springframework.data.mongodb.crossstore.DocumentBacked;
 import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization;
@@ -44,7 +43,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 */
 public aspect MongoDocumentBacking {

-	private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class);

 	// Aspect shared config
 	private ChangeSetPersister<Object> changeSetPersister;
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for Spring Data's MongoDB cross store support.
+ */
+package org.springframework.data.mongodb.crossstore;
+
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@ package org.springframework.data.mongodb.crossstore;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;

+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +28,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.crossstore.test.Address;
 import org.springframework.data.mongodb.crossstore.test.Person;
 import org.springframework.data.mongodb.crossstore.test.Resume;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -35,55 +36,76 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;

-import com.mongodb.DBCollection;
 import com.mongodb.DBObject;

+/**
+ * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
+ * 
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
+@ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
 public class CrossStoreMongoTests {

 	@Autowired
-	private MongoTemplate mongoTemplate;
-
-	private EntityManager entityManager;
-
-	@Autowired
-	private PlatformTransactionManager transactionManager;
+	MongoTemplate mongoTemplate;

 	@PersistenceContext
-	public void setEntityManager(EntityManager entityManager) {
-		this.entityManager = entityManager;
+	EntityManager entityManager;
+
+	@Autowired
+	PlatformTransactionManager transactionManager;
+	TransactionTemplate txTemplate;
+
+	@Before
+	public void setUp() {
+
+		txTemplate = new TransactionTemplate(transactionManager);
+
+		clearData(Person.class);
+
+		Address address = new Address(12, "MAin St.", "Boston", "MA", "02101");
+
+		Resume resume = new Resume();
+		resume.addEducation("Skanstulls High School, 1975");
+		resume.addEducation("Univ. of Stockholm, 1980");
+		resume.addJob("DiMark, DBA, 1990-2000");
+		resume.addJob("VMware, Developer, 2007-");
+
+		final Person person = new Person("Thomas", 20);
+		person.setAddress(address);
+		person.setResume(resume);
+		person.setId(1L);
+
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.persist(person);
+				return null;
+			}
+		});
 	}

-	private void clearData(String collectionName) {
-		DBCollection col = this.mongoTemplate.getCollection(collectionName);
-		if (col != null) {
-			this.mongoTemplate.dropCollection(collectionName);
-		}
+	@After
+	public void tearDown() {
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.remove(entityManager.find(Person.class, 1L));
+				return null;
+			}
+		});
+	}
+
+	private void clearData(Class<?> domainType) {
+
+		String collectionName = mongoTemplate.getCollectionName(domainType);
+		mongoTemplate.dropCollection(collectionName);
 	}

 	@Test
 	@Transactional
-	@Rollback(false)
-	public void testCreateJpaToMongoEntityRelationship() {
-		clearData(Person.class.getName());
-		Person p = new Person("Thomas", 20);
-		Address a = new Address(12, "MAin St.", "Boston", "MA", "02101");
-		p.setAddress(a);
-		Resume r = new Resume();
-		r.addEducation("Skanstulls High School, 1975");
-		r.addEducation("Univ. of Stockholm, 1980");
-		r.addJob("DiMark, DBA, 1990-2000");
-		r.addJob("VMware, Developer, 2007-");
-		p.setResume(r);
-		p.setId(1L);
-		entityManager.persist(p);
-	}
-
-	@Test
-	@Transactional
-	@Rollback(false)
 	public void testReadJpaToMongoEntityRelationship() {
+
 		Person found = entityManager.find(Person.class, 1L);
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
@@ -91,15 +113,18 @@ public class CrossStoreMongoTests {
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found.getResume());
 		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
-		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
-		found.setAge(44);
 	}

 	@Test
 	@Transactional
-	@Rollback(false)
 	public void testUpdatedJpaToMongoEntityRelationship() {
+
 		Person found = entityManager.find(Person.class, 1L);
+		found.setAge(44);
+		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
+
+		entityManager.merge(found);
+
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found);
@@ -111,14 +136,19 @@ public class CrossStoreMongoTests {

 	@Test
 	public void testMergeJpaEntityWithMongoDocument() {
-		TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+
 		final Person detached = entityManager.find(Person.class, 1L);
+		entityManager.detach(detached);
 		detached.getResume().addJob("TargetRx, Developer, 2000-2005");
+
 		Person merged = txTemplate.execute(new TransactionCallback<Person>() {
 			public Person doInTransaction(TransactionStatus status) {
-				return entityManager.merge(detached);
+				Person result = entityManager.merge(detached);
+				entityManager.flush();
+				return result;
 			}
 		});
+
 		Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
 		Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
 		final Person updated = entityManager.find(Person.class, 1L);
@@ -127,7 +157,7 @@ public class CrossStoreMongoTests {

 	@Test
 	public void testRemoveJpaEntityWithMongoDocument() {
-		TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+
 		txTemplate.execute(new TransactionCallback<Person>() {
 			public Person doInTransaction(TransactionStatus status) {
 				Person p2 = new Person("Thomas", 20);
@@ -154,8 +184,10 @@ public class CrossStoreMongoTests {
 				return null;
 			}
 		});
+
 		boolean weFound3 = false;
-		for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) {
+
+		for (DBObject dbo : this.mongoTemplate.getCollection(mongoTemplate.getCollectionName(Person.class)).find()) {
 			Assert.assertTrue(!dbo.get("_entity_id").equals(2L));
 			if (dbo.get("_entity_id").equals(3L)) {
 				weFound3 = true;
--- a/spring-data-mongodb-cross-store/src/test/resources/log4j.properties
+++ b/spring-data-mongodb-cross-store/src/test/resources/log4j.properties
@@ -1,12 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-log4j.category.org.springframework=INFO
-log4j.category.org.springframework.data=TRACE
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG
--- a/spring-data-mongodb-cross-store/src/test/resources/logback.xml
+++ b/spring-data-mongodb-cross-store/src/test/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
--- a/spring-data-mongodb-cross-store/template.mf
+++ b/spring-data-mongodb-cross-store/template.mf
@@ -0,0 +1,18 @@
+Bundle-SymbolicName: org.springframework.data.mongodb.crossstore
+Bundle-Name: Spring Data MongoDB Cross Store Support
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package: 
+ sun.reflect;version="0";resolution:=optional
+Export-Template:
+ org.springframework.data.mongodb.crossstore.*;version="${project.version}"
+Import-Template: 
+ com.mongodb.*;version="0",
+ javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}",
+ org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
+ org.bson.*;version="0",
+ org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
+ org.w3c.dom.*;version="0"
--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	
+	<artifactId>spring-data-mongodb-distribution</artifactId>
+
+	<packaging>pom</packaging>
+
+	<name>Spring Data MongoDB - Distribution</name>
+	<description>Distribution build for Spring Data MongoDB</description>
+
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.2.3.RELEASE</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<properties>
+		<project.root>${basedir}/..</project.root>
+		<dist.key>SDMONGO</dist.key>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
--- a/spring-data-mongodb-log4j/README.md
+++ b/spring-data-mongodb-log4j/README.md
@@ -32,7 +32,7 @@ An example log entry might look like:
    {
      "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
      "applicationId" : "my.application",
-      "name" : "org.springframework.data.mongodb.log4j.AppenderTest",
+      "name" : "org.springframework.data.mongodb.log4j.MongoLog4jAppenderIntegrationTests",
      "level" : "DEBUG",
      "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
      "properties" : {
--- a/spring-data-mongodb-log4j/pom.xml
+++ b/spring-data-mongodb-log4j/pom.xml
@@ -1,40 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.1.RELEASE</version>
-    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-log4j</artifactId>
-  <name>Spring Data MongoDB Log4J Appender</name>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.2.3.RELEASE</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>

-  <dependencies>
+	<artifactId>spring-data-mongodb-log4j</artifactId>
+	<name>Spring Data MongoDB - Log4J Appender</name>

-    <!-- MongoDB -->
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>${mongo.version}</version>
-    </dependency>
+	<properties>
+		<log4j>1.2.16</log4j>
+	</properties>

-    <!-- Logging -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-    </dependency>
+	<dependencies>

-  </dependencies>
+		<!-- Logging -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j}</version>
+		</dependency>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+	</dependencies>

 </project>
--- a/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java
+++ b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2013 the original author or authors.
 *
 * 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
+ *      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,
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.log4j;

 import java.net.UnknownHostException;
@@ -21,188 +20,207 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Map;

-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.WriteConcern;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;
 import org.apache.log4j.MDC;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;

+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.WriteConcern;
+
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Log4j appender writing log entries into a MongoDB instance.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
 */
 public class MongoLog4jAppender extends AppenderSkeleton {

-  public static final String LEVEL = "level";
-  public static final String NAME = "name";
-  public static final String APP_ID = "applicationId";
-  public static final String TIMESTAMP = "timestamp";
-  public static final String PROPERTIES = "properties";
-  public static final String TRACEBACK = "traceback";
-  public static final String MESSAGE = "message";
-  public static final String YEAR = "year";
-  public static final String MONTH = "month";
-  public static final String DAY = "day";
-  public static final String HOUR = "hour";
+	public static final String LEVEL = "level";
+	public static final String NAME = "name";
+	public static final String APP_ID = "applicationId";
+	public static final String TIMESTAMP = "timestamp";
+	public static final String PROPERTIES = "properties";
+	public static final String TRACEBACK = "traceback";
+	public static final String MESSAGE = "message";
+	public static final String YEAR = "year";
+	public static final String MONTH = "month";
+	public static final String DAY = "day";
+	public static final String HOUR = "hour";

-  protected String host = "localhost";
-  protected int port = 27017;
-  protected String database = "logs";
-  protected String collectionPattern = "%c";
-  protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
-  protected String applicationId = System.getProperty("APPLICATION_ID", null);
-  protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
-  protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
-  protected Mongo mongo;
-  protected DB db;
+	protected String host = "localhost";
+	protected int port = 27017;
+	protected String database = "logs";
+	protected String collectionPattern = "%c";
+	protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
+	protected String applicationId = System.getProperty("APPLICATION_ID", null);
+	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
+	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
+	protected Mongo mongo;
+	protected DB db;

-  public MongoLog4jAppender() {
-  }
+	public MongoLog4jAppender() {
+	}

-  public MongoLog4jAppender(boolean isActive) {
-    super(isActive);
-  }
+	public MongoLog4jAppender(boolean isActive) {
+		super(isActive);
+	}

-  public String getHost() {
-    return host;
-  }
+	public String getHost() {
+		return host;
+	}

-  public void setHost(String host) {
-    this.host = host;
-  }
+	public void setHost(String host) {
+		this.host = host;
+	}

-  public int getPort() {
-    return port;
-  }
+	public int getPort() {
+		return port;
+	}

-  public void setPort(int port) {
-    this.port = port;
-  }
+	public void setPort(int port) {
+		this.port = port;
+	}

-  public String getDatabase() {
-    return database;
-  }
+	public String getDatabase() {
+		return database;
+	}

-  public void setDatabase(String database) {
-    this.database = database;
-  }
+	public void setDatabase(String database) {
+		this.database = database;
+	}

-  public String getCollectionPattern() {
-    return collectionPattern;
-  }
+	public String getCollectionPattern() {
+		return collectionPattern;
+	}

-  public void setCollectionPattern(String collectionPattern) {
-    this.collectionPattern = collectionPattern;
-    this.collectionLayout = new PatternLayout(collectionPattern);
-  }
+	public void setCollectionPattern(String collectionPattern) {
+		this.collectionPattern = collectionPattern;
+		this.collectionLayout = new PatternLayout(collectionPattern);
+	}

-  public String getApplicationId() {
-    return applicationId;
-  }
+	public String getApplicationId() {
+		return applicationId;
+	}

-  public void setApplicationId(String applicationId) {
-    this.applicationId = applicationId;
-  }
+	public void setApplicationId(String applicationId) {
+		this.applicationId = applicationId;
+	}

-  public void setWarnOrHigherWriteConcern(String wc) {
-    this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
-  }
+	public void setWarnOrHigherWriteConcern(String wc) {
+		this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
+	}

-  public String getWarnOrHigherWriteConcern() {
-    return warnOrHigherWriteConcern.toString();
-  }
+	public String getWarnOrHigherWriteConcern() {
+		return warnOrHigherWriteConcern.toString();
+	}

-  public String getInfoOrLowerWriteConcern() {
-    return infoOrLowerWriteConcern.toString();
-  }
+	public String getInfoOrLowerWriteConcern() {
+		return infoOrLowerWriteConcern.toString();
+	}

-  public void setInfoOrLowerWriteConcern(String wc) {
-    this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
-  }
+	public void setInfoOrLowerWriteConcern(String wc) {
+		this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
+	}

-  protected void connectToMongo() throws UnknownHostException {
-    this.mongo = new Mongo(host, port);
-    this.db = mongo.getDB(database);
-  }
+	protected void connectToMongo() throws UnknownHostException {
+		this.mongo = new Mongo(host, port);
+		this.db = mongo.getDB(database);
+	}

-  @SuppressWarnings({"unchecked"})
-  @Override
-  protected void append(final LoggingEvent event) {
-    if (null == db) {
-      try {
-        connectToMongo();
-      } catch (UnknownHostException e) {
-        throw new RuntimeException(e.getMessage(), e);
-      }
-    }
+	/*
+	 * (non-Javadoc)
+	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
+	 */
+	@Override
+	@SuppressWarnings({ "unchecked" })
+	protected void append(final LoggingEvent event) {
+		if (null == db) {
+			try {
+				connectToMongo();
+			} catch (UnknownHostException e) {
+				throw new RuntimeException(e.getMessage(), e);
+			}
+		}

-    BasicDBObject dbo = new BasicDBObject();
-    if (null != applicationId) {
-      dbo.put(APP_ID, applicationId);
-      MDC.put(APP_ID, applicationId);
-    }
-    dbo.put(NAME, event.getLogger().getName());
-    dbo.put(LEVEL, event.getLevel().toString());
-    Calendar tstamp = Calendar.getInstance();
-    tstamp.setTimeInMillis(event.getTimeStamp());
-    dbo.put(TIMESTAMP, tstamp.getTime());
+		BasicDBObject dbo = new BasicDBObject();
+		if (null != applicationId) {
+			dbo.put(APP_ID, applicationId);
+			MDC.put(APP_ID, applicationId);
+		}
+		dbo.put(NAME, event.getLogger().getName());
+		dbo.put(LEVEL, event.getLevel().toString());
+		Calendar tstamp = Calendar.getInstance();
+		tstamp.setTimeInMillis(event.getTimeStamp());
+		dbo.put(TIMESTAMP, tstamp.getTime());

-    // Copy properties into document
-    Map<Object, Object> props = event.getProperties();
-    if (null != props && props.size() > 0) {
-      BasicDBObject propsDbo = new BasicDBObject();
-      for (Map.Entry<Object, Object> entry : props.entrySet()) {
-        propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
-      }
-      dbo.put(PROPERTIES, propsDbo);
-    }
+		// Copy properties into document
+		Map<Object, Object> props = event.getProperties();
+		if (null != props && props.size() > 0) {
+			BasicDBObject propsDbo = new BasicDBObject();
+			for (Map.Entry<Object, Object> entry : props.entrySet()) {
+				propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
+			}
+			dbo.put(PROPERTIES, propsDbo);
+		}

-    // Copy traceback info (if there is any) into the document
-    String[] traceback = event.getThrowableStrRep();
-    if (null != traceback && traceback.length > 0) {
-      BasicDBList tbDbo = new BasicDBList();
-      tbDbo.addAll(Arrays.asList(traceback));
-      dbo.put(TRACEBACK, tbDbo);
-    }
+		// Copy traceback info (if there is any) into the document
+		String[] traceback = event.getThrowableStrRep();
+		if (null != traceback && traceback.length > 0) {
+			BasicDBList tbDbo = new BasicDBList();
+			tbDbo.addAll(Arrays.asList(traceback));
+			dbo.put(TRACEBACK, tbDbo);
+		}

-    // Put the rendered message into the document
-    dbo.put(MESSAGE, event.getRenderedMessage());
+		// Put the rendered message into the document
+		dbo.put(MESSAGE, event.getRenderedMessage());

-    // Insert the document
-    Calendar now = Calendar.getInstance();
-    MDC.put(YEAR, now.get(Calendar.YEAR));
-    MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
-    MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
-    MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));
+		// Insert the document
+		Calendar now = Calendar.getInstance();
+		MDC.put(YEAR, now.get(Calendar.YEAR));
+		MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
+		MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
+		MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));

-    String coll = collectionLayout.format(event);
+		String coll = collectionLayout.format(event);

-    MDC.remove(YEAR);
-    MDC.remove(MONTH);
-    MDC.remove(DAY);
-    MDC.remove(HOUR);
-    if (null != applicationId) {
-      MDC.remove(APP_ID);
-    }
+		MDC.remove(YEAR);
+		MDC.remove(MONTH);
+		MDC.remove(DAY);
+		MDC.remove(HOUR);
+		if (null != applicationId) {
+			MDC.remove(APP_ID);
+		}

-    WriteConcern wc;
-    if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
-      wc = warnOrHigherWriteConcern;
-    } else {
-      wc = infoOrLowerWriteConcern;
-    }
-    db.getCollection(coll).insert(dbo, wc);
-  }
+		WriteConcern wc;
+		if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
+			wc = warnOrHigherWriteConcern;
+		} else {
+			wc = infoOrLowerWriteConcern;
+		}
+		db.getCollection(coll).insert(dbo, wc);
+	}

-  public void close() {
-    mongo.close();
-  }
+	/*
+	 * (non-Javadoc)
+	 * @see org.apache.log4j.AppenderSkeleton#close()
+	 */
+	public void close() {

-  public boolean requiresLayout() {
-    return true;
-  }
+		if (mongo != null) {
+			mongo.close();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.apache.log4j.AppenderSkeleton#requiresLayout()
+	 */
+	public boolean requiresLayout() {
+		return true;
+	}
 }
--- a/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/package-info.java
+++ b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for to use MongoDB as a logging sink.
+ */
+package org.springframework.data.mongodb.log4j;
+
--- a/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java
+++ b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.
- */
-
-package org.springframework.data.mongodb.log4j;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.net.UnknownHostException;
-import java.util.Calendar;
-
-import com.mongodb.DB;
-import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class AppenderTest {
-
-  private static final String NAME = AppenderTest.class.getName();
-  private Logger log = Logger.getLogger(NAME);
-  private Mongo mongo;
-  private DB db;
-  private String collection;
-
-  @Before
-  public void setup() {
-    try {
-      mongo = new Mongo("localhost", 27017);
-      db = mongo.getDB("logs");
-      Calendar now = Calendar.getInstance();
-      collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-      db.getCollection(collection).drop();
-    } catch (UnknownHostException e) {
-      throw new RuntimeException(e.getMessage(), e);
-    }
-  }
-
-  @Test
-  public void testLogging() {
-    log.debug("DEBUG message");
-    log.info("INFO message");
-    log.warn("WARN message");
-    log.error("ERROR message");
-
-    DBCursor msgs = db.getCollection(collection).find();
-    assertThat(msgs.count(), is(4));
-
-  }
-
-  @Test
-  public void testProperties() {
-    MDC.put("property", "one");
-    log.debug("DEBUG message");
-  }
-
-}
--- a/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java
+++ b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011-2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.log4j;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Calendar;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.DB;
+import com.mongodb.DBCursor;
+import com.mongodb.Mongo;
+
+/**
+ * Integration tests for {@link MongoLog4jAppender}.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ */
+public class MongoLog4jAppenderIntegrationTests {
+
+	static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName();
+
+	Logger log = Logger.getLogger(NAME);
+	Mongo mongo;
+	DB db;
+	String collection;
+
+	@Before
+	public void setUp() throws Exception {
+
+		mongo = new Mongo("localhost", 27017);
+		db = mongo.getDB("logs");
+
+		Calendar now = Calendar.getInstance();
+		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
+		db.getCollection(collection).drop();
+	}
+
+	@Test
+	public void testLogging() {
+
+		log.debug("DEBUG message");
+		log.info("INFO message");
+		log.warn("WARN message");
+		log.error("ERROR message");
+
+		DBCursor msgs = db.getCollection(collection).find();
+
+		assertThat(msgs.count(), is(4));
+	}
+
+	@Test
+	public void testProperties() {
+
+		MDC.put("property", "one");
+		log.debug("DEBUG message");
+	}
+}
--- a/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderUnitTests.java
+++ b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderUnitTests.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.log4j;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link MongoLog4jAppender}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoLog4jAppenderUnitTests {
+
+	/**
+	 * @see DATAMONGO-641
+	 */
+	@Test
+	public void closesWithoutMongoInstancePresent() {
+		new MongoLog4jAppender().close();
+	}
+}
--- a/spring-data-mongodb-log4j/src/test/resources/log4j.properties
+++ b/spring-data-mongodb-log4j/src/test/resources/log4j.properties
@@ -10,11 +10,4 @@ log4j.appender.stdout.collectionPattern = %X{year}%X{month}
 log4j.appender.stdout.applicationId = my.application
 log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE

-log4j.category.org.apache.activemq=ERROR
-log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.data.document.mongodb=DEBUG
-log4j.category.org.springframework.transaction=INFO
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG
+log4j.category.org.springframework.data.mongodb=DEBUG
--- a/spring-data-mongodb-log4j/template.mf
+++ b/spring-data-mongodb-log4j/template.mf
@@ -5,6 +5,5 @@ 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)"
+ com.mongodb.*;version="${mongo:[=.=,+1.0.0)}",
+ org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb-parent</artifactId>
-  <name>Spring Data MongoDB Parent</name>
-  <description>Spring Data project for MongoDB</description>
-  <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.1.1.RELEASE</version>
-  <packaging>pom</packaging>
-  
-  <developers>
-    <developer>
-      <id>trisberg</id>
-      <name>Thomas Risberg</name>
-      <email>trisberg at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>mpollack</id>
-      <name>Mark Pollack</name>
-      <email>mpollack at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jbrisbin</id>
-      <name>Jon Brisbin</name>
-      <email>jbrisbin at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-  </developers>
-  
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        Copyright 2010 the original author or authors.
-
-        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.
-      </comments>
-    </license>
-  </licenses>
-  
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- versions for commonly-used dependencies -->
-    <mongo.version>2.9.1</mongo.version>
-    <junit.version>4.10</junit.version>
-    <log4j.version>1.2.16</log4j.version>
-    <org.mockito.version>1.9.0</org.mockito.version>
-    <org.slf4j.version>1.6.1</org.slf4j.version>
-    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
-    <org.springframework.version.range>3.1.2.RELEASE</org.springframework.version.range>
-    <data.commons.version>1.4.0.RELEASE</data.commons.version>
-    <aspectj.version>1.6.11.RELEASE</aspectj.version>
-    <bundlor.failOnWarnings>true</bundlor.failOnWarnings>
-  </properties>
- 
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/download/community
-    </downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
-  
-  <dependencies>
-
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${org.mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${org.springframework.version.range}</version>
-			<scope>test</scope>
-		</dependency>
-
-  </dependencies>
-
-  <build>
-    <extensions>
-      <extension>
-        <!--
-              available only in the springframework maven repository. see
-              <repositories> section below
-            -->
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>3.1.0.RELEASE</version>
-      </extension>
-    </extensions>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${project.basedir}/src/test/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <compilerArgument>-Xlint:-path</compilerArgument>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>false</showDeprecation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-           <useDefaultManifestFile>true</useDefaultManifestFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
-        <configuration>
-          <useFile>false</useFile>
-          <includes>
-            <include>**/*Tests.java</include>
-          </includes>
-          <excludes>
-          	<exclude>**/PerformanceTests.java</exclude>
-          </excludes>
-          <junitArtifactName>junit:junit-dep</junitArtifactName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!--
-                 configures the springsource bundlor plugin, which generates
-                 OSGI-compatible MANIFEST.MF files during the 'compile' phase of
-                 the maven build. this plugin is declared within the
-                 pluginManagement section because not every module that inherits
-                 from this pom needs bundlor's services, e.g.:
-                 spring-integration-samples and all its children. for this reason,
-                 all modules that wish to use bundlor must declare it explicitly.
-                 it is not necessary to specify the <version> or <configuration>
-                 sections, but groupId and artifactId are required. see
-                 http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-                 for more info
-               -->
-          <groupId>com.springsource.bundlor</groupId>
-          <artifactId>com.springsource.bundlor.maven</artifactId>
-          <version>1.0.0.RELEASE</version>
-          <configuration>
-            <failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
-          </configuration>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>querydsl</id>
-      <url>http://source.mysema.com/maven2/releases</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>spring-libs-release</id>
-      <url>http://repo.springsource.org/libs-release</url>
-    </repository>
-  </repositories>
-  <reporting>
-    <plugins>
-      <plugin>
-        <!--
-              significantly speeds up the 'Dependencies' report during site
-              creation see
-              http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
-            -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  <scm>
-    <url>https://github.com/SpringSource/spring-data-mongodb</url>
-  </scm>
-</project>
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -1,84 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+	
+	<artifactId>spring-data-mongodb</artifactId>
+
+	<name>Spring Data MongoDB - Core</name>
+	<description>MongoDB support for Spring Data</description>
+
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.1.1.RELEASE</version>
-		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+		<version>1.2.3.RELEASE</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-data-mongodb</artifactId>
-	<name>Spring Data MongoDB</name>

 	<properties>
-		<querydsl.version>2.8.0</querydsl.version>
-		<cdi.version>1.0</cdi.version>
-		<validation.version>1.0.0.GA</validation.version>
-		<webbeans.version>1.1.3</webbeans.version>
+		<validation>1.0.0.GA</validation>
 	</properties>

 	<dependencies>
-
+		
 		<!--  Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 			<exclusions>
 				<exclusion>
-          			<groupId>commons-logging</groupId>
-          			<artifactId>commons-logging</artifactId>
-        		</exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>

 		<!--  Spring Data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons-core</artifactId>
-			<version>${data.commons.version}</version>
-		</dependency>
-
-		<!-- MongoDB -->
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>${mongo.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-				</exclusion>
-			</exclusions>
+			<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
 		</dependency>

 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>

+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
@@ -90,7 +86,7 @@
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -98,14 +94,14 @@
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
-			<version>${webbeans.version}</version>
+			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -120,7 +116,7 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>${validation.version}</version>
+			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>

@@ -130,39 +126,18 @@
 			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
-
+		
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+			<scope>test</scope>
+		</dependency>
+		
 	</dependencies>
 	
-	<profiles>
-		<profile>
-			<id>performance-tests</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.8</version>
-						<configuration>
-							<includes>
-								<include>**/PerformanceTests.java</include>
-							</includes>
-							<excludes>
-								<exclude>none</exclude>
-							</excludes>
-							<junitArtifactName>junit:junit-dep</junitArtifactName>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>

 			<plugin>
 				<groupId>com.mysema.maven</groupId>
@@ -172,7 +147,7 @@
 					<dependency>
 						<groupId>com.mysema.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
-						<version>${querydsl.version}</version>
+						<version>${querydsl}</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -188,7 +163,25 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<useFile>false</useFile>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/PerformanceTests.java</exclude>
+					</excludes>
+					<systemPropertyVariables>
+						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-	
+
 </project>
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDataIntegrityViolationException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDataIntegrityViolationException.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.mongodb.core.MongoActionOperation;
+import org.springframework.util.Assert;
+
+import com.mongodb.WriteResult;
+
+/**
+ * Mongo-specific {@link DataIntegrityViolationException}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoDataIntegrityViolationException extends DataIntegrityViolationException {
+
+	private static final long serialVersionUID = -186980521176764046L;
+
+	private final WriteResult writeResult;
+	private final MongoActionOperation actionOperation;
+
+	/**
+	 * Creates a new {@link MongoDataIntegrityViolationException} using the given message and {@link WriteResult}.
+	 * 
+	 * @param message the exception message
+	 * @param writeResult the {@link WriteResult} that causes the exception, must not be {@literal null}.
+	 * @param actionOperation the {@link MongoActionOperation} that caused the exception, must not be {@literal null}.
+	 */
+	public MongoDataIntegrityViolationException(String message, WriteResult writeResult,
+			MongoActionOperation actionOperation) {
+
+		super(message);
+
+		Assert.notNull(writeResult, "WriteResult must not be null!");
+		Assert.notNull(actionOperation, "MongoActionOperation must not be null!");
+
+		this.writeResult = writeResult;
+		this.actionOperation = actionOperation;
+	}
+
+	/**
+	 * Returns the {@link WriteResult} that caused the exception.
+	 * 
+	 * @return the writeResult
+	 */
+	public WriteResult getWriteResult() {
+		return writeResult;
+	}
+
+	/**
+	 * Returns the {@link MongoActionOperation} in which the current exception occured.
+	 * 
+	 * @return the actionOperation
+	 */
+	public MongoActionOperation getActionOperation() {
+		return actionOperation;
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
@@ -27,12 +27,15 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.support.CachingIsNewStrategyFactory;
+import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

@@ -131,11 +134,21 @@ public abstract class AbstractMongoConfiguration {
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.initialize();

 		return mappingContext;
 	}

+	/**
+	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
+	 * 
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@Bean
+	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
+		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(mongoMappingContext()));
+	}
+
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
 	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
@@ -26,4 +26,6 @@ public abstract class BeanNames {
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
 	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
+	static final String IS_NEW_STRATEGY_FACTORY = "isNewStrategyFactory";
+	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.Set;

 import org.springframework.beans.BeanMetadataElement;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -38,6 +38,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.convert.converter.Converter;
@@ -49,6 +50,7 @@ import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
@@ -68,25 +70,28 @@ import org.w3c.dom.Element;
 * @author Oliver Gierke
 * @author Maciej Walkowiak
 */
-public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
+public class MappingMongoConverterParser implements BeanDefinitionParser {

 	private static final String BASE_PACKAGE = "base-package";
 	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());

-	@Override
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
-			throws BeanDefinitionStoreException {
-		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : "mappingConverter";
-	}
+	/* (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	public BeanDefinition parse(Element element, ParserContext parserContext) {

-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();

+		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		id = StringUtils.hasText(id) ? id : "mappingConverter";
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
+
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+
+		createIsNewStrategyFactoryBeanDefinition(ctxRef, parserContext, element);

 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
@@ -111,18 +116,24 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
-			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
+			indexHelperBuilder.addConstructorArgReference(ctxRef);
+			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
+			indexHelperBuilder.addDependsOn(ctxRef);
+
+			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
+					INDEX_HELPER));
 		}

 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);

 		if (validatingMongoEventListener != null) {
-			registry.registerBeanDefinition(VALIDATING_EVENT_LISTENER, validatingMongoEventListener);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
+					VALIDATING_EVENT_LISTENER));
 		}

-		return converterBuilder.getBeanDefinition();
+		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
+		parserContext.popAndRegisterContainingComponent();
+		return null;
 	}

 	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
@@ -136,7 +147,6 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			RuntimeBeanReference validator = getValidator(builder, parserContext);

 			if (validator != null) {
-
 				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
 				builder.addConstructorArgValue(validator);

@@ -158,13 +168,13 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		validatorDef.setSource(source);
 		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
-		parserContext.registerComponent(new BeanComponentDefinition(validatorDef, validatorName));
+		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));

 		return new RuntimeBeanReference(validatorName);
 	}

-	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
-			BeanDefinition conversionsDefinition) {
+	static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+			BeanDefinition conversionsDefinition, String converterId) {

 		String ctxRef = element.getAttribute("mapping-context-ref");

@@ -191,11 +201,9 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
 		}

-		parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
-		ctxRef = MAPPING_CONTEXT;
+		ctxRef = converterId + "." + MAPPING_CONTEXT;

 		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
-
 		return ctxRef;
 	}

@@ -233,7 +241,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
 			conversionsBean.setSource(parserContext.extractSource(element));

-			parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(conversionsBean, "customConversions"));

 			return conversionsBean;
 		}
@@ -241,7 +249,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		return null;
 	}

-	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
+	private static Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {

 		String basePackage = element.getAttribute(BASE_PACKAGE);

@@ -280,6 +288,19 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		return null;
 	}

+	public static String createIsNewStrategyFactoryBeanDefinition(String mappingContextRef, ParserContext context,
+			Element element) {
+
+		BeanDefinitionBuilder mappingContextStrategyFactoryBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
+		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
+
+		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
+		context.registerBeanComponent(builder.getComponent(mappingContextStrategyFactoryBuilder, IS_NEW_STRATEGY_FACTORY));
+
+		return IS_NEW_STRATEGY_FACTORY;
+	}
+
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
 	 * 
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to register a {@link AuditingEventListener} to transparently set auditing information on
+ * an entity.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element)
+	 */
+	@Override
+	protected Class<?> getBeanClass(Element element) {
+		return AuditingEventListener.class;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId()
+	 */
+	@Override
+	protected boolean shouldGenerateId() {
+		return true;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder)
+	 */
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+
+		BeanDefinitionRegistry registry = parserContext.getRegistry();
+
+		if (!registry.containsBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY)) {
+
+			String mappingContextName = BeanNames.MAPPING_CONTEXT;
+
+			if (!registry.containsBeanDefinition(BeanNames.MAPPING_CONTEXT)) {
+				mappingContextName = MappingMongoConverterParser.potentiallyCreateMappingContext(element, parserContext, null,
+						BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
+			}
+
+			MappingMongoConverterParser.createIsNewStrategyFactoryBeanDefinition(mappingContextName, parserContext, element);
+		}
+
+		BeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(BeanNames.IS_NEW_STRATEGY_FACTORY);
+		BeanDefinition handlerBeanDefinition = parser.parse(element, parserContext);
+
+		builder.addConstructorArgValue(handlerBeanDefinition);
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,17 +21,16 @@ import org.springframework.data.repository.config.RepositoryBeanDefinitionParser
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;

 /**
- * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
+ * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB configuration.
 * 
 * @author Oliver Gierke
 */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {

 	/*
-	* (non-Javadoc)
-	*
-	* @see org.springframework.beans.factory.xml.NamespaceHandler#init()
-	*/
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+	 */
 	public void init() {

 		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
@@ -42,5 +41,6 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());
+		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import com.mongodb.ServerAddress;
 * 
 * @author Mark Pollack
 * @author Oliver Gierke
+ * @author Thomas Darimont
 */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {

@@ -43,6 +44,11 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	@Override
 	public void setAsText(String replicaSetString) {

+		if (!StringUtils.hasText(replicaSetString)) {
+			setValue(null);
+			return;
+		}
+
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
 		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -13,59 +13,53 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core;

+import org.springframework.util.Assert;
+
 import com.mongodb.DBObject;
 import com.mongodb.WriteConcern;

 /**
 * Represents an action taken against the collection. Used by {@link WriteConcernResolver} to determine a custom
- * WriteConcern based on this information.
- * 
- * Properties that will always be not-null are collectionName and defaultWriteConcern. The EntityClass is null only for
- * the MongoActionOperaton.INSERT_LIST.
- * 
+ * {@link WriteConcern} based on this information.
 * <ul>
 * <li>INSERT, SAVE have null query</li>
 * <li>REMOVE has null document</li>
- * <li>INSERT_LIST has null entityClass, document, and query</li>
+ * <li>INSERT_LIST has null entityType, document, and query</li>
 * </ul>
 * 
 * @author Mark Pollack
- * 
+ * @author Oliver Gierke
 */
 public class MongoAction {

-	private String collectionName;
-
-	private WriteConcern defaultWriteConcern;
-
-	private Class<?> entityClass;
-
-	private MongoActionOperation mongoActionOperation;
-
-	private DBObject query;
-
-	private DBObject document;
+	private final String collectionName;
+	private final WriteConcern defaultWriteConcern;
+	private final Class<?> entityType;
+	private final MongoActionOperation mongoActionOperation;
+	private final DBObject query;
+	private final DBObject document;

 	/**
-	 * Create an instance of a MongoAction
+	 * Create an instance of a {@link MongoAction}.
 	 * 
-	 * @param defaultWriteConcern the default write concern
+	 * @param defaultWriteConcern the default write concern.
 	 * @param mongoActionOperation action being taken against the collection
-	 * @param collectionName the collection name
-	 * @param entityClass the POJO that is being operated against
+	 * @param collectionName the collection name, must not be {@literal null} or empty.
+	 * @param entityType the POJO that is being operated against
 	 * @param document the converted DBObject from the POJO or Spring Update object
 	 * @param query the converted DBOjbect from the Spring Query object
 	 */
 	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
-			String collectionName, Class<?> entityClass, DBObject document, DBObject query) {
-		super();
+			String collectionName, Class<?> entityType, DBObject document, DBObject query) {
+
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+
 		this.defaultWriteConcern = defaultWriteConcern;
 		this.mongoActionOperation = mongoActionOperation;
 		this.collectionName = collectionName;
-		this.entityClass = entityClass;
+		this.entityType = entityType;
 		this.query = query;
 		this.document = document;
 	}
@@ -78,8 +72,16 @@ public class MongoAction {
 		return defaultWriteConcern;
 	}

+	/**
+	 * @deprecated use {@link #getEntityType()} instead.
+	 */
+	@Deprecated
 	public Class<?> getEntityClass() {
-		return entityClass;
+		return entityType;
+	}
+
+	public Class<?> getEntityType() {
+		return entityType;
 	}

 	public MongoActionOperation getMongoActionOperation() {
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ package org.springframework.data.mongodb.core;
 * for a given mutating operation
 * 
 * @author Mark Pollack
+ * @author Oliver Gierke
 * @see MongoAction
- * 
 */
 public enum MongoActionOperation {

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java
@@ -104,15 +104,16 @@ public abstract class MongoDbUtils {
 		DB db = mongo.getDB(databaseName);
 		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();

-		if (credentialsGiven && !db.isAuthenticated()) {
+		synchronized (db) {

-			String username = credentials.getUsername();
-			String password = credentials.hasPassword() ? credentials.getPassword() : null;
+			if (credentialsGiven && !db.isAuthenticated()) {
+
+				String username = credentials.getUsername();
+				String password = credentials.hasPassword() ? credentials.getPassword() : null;

-			synchronized (db) {
 				if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
-					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
-							+ "], username = [" + username + "], password = [" + password + "]", databaseName, credentials);
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
+							+ credentials.toString(), databaseName, credentials);
 				}
 			}
 		}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,12 +15,6 @@
 */
 package org.springframework.data.mongodb.core;

-import com.mongodb.MongoException;
-import com.mongodb.MongoException.CursorNotFound;
-import com.mongodb.MongoException.DuplicateKey;
-import com.mongodb.MongoException.Network;
-import com.mongodb.MongoInternalException;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DuplicateKeyException;
@@ -29,21 +23,26 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;

+import com.mongodb.MongoException;
+import com.mongodb.MongoException.CursorNotFound;
+import com.mongodb.MongoException.DuplicateKey;
+import com.mongodb.MongoException.Network;
+import com.mongodb.MongoInternalException;
+
 /**
 * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
 * exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
 * appropriate: any other exception may have resulted from user code, and should not be translated.
 * 
 * @author Oliver Gierke
+ * @author Michal Vich
 */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {

 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see org.springframework.dao.support.PersistenceExceptionTranslator#
-	  * translateExceptionIfPossible(java.lang.RuntimeException)
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {

 		// Check for well-known MongoException subclasses.
@@ -52,14 +51,23 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 		if (ex instanceof DuplicateKey) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
+
 		if (ex instanceof Network) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
+
 		if (ex instanceof CursorNotFound) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
+
+		if (ex instanceof MongoInternalException) {
+			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
+		}
+
 		if (ex instanceof MongoException) {
+
 			int code = ((MongoException) ex).getCode();
+
 			if (code == 11000 || code == 11001) {
 				throw new DuplicateKeyException(ex.getMessage(), ex);
 			} else if (code == 12000 || code == 13440) {
@@ -69,9 +77,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			}
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}
-		if (ex instanceof MongoInternalException) {
-			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
-		}

 		// If we get here, we have an exception that resulted from user code,
 		// rather than the persistence provider, so we return null to indicate
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java
@@ -15,7 +15,9 @@
 */
 package org.springframework.data.mongodb.core;

-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;

 import org.springframework.beans.factory.DisposableBean;
@@ -24,6 +26,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
+import org.springframework.util.StringUtils;

 import com.mongodb.Mongo;
 import com.mongodb.MongoOptions;
@@ -36,6 +39,7 @@ import com.mongodb.WriteConcern;
 * @author Thomas Risberg
 * @author Graeme Rocher
 * @author Oliver Gierke
+ * @author Thomas Darimont
 * @since 1.0
 */
 public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
@@ -57,11 +61,38 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 	}

 	public void setReplicaSetSeeds(ServerAddress[] replicaSetSeeds) {
-		this.replicaSetSeeds = Arrays.asList(replicaSetSeeds);
+		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
 	}

+	/**
+	 * @deprecated use {@link #setReplicaSetSeeds(ServerAddress[])} instead
+	 * 
+	 * @param replicaPair
+	 */
+	@Deprecated
 	public void setReplicaPair(ServerAddress[] replicaPair) {
-		this.replicaPair = Arrays.asList(replicaPair);
+		this.replicaPair = filterNonNullElementsAsList(replicaPair);
+	}
+
+	/**
+	 * @param elements the elements to filter <T>
+	 * @return a new unmodifiable {@link List#} from the given elements without nulls
+	 */
+	private <T> List<T> filterNonNullElementsAsList(T[] elements) {
+
+		if (elements == null) {
+			return Collections.emptyList();
+		}
+
+		List<T> candidateElements = new ArrayList<T>();
+
+		for (T element : elements) {
+			if (element != null) {
+				candidateElements.add(element);
+			}
+		}
+
+		return Collections.unmodifiableList(candidateElements);
 	}

 	public void setHost(String host) {
@@ -126,15 +157,15 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 			mongoOptions = new MongoOptions();
 		}

-		if (replicaPair != null) {
+		if (!isNullOrEmpty(replicaPair)) {
 			if (replicaPair.size() < 2) {
 				throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
 			}
 			mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
-		} else if (replicaSetSeeds != null) {
+		} else if (!isNullOrEmpty(replicaSetSeeds)) {
 			mongo = new Mongo(replicaSetSeeds, mongoOptions);
 		} else {
-			String mongoHost = host != null ? host : defaultOptions.getHost();
+			String mongoHost = StringUtils.hasText(host) ? host : defaultOptions.getHost();
 			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
 					mongoOptions);
 		}
@@ -146,6 +177,10 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 		this.mongo = mongo;
 	}

+	private boolean isNullOrEmpty(Collection<?> elements) {
+		return elements == null || elements.isEmpty();
+	}
+
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.DisposableBean#destroy()
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
@@ -247,7 +247,7 @@ public interface MongoOperations {
 	 * Query for a list of objects of type T from the collection used by the entity class.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -261,7 +261,7 @@ public interface MongoOperations {
 	 * Query for a list of objects of type T from the specified collection.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -382,7 +382,7 @@ public interface MongoOperations {
 	 * specified type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -399,7 +399,7 @@ public interface MongoOperations {
 	 * type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -417,7 +417,7 @@ public interface MongoOperations {
 	 * Map the results of an ad-hoc query on the collection for the entity class to a List of the specified type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -433,7 +433,7 @@ public interface MongoOperations {
 	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -501,7 +501,7 @@ public interface MongoOperations {
 	 * type. The first document that matches the query is returned and also removed from the collection in the database.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -555,7 +555,7 @@ public interface MongoOperations {
 	 * Insert the object into the specified collection.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
 	 * 
@@ -593,7 +593,7 @@ public interface MongoOperations {
 	 * object is not already present, that is an 'upsert'.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
@@ -610,7 +610,7 @@ public interface MongoOperations {
 	 * is an 'upsert'.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
@@ -734,4 +734,4 @@ public interface MongoOperations {
 	 * @return
 	 */
 	MongoConverter getConverter();
-}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -44,7 +44,6 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.authentication.UserCredentials;
@@ -53,6 +52,7 @@ import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.MongoDataIntegrityViolationException;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -116,7 +116,7 @@ import com.mongodb.util.JSONParseException;
 public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class);
-	private static final String ID = "_id";
+	private static final String ID_FIELD = "_id";
 	private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE;
 	private static final Collection<String> ITERABLE_CLASSES;

@@ -130,32 +130,16 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		ITERABLE_CLASSES = Collections.unmodifiableCollection(iterableClasses);
 	}

-	/*
-	 * WriteConcern to be used for write operations if it has been specified.
-	 * Otherwise we should not use a WriteConcern defaulting to the one set for
-	 * the DB or Collection.
-	 */
-	private WriteConcern writeConcern = null;
-
-	private WriteConcernResolver writeConcernResolver = new DefaultWriteConcernResolver();
-
-	/*
-	 * WriteResultChecking to be used for write operations if it has been
-	 * specified. Otherwise we should not do any checking.
-	 */
-	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
-
-	/**
-	 * Set the ReadPreference when operating on a collection. See {@link #prepareCollection(DBCollection)}
-	 */
-	private ReadPreference readPreference = null;
-
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final MongoDbFactory mongoDbFactory;
 	private final MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	private final QueryMapper mapper;

+	private WriteConcern writeConcern;
+	private WriteConcernResolver writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
+	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
+	private ReadPreference readPreference;
 	private ApplicationEventPublisher eventPublisher;
 	private ResourceLoader resourceLoader;
 	private MongoPersistentEntityIndexCreator indexCreator;
@@ -163,8 +147,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	/**
 	 * Constructor used for a basic template configuration
 	 * 
-	 * @param mongo
-	 * @param databaseName
+	 * @param mongo must not be {@literal null}.
+	 * @param databaseName must not be {@literal null} or empty.
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName) {
 		this(new SimpleMongoDbFactory(mongo, databaseName), null);
@@ -174,8 +158,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * Constructor used for a template configuration with user credentials in the form of
 	 * {@link org.springframework.data.authentication.UserCredentials}
 	 * 
-	 * @param mongo
-	 * @param databaseName
+	 * @param mongo must not be {@literal null}.
+	 * @param databaseName must not be {@literal null} or empty.
 	 * @param userCredentials
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName, UserCredentials userCredentials) {
@@ -183,9 +167,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	/**
-	 * Constructor used for a basic template configuration
+	 * Constructor used for a basic template configuration.
 	 * 
-	 * @param mongoDbFactory
+	 * @param mongoDbFactory must not be {@literal null}.
 	 */
 	public MongoTemplate(MongoDbFactory mongoDbFactory) {
 		this(mongoDbFactory, null);
@@ -194,7 +178,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	/**
 	 * Constructor used for a basic template configuration.
 	 * 
-	 * @param mongoDbFactory
+	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mongoConverter
 	 */
 	public MongoTemplate(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) {
@@ -228,7 +212,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	/**
-	 * Configures the {@link WriteConcern} to be used with the template.
+	 * Configures the {@link WriteConcern} to be used with the template. If none is configured the {@link WriteConcern}
+	 * configured on the {@link MongoDbFactory} will apply. If you configured a {@link Mongo} instance no
+	 * {@link WriteConcern} will be used.
 	 * 
 	 * @param writeConcern
 	 */
@@ -276,7 +262,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * can be found we manually add the internally created one as {@link ApplicationListener} to make sure indexes get
 	 * created appropriately for entity types persisted through this {@link MongoTemplate} instance.
 	 * 
-	 * @param context
+	 * @param context must not be {@literal null}.
 	 */
 	private void prepareIndexCreator(ApplicationContext context) {

@@ -501,8 +487,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	public <T> List<T> find(final Query query, Class<T> entityClass, String collectionName) {
-		CursorPreparer cursorPreparer = query == null ? null : new QueryCursorPreparer(query);
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass, cursorPreparer);
+
+		if (query == null) {
+			return findAll(entityClass, collectionName);
+		}
+
+		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
+				new QueryCursorPreparer(query));
 	}

 	public <T> T findById(Object id, Class<T> entityClass) {
@@ -512,7 +503,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	public <T> T findById(Object id, Class<T> entityClass, String collectionName) {
 		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entityClass);
 		MongoPersistentProperty idProperty = persistentEntity == null ? null : persistentEntity.getIdProperty();
-		String idKey = idProperty == null ? ID : idProperty.getName();
+		String idKey = idProperty == null ? ID_FIELD : idProperty.getName();
 		return doFindOne(collectionName, new BasicDBObject(idKey, id), null, entityClass);
 	}

@@ -657,6 +648,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		assertUpdateableIdIfNotSet(objectToSave);

+		initializeVersionProperty(objectToSave);
+
 		BasicDBObject dbDoc = new BasicDBObject();

 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
@@ -669,6 +662,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		maybeEmitEvent(new AfterSaveEvent<T>(objectToSave, dbDoc));
 	}

+	private void initializeVersionProperty(Object entity) {
+
+		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(entity.getClass());
+
+		if (mongoPersistentEntity != null && mongoPersistentEntity.hasVersionProperty()) {
+			BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(entity,
+					this.mongoConverter.getConversionService());
+			wrapper.setProperty(mongoPersistentEntity.getVersionProperty(), 0);
+		}
+	}
+
 	public void insert(Collection<? extends Object> batchToSave, Class<?> entityClass) {
 		doInsertBatch(determineCollectionName(entityClass), batchToSave, this.mongoConverter);
 	}
@@ -713,6 +717,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		List<DBObject> dbObjectList = new ArrayList<DBObject>();
 		for (T o : batchToSave) {
+
+			initializeVersionProperty(o);
 			BasicDBObject dbDoc = new BasicDBObject();

 			maybeEmitEvent(new BeforeConvertEvent<T>(o));
@@ -760,18 +766,18 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				this.mongoConverter.getConversionService());
 		MongoPersistentProperty idProperty = entity.getIdProperty();
 		MongoPersistentProperty versionProperty = entity.getVersionProperty();
-		Object id = beanWrapper.getProperty(idProperty);
+
+		Number version = beanWrapper.getProperty(versionProperty, Number.class, !versionProperty.usePropertyAccess());

 		// Fresh instance -> initialize version property
-		if (id == null) {
-			beanWrapper.setProperty(versionProperty, 0);
-			doSave(collectionName, objectToSave, this.mongoConverter);
+		if (version == null) {
+			doInsert(collectionName, objectToSave, this.mongoConverter);
 		} else {

 			assertUpdateableIdIfNotSet(objectToSave);

 			// Create query for entity with the id and old version
-			Object version = beanWrapper.getProperty(versionProperty);
+			Object id = beanWrapper.getProperty(idProperty);
 			Query query = new Query(Criteria.where(idProperty.getName()).is(id).and(versionProperty.getName()).is(version));

 			// Bump version number
@@ -784,14 +790,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			this.mongoConverter.write(objectToSave, dbObject);

 			maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbObject));
-			Update update = Update.fromDBObject(dbObject, ID);
+			Update update = Update.fromDBObject(dbObject, ID_FIELD);

-			updateFirst(query, update, objectToSave.getClass());
+			doUpdate(collectionName, query, update, objectToSave.getClass(), false, false);
 			maybeEmitEvent(new AfterSaveEvent<T>(objectToSave, dbObject));
 		}
 	}

-	@SuppressWarnings("unchecked")
 	protected <T> void doSave(String collectionName, T objectToSave, MongoWriter<T> writer) {

 		assertUpdateableIdIfNotSet(objectToSave);
@@ -804,7 +809,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			writer.write(objectToSave, dbDoc);
 		} else {
 			try {
-				objectToSave = (T) JSON.parse((String) objectToSave);
+				dbDoc = (DBObject) JSON.parse((String) objectToSave);
 			} catch (JSONParseException e) {
 				throw new MappingException("Could not parse given String to save into a JSON document!", e);
 			}
@@ -819,21 +824,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	protected Object insertDBObject(final String collectionName, final DBObject dbDoc, final Class<?> entityClass) {
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("insert DBObject containing fields: " + dbDoc.keySet() + " in collection: " + collectionName);
+			LOGGER.debug("Inserting DBObject containing fields: " + dbDoc.keySet() + " in collection: " + collectionName);
 		}
 		return execute(collectionName, new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT, collectionName,
 						entityClass, dbDoc, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult wr;
-				if (writeConcernToUse == null) {
-					wr = collection.insert(dbDoc);
-				} else {
-					wr = collection.insert(dbDoc, writeConcernToUse);
-				}
-				handleAnyWriteResultErrors(wr, dbDoc, "insert");
-				return dbDoc.get(ID);
+				WriteResult writeResult = writeConcernToUse == null ? collection.insert(dbDoc) : collection.insert(dbDoc,
+						writeConcernToUse);
+				handleAnyWriteResultErrors(writeResult, dbDoc, MongoActionOperation.INSERT);
+				return dbDoc.get(ID_FIELD);
 			}
 		});
 	}
@@ -844,27 +845,23 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}

 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("insert list of DBObjects containing " + dbDocList.size() + " items");
+			LOGGER.debug("Inserting list of DBObjects containing " + dbDocList.size() + " items");
 		}
 		execute(collectionName, new CollectionCallback<Void>() {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT_LIST, collectionName, null,
 						null, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult wr;
-				if (writeConcernToUse == null) {
-					wr = collection.insert(dbDocList);
-				} else {
-					wr = collection.insert(dbDocList.toArray((DBObject[]) new BasicDBObject[dbDocList.size()]), writeConcernToUse);
-				}
-				handleAnyWriteResultErrors(wr, null, "insert_list");
+				WriteResult writeResult = writeConcernToUse == null ? collection.insert(dbDocList) : collection.insert(
+						dbDocList.toArray((DBObject[]) new BasicDBObject[dbDocList.size()]), writeConcernToUse);
+				handleAnyWriteResultErrors(writeResult, null, MongoActionOperation.INSERT_LIST);
 				return null;
 			}
 		});

 		List<ObjectId> ids = new ArrayList<ObjectId>();
 		for (DBObject dbo : dbDocList) {
-			Object id = dbo.get(ID);
+			Object id = dbo.get(ID_FIELD);
 			if (id instanceof ObjectId) {
 				ids.add((ObjectId) id);
 			} else {
@@ -877,21 +874,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	protected Object saveDBObject(final String collectionName, final DBObject dbDoc, final Class<?> entityClass) {
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("save DBObject containing fields: " + dbDoc.keySet());
+			LOGGER.debug("Saving DBObject containing fields: " + dbDoc.keySet());
 		}
 		return execute(collectionName, new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.SAVE, collectionName, entityClass,
 						dbDoc, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult wr;
-				if (writeConcernToUse == null) {
-					wr = collection.save(dbDoc);
-				} else {
-					wr = collection.save(dbDoc, writeConcernToUse);
-				}
-				handleAnyWriteResultErrors(wr, dbDoc, "save");
-				return dbDoc.get(ID);
+				WriteResult writeResult = writeConcernToUse == null ? collection.save(dbDoc) : collection.save(dbDoc,
+						writeConcernToUse);
+				handleAnyWriteResultErrors(writeResult, dbDoc, MongoActionOperation.SAVE);
+				return dbDoc.get(ID_FIELD);
 			}
 		});
 	}
@@ -934,29 +927,25 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						entity);

 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
+					LOGGER.debug("Calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
 							+ collectionName);
 				}

-				WriteResult wr;
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
 						entityClass, updateObj, queryObj);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				if (writeConcernToUse == null) {
-					wr = collection.update(queryObj, updateObj, upsert, multi);
-				} else {
-					wr = collection.update(queryObj, updateObj, upsert, multi, writeConcernToUse);
-				}
+				WriteResult writeResult = writeConcernToUse == null ? collection.update(queryObj, updateObj, upsert, multi)
+						: collection.update(queryObj, updateObj, upsert, multi, writeConcernToUse);

 				if (entity != null && entity.hasVersionProperty() && !multi) {
-					if (wr.getN() == 0) {
+					if (writeResult.getN() == 0) {
 						throw new OptimisticLockingFailureException("Optimistic lock exception on saving entity: "
-								+ updateObj.toMap().toString());
+								+ updateObj.toMap().toString() + " to collection " + collectionName);
 					}
 				}

-				handleAnyWriteResultErrors(wr, queryObj, "update with '" + updateObj + "'");
-				return wr;
+				handleAnyWriteResultErrors(writeResult, queryObj, MongoActionOperation.UPDATE);
+				return writeResult;
 			}
 		});
 	}
@@ -991,11 +980,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		Assert.notNull(object);

-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(object.getClass());
+		Class<?> objectType = object.getClass();
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
 		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();

 		if (idProp == null) {
-			throw new MappingException("No id property found for object of type " + entity.getType().getName());
+			throw new MappingException("No id property found for object of type " + objectType);
 		}

 		ConversionService service = mongoConverter.getConversionService();
@@ -1030,27 +1020,30 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	protected <T> void doRemove(final String collectionName, final Query query, final Class<T> entityClass) {
+
 		if (query == null) {
 			throw new InvalidDataAccessApiUsageException("Query passed in to remove can't be null");
 		}
+
 		final DBObject queryObject = query.getQueryObject();
 		final MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
+
 		execute(collectionName, new CollectionCallback<Void>() {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+
 				DBObject dboq = mapper.getMappedObject(queryObject, entity);
-				WriteResult wr = null;
+
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName,
 						entityClass, null, queryObject);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
+
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("remove using query: " + dboq + " in collection: " + collection.getName());
+					LOGGER.debug("Remove using query: {} in collection: {}.", new Object[] { dboq, collection.getName() });
 				}
-				if (writeConcernToUse == null) {
-					wr = collection.remove(dboq);
-				} else {
-					wr = collection.remove(dboq, writeConcernToUse);
-				}
-				handleAnyWriteResultErrors(wr, dboq, "remove");
+
+				WriteResult wr = writeConcernToUse == null ? collection.remove(dboq) : collection.remove(dboq,
+						writeConcernToUse);
+				handleAnyWriteResultErrors(wr, dboq, MongoActionOperation.REMOVE);
 				return null;
 			}
 		});
@@ -1107,7 +1100,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		handleCommandError(commandResult, commandObject);

 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("MapReduce command result = [%s]", serializeToJsonSafely(commandObject)));
+			LOGGER.debug("MapReduce command result = [{}]", serializeToJsonSafely(commandObject));
 		}

 		MapReduceOutput mapReduceOutput = new MapReduceOutput(inputCollection, commandObject, commandResult);
@@ -1160,14 +1153,14 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		DBObject commandObject = new BasicDBObject("group", dbo);

 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("Executing Group with DBObject [%s]", serializeToJsonSafely(commandObject)));
+			LOGGER.debug("Executing Group with DBObject [{}]", serializeToJsonSafely(commandObject));
 		}

 		CommandResult commandResult = executeCommand(commandObject, getDb().getOptions());
 		handleCommandError(commandResult, commandObject);

 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Group command result = [" + commandResult + "]");
+			LOGGER.debug("Group command result = [{}]", commandResult);
 		}

 		@SuppressWarnings("unchecked")
@@ -1283,7 +1276,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				DBCollection coll = db.createCollection(collectionName, collectionOptions);
 				// TODO: Emit a collection created event
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Created collection [" + coll.getFullName() + "]");
+					LOGGER.debug("Created collection [{}]", coll.getFullName());
 				}
 				return coll;
 			}
@@ -1311,14 +1304,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of SimpleMongoConverter will be used.
-	 * <p/>
-	 * The query document is specified as a standard DBObject and so is the fields specification.
-	 * <p/>
-	 * Can be overridden by subclasses.
+	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type. The object is
+	 * converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless configured
+	 * otherwise, an instance of MappingMongoConverter will be used. The query document is specified as a standard
+	 * DBObject and so is the fields specification. Can be overridden by subclasses.
 	 * 
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
@@ -1349,9 +1338,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List using the template's converter.
-	 * <p/>
-	 * The query document is specified as a standard DBObject and so is the fields specification.
+	 * Map the results of an ad-hoc query on the default MongoDB collection to a List using the template's converter. The
+	 * query document is specified as a standard DBObject and so is the fields specification.
 	 * 
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
@@ -1420,19 +1408,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);

-		DBObject updateObj = update.getUpdateObject();
-		for (String key : updateObj.keySet()) {
-			updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
-		}
-
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), entity);
 		DBObject mappedQuery = mapper.getMappedObject(query, entity);

 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
-					+ " for class: " + entityClass + " and update: " + updateObj + " in collection: " + collectionName);
+					+ " for class: " + entityClass + " and update: " + mappedUpdate + " in collection: " + collectionName);
 		}

-		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, updateObj, options),
+		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate, options),
 				new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
 	}

@@ -1450,7 +1434,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		if (savedObject instanceof BasicDBObject) {
 			DBObject dbObject = (DBObject) savedObject;
-			dbObject.put(ID, id);
+			dbObject.put(ID_FIELD, id);
 			return;
 		}

@@ -1530,19 +1514,32 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			CursorPreparer preparer, DbObjectCallback<T> objectCallback, String collectionName) {

 		try {
-			DBCursor cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));

-			if (preparer != null) {
-				cursor = preparer.prepare(cursor);
+			DBCursor cursor = null;
+
+			try {
+
+				cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
+
+				if (preparer != null) {
+					cursor = preparer.prepare(cursor);
+				}
+
+				List<T> result = new ArrayList<T>();
+
+				while (cursor.hasNext()) {
+					DBObject object = cursor.next();
+					result.add(objectCallback.doWith(object));
+				}
+
+				return result;
+
+			} finally {
+
+				if (cursor != null) {
+					cursor.close();
+				}
 			}
-
-			List<T> result = new ArrayList<T>();
-
-			for (DBObject object : cursor) {
-				result.add(objectCallback.doWith(object));
-			}
-
-			return result;
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e);
 		}
@@ -1552,15 +1549,27 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			DocumentCallbackHandler callbackHandler, String collectionName) {

 		try {
-			DBCursor cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));

-			if (preparer != null) {
-				cursor = preparer.prepare(cursor);
+			DBCursor cursor = null;
+
+			try {
+				cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
+
+				if (preparer != null) {
+					cursor = preparer.prepare(cursor);
+				}
+
+				while (cursor.hasNext()) {
+					DBObject dbobject = cursor.next();
+					callbackHandler.processDocument(dbobject);
+				}
+
+			} finally {
+				if (cursor != null) {
+					cursor.close();
+				}
 			}

-			for (DBObject dbobject : cursor) {
-				callbackHandler.processDocument(dbobject);
-			}
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e);
 		}
@@ -1599,37 +1608,45 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}

 	/**
-	 * Checks and handles any errors.
-	 * <p/>
-	 * Current implementation logs errors. Future version may make this configurable to log warning, errors or throw
-	 * exception.
+	 * Handles {@link WriteResult} errors based on the configured {@link WriteResultChecking}.
+	 * 
+	 * @param writeResult
+	 * @param query
+	 * @param operation
 	 */
-	protected void handleAnyWriteResultErrors(WriteResult wr, DBObject query, String operation) {
+	protected void handleAnyWriteResultErrors(WriteResult writeResult, DBObject query, MongoActionOperation operation) {

-		if (WriteResultChecking.NONE == this.writeResultChecking) {
+		if (writeResultChecking == WriteResultChecking.NONE) {
 			return;
 		}

-		String error = wr.getError();
+		String error = writeResult.getError();

-		if (error != null) {
-			String message;
-			if (operation.equals("insert") || operation.equals("save")) {
-				// assuming the insert operations will begin with insert string
+		if (error == null) {
+			return;
+		}
+
+		String message;
+
+		switch (operation) {
+
+			case INSERT:
+			case SAVE:
 				message = String.format("Insert/Save for %s failed: %s", query, error);
-			} else if (operation.equals("insert_list")) {
+				break;
+			case INSERT_LIST:
 				message = String.format("Insert list failed: %s", error);
-			} else {
+				break;
+			default:
 				message = String.format("Execution of %s%s failed: %s", operation,
-						query == null ? "" : "' using '" + query.toString() + "' query", error);
-			}
+						query == null ? "" : " using query " + query.toString(), error);
+		}

-			if (WriteResultChecking.EXCEPTION == this.writeResultChecking) {
-				throw new DataIntegrityViolationException(message);
-			} else {
-				LOGGER.error(message);
-				return;
-			}
+		if (writeResultChecking == WriteResultChecking.EXCEPTION) {
+			throw new MongoDataIntegrityViolationException(message, writeResult, operation);
+		} else {
+			LOGGER.error(message);
+			return;
 		}
 	}

@@ -1717,7 +1734,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private static class FindCallback implements CollectionCallback<DBCursor> {

 		private final DBObject query;
-
 		private final DBObject fields;

 		public FindCallback(DBObject query) {
@@ -1825,12 +1841,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 	}

-	private class DefaultWriteConcernResolver implements WriteConcernResolver {
+	private enum DefaultWriteConcernResolver implements WriteConcernResolver {
+
+		INSTANCE;

 		public WriteConcern resolve(MongoAction action) {
 			return action.getDefaultWriteConcern();
 		}
-
 	}

 	class QueryCursorPreparer implements CursorPreparer {
@@ -1894,7 +1911,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		 * Creates a new {@link GeoNearResultDbObjectCallback} using the given {@link DbObjectCallback} delegate for
 		 * {@link GeoResult} content unmarshalling.
 		 * 
-		 * @param delegate
+		 * @param delegate must not be {@literal null}.
 		 */
 		public GeoNearResultDbObjectCallback(DbObjectCallback<T> delegate, Metric metric) {
 			Assert.notNull(delegate);
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
@@ -47,7 +47,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * Create an instance of {@link SimpleMongoDbFactory} given the {@link Mongo} instance and database name.
 	 * 
 	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName database name, not be {@literal null}.
+	 * @param databaseName database name, not be {@literal null} or empty.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
 		this(mongo, databaseName, UserCredentials.NO_CREDENTIALS, false);
@@ -57,7 +57,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
 	 * 
 	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName Database name, must not be {@literal null}.
+	 * @param databaseName Database name, must not be {@literal null} or empty.
 	 * @param credentials username and password.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -13,27 +13,25 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core;

 import com.mongodb.WriteConcern;

 /**
- * A strategy interface to determine the WriteConcern to use for a given MongoDbAction.
- * 
- * Return the passed in default WriteConcern (a property on MongoAction) if no determination can be made.
+ * A strategy interface to determine the {@link WriteConcern} to use for a given {@link MongoAction}. Return the passed
+ * in default {@link WriteConcern} (a property on {@link MongoAction}) if no determination can be made.
 * 
 * @author Mark Pollack
- * 
+ * @author Oliver Gierke
 */
 public interface WriteConcernResolver {

 	/**
-	 * Resolve the WriteConcern given the MongoAction
+	 * Resolve the {@link WriteConcern} given the {@link MongoAction}.
 	 * 
-	 * @param action describes the context of the Mongo action. Contains a default WriteConcern to use if one should not
-	 *          be resolved.
-	 * @return a WriteConcern based on the passed in MongoAction value, maybe null
+	 * @param action describes the context of the Mongo action. Contains a default {@link WriteConcern} to use if one
+	 *          should not be resolved.
+	 * @return a {@link WriteConcern} based on the passed in {@link MongoAction} value, maybe {@literal null}.
 	 */
 	WriteConcern resolve(MongoAction action);
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java
@@ -1,5 +1,28 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
 package org.springframework.data.mongodb.core;

+/**
+ * Enum to represent how strict the check of {@link com.mongodb.WriteResult} shall be. It can either be skipped entirely
+ * (use {@link #NONE}), or errors can be logged ({@link #LOG}) or cause an exception to be thrown {@link #EXCEPTION}.
+ * 
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
 public enum WriteResultChecking {
+
 	NONE, LOG, EXCEPTION
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2013 the original author or authors.
 *
 * 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
+ *      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,
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core.convert;

 import java.math.BigInteger;
@@ -33,8 +32,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObj
 * Base class for {@link MongoConverter} implementations. Sets up a {@link GenericConversionService} and populates basic
 * converters. Allows registering {@link CustomConversions}.
 * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke ogierke@vmware.com
+ * @author Jon Brisbin
+ * @author Oliver Gierke
 */
 public abstract class AbstractMongoConverter implements MongoConverter, InitializingBean {

@@ -94,6 +93,14 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		conversions.registerConvertersIn(conversionService);
 	}

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object)
+	 */
+	public Object convertToMongoType(Object obj) {
+		return convertToMongoType(obj, null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService()
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2013 the original author or authors.
 *
 * 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
+ *      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,
@@ -17,9 +17,11 @@ package org.springframework.data.mongodb.core.convert;

 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;

 import org.slf4j.Logger;
@@ -31,6 +33,7 @@ import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.JodaTimeConverters;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -62,6 +65,7 @@ public class CustomConversions {
 	private final Set<ConvertiblePair> writingPairs;
 	private final Set<Class<?>> customSimpleTypes;
 	private final SimpleTypeHolder simpleTypeHolder;
+	private final Map<Class<?>, HashMap<Class<?>, CacheValue>> cache;

 	private final List<Object> converters;

@@ -84,6 +88,7 @@ public class CustomConversions {
 		this.readingPairs = new HashSet<ConvertiblePair>();
 		this.writingPairs = new HashSet<ConvertiblePair>();
 		this.customSimpleTypes = new HashSet<Class<?>>();
+		this.cache = new HashMap<Class<?>, HashMap<Class<?>, CacheValue>>();

 		this.converters = new ArrayList<Object>();
 		this.converters.add(CustomToStringConverter.INSTANCE);
@@ -93,6 +98,7 @@ public class CustomConversions {
 		this.converters.add(StringToBigIntegerConverter.INSTANCE);
 		this.converters.add(URLToStringConverter.INSTANCE);
 		this.converters.add(StringToURLConverter.INSTANCE);
+		this.converters.addAll(JodaTimeConverters.getConvertersToRegister());
 		this.converters.addAll(converters);

 		for (Object c : this.converters) {
@@ -266,9 +272,11 @@ public class CustomConversions {
 	 * @return
 	 */
 	public boolean hasCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+
 		Assert.notNull(source);
 		Assert.notNull(expectedTargetType);
-		return getCustomTarget(source, expectedTargetType, readingPairs) != null;
+
+		return getCustomReadTarget(source, expectedTargetType) != null;
 	}

 	/**
@@ -297,8 +305,32 @@ public class CustomConversions {
 		return null;
 	}

+	private Class<?> getCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+
+		Class<?> type = expectedTargetType == null ? PlaceholderType.class : expectedTargetType;
+
+		Map<Class<?>, CacheValue> map;
+		CacheValue toReturn;
+
+		if ((map = cache.get(source)) == null || (toReturn = map.get(type)) == null) {
+
+			Class<?> target = getCustomTarget(source, type, readingPairs);
+
+			if (cache.get(source) == null) {
+				cache.put(source, new HashMap<Class<?>, CacheValue>());
+			}
+
+			Map<Class<?>, CacheValue> value = cache.get(source);
+			toReturn = target == null ? CacheValue.NULL : new CacheValue(target);
+			value.put(type, toReturn);
+		}
+
+		return toReturn.clazz;
+	}
+
 	@WritingConverter
 	private enum CustomToStringConverter implements GenericConverter {
+
 		INSTANCE;

 		public Set<ConvertiblePair> getConvertibleTypes() {
@@ -311,4 +343,30 @@ public class CustomConversions {
 			return source.toString();
 		}
 	}
+
+	/**
+	 * Placeholder type to allow registering not-found values in the converter cache.
+	 * 
+	 * @author Patryk Wasik
+	 * @author Oliver Gierke
+	 */
+	private static class PlaceholderType {
+
+	}
+
+	/**
+	 * Wrapper to safely store {@literal null} values in the type cache.
+	 * 
+	 * @author Patryk Wasik
+	 * @author Oliver Gierke
+	 */
+	private static class CacheValue {
+
+		public static final CacheValue NULL = new CacheValue(null);
+		private final Class<?> clazz;
+
+		public CacheValue(Class<?> clazz) {
+			this.clazz = clazz;
+		}
+	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 2011-2013 by the original author(s).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,11 +31,13 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
@@ -46,6 +48,7 @@ import org.springframework.data.mapping.model.PersistentEntityParameterValueProv
 import org.springframework.data.mapping.model.PropertyValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
 import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.springframework.data.mapping.model.SpELExpressionParameterValueProvider;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -215,9 +218,9 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, parent);
 		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<MongoPersistentProperty>(
 				entity, provider, parent);
-		parameterProvider.setSpELEvaluator(evaluator);

-		return parameterProvider;
+		return new ConverterAwareSpELExpressionParameterValueProvider(evaluator, conversionService, parameterProvider,
+				parent);
 	}

 	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {
@@ -235,10 +238,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {

-				boolean isConstructorProperty = entity.isConstructorArgument(prop);
-				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());
-
-				if (!hasValueForProperty || isConstructorProperty) {
+				if (!dbo.containsField(prop.getFieldName()) || entity.isConstructorArgument(prop)) {
 					return;
 				}

@@ -813,8 +813,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return rootList;
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation)
+	 */
 	@SuppressWarnings("unchecked")
-	public Object convertToMongoType(Object obj) {
+	public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation) {

 		if (obj == null) {
 			return null;
@@ -825,7 +829,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return conversionService.convert(obj, target);
 		}

-		if (null != obj && conversions.isSimpleType(obj.getClass())) {
+		if (conversions.isSimpleType(obj.getClass())) {
 			// Doesn't need conversion
 			return getPotentiallyConvertedSimpleWrite(obj);
 		}
@@ -861,7 +865,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App

 		DBObject newDbo = new BasicDBObject();
 		this.write(obj, newDbo);
-		return removeTypeInfoRecursively(newDbo);
+
+		if (typeInformation == null) {
+			return removeTypeInfoRecursively(newDbo);
+		}
+
+		return !obj.getClass().equals(typeInformation.getType()) ? newDbo : removeTypeInfoRecursively(newDbo);
 	}

 	public BasicDBList maybeConvertList(Iterable<?> source) {
@@ -933,7 +942,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
 		 */
-		@SuppressWarnings("unchecked")
 		public <T> T getPropertyValue(MongoPersistentProperty property) {

 			String expression = property.getSpelExpression();
@@ -943,20 +951,60 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				return null;
 			}

-			TypeInformation<?> type = property.getTypeInformation();
-			Class<?> rawType = type.getType();
+			return readValue(value, property.getTypeInformation(), parent);
+		}
+	}

-			if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
-				return (T) conversionService.convert(value, rawType);
-			} else if (value instanceof DBRef) {
-				return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
-			} else if (value instanceof BasicDBList) {
-				return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
-			} else if (value instanceof DBObject) {
-				return (T) read(type, (DBObject) value, parent);
-			} else {
-				return (T) getPotentiallyConvertedSimpleRead(value, rawType);
-			}
+	/**
+	 * Extension of {@link SpELExpressionParameterValueProvider} to recursively trigger value conversion on the raw
+	 * resolved SpEL value.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private class ConverterAwareSpELExpressionParameterValueProvider extends
+			SpELExpressionParameterValueProvider<MongoPersistentProperty> {
+
+		private final Object parent;
+
+		/**
+		 * Creates a new {@link ConverterAwareSpELExpressionParameterValueProvider}.
+		 * 
+		 * @param evaluator must not be {@literal null}.
+		 * @param conversionService must not be {@literal null}.
+		 * @param delegate must not be {@literal null}.
+		 */
+		public ConverterAwareSpELExpressionParameterValueProvider(SpELExpressionEvaluator evaluator,
+				ConversionService conversionService, ParameterValueProvider<MongoPersistentProperty> delegate, Object parent) {
+
+			super(evaluator, conversionService, delegate);
+			this.parent = parent;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter)
+		 */
+		@Override
+		protected <T> T potentiallyConvertSpelValue(Object object, Parameter<T, MongoPersistentProperty> parameter) {
+			return readValue(object, parameter.getType(), parent);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> T readValue(Object value, TypeInformation<?> type, Object parent) {
+
+		Class<?> rawType = type.getType();
+
+		if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
+			return (T) conversionService.convert(value, rawType);
+		} else if (value instanceof DBRef) {
+			return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
+		} else if (value instanceof BasicDBList) {
+			return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
+		} else if (value instanceof DBObject) {
+			return (T) read(type, (DBObject) value, parent);
+		} else {
+			return (T) getPotentiallyConvertedSimpleRead(value, rawType);
 		}
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core.convert;

 import org.springframework.data.convert.EntityWriter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;

 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
@@ -35,11 +36,21 @@ public interface MongoWriter<T> extends EntityWriter<T, DBObject> {
 	 * Converts the given object into one Mongo will be able to store natively. If the given object can already be stored
 	 * as is, no conversion will happen.
 	 * 
-	 * @param obj
+	 * @param obj can be {@literal null}.
 	 * @return
 	 */
 	Object convertToMongoType(Object obj);

+	/**
+	 * Converts the given object into one Mongo will be able to store natively but retains the type information in case
+	 * the given {@link TypeInformation} differs from the given object type.
+	 * 
+	 * @param obj can be {@literal null}.
+	 * @param typeInformation can be {@literal null}.
+	 * @return
+	 */
+	Object convertToMongoType(Object obj, TypeInformation<?> typeInformation);
+
 	/**
 	 * Creates a {@link DBRef} to refer to the given object.
 	 * 
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.data.mongodb.core.convert;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;

 import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionException;
@@ -41,6 +42,7 @@ import com.mongodb.DBRef;
 * 
 * @author Jon Brisbin
 * @author Oliver Gierke
+ * @author Patryk Wasik
 */
 public class QueryMapper {

@@ -83,11 +85,22 @@ public class QueryMapper {

 		for (String key : query.keySet()) {

-			MongoPersistentProperty targetProperty = getTargetProperty(key, entity);
-			String newKey = determineKey(key, entity);
-			Object value = query.get(key);
+			if (Keyword.isKeyword(key)) {
+				result.putAll(getMappedKeyword(new Keyword(query, key), entity));
+				continue;
+			}

-			result.put(newKey, getMappedValue(value, targetProperty, newKey));
+			Field field = entity == null ? new Field(key) : new MetadataBackedField(key, entity, mappingContext);
+
+			Object rawValue = query.get(key);
+			String newKey = field.getMappedKey();
+
+			if (Keyword.isKeyword(rawValue) && !field.isIdField()) {
+				Keyword keyword = new Keyword((DBObject) rawValue);
+				result.put(newKey, getMappedKeyword(field, keyword));
+			} else {
+				result.put(newKey, getMappedValue(field, query.get(key)));
+			}
 		}

 		return result;
@@ -103,13 +116,14 @@ public class QueryMapper {
 	private DBObject getMappedKeyword(Keyword query, MongoPersistentEntity<?> entity) {

 		// $or/$nor
-		if (query.key.matches(N_OR_PATTERN)) {
+		if (query.key.matches(N_OR_PATTERN) || query.value instanceof Iterable) {

 			Iterable<?> conditions = (Iterable<?>) query.value;
 			BasicDBList newConditions = new BasicDBList();

 			for (Object condition : conditions) {
-				newConditions.add(getMappedObject((DBObject) condition, entity));
+				newConditions.add(condition instanceof DBObject ? getMappedObject((DBObject) condition, entity)
+						: convertSimpleOrDBObject(condition, entity));
 			}

 			return new BasicDBObject(query.key, newConditions);
@@ -121,38 +135,34 @@ public class QueryMapper {
 	/**
 	 * Returns the mapped keyword considered defining a criteria for the given property.
 	 * 
-	 * @param keyword
 	 * @param property
+	 * @param keyword
 	 * @return
 	 */
-	public DBObject getMappedKeyword(Keyword keyword, MongoPersistentProperty property) {
+	private DBObject getMappedKeyword(Field property, Keyword keyword) {

-		if (property.isAssociation()) {
-			convertAssociation(keyword.value, property);
-		}
+		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
+		Object value = needsAssociationConversion ? convertAssociation(keyword.value, property.getProperty())
+				: getMappedValue(property.with(keyword.key), keyword.value);

-		return new BasicDBObject(keyword.key, getMappedValue(keyword.value, property, keyword.key));
+		return new BasicDBObject(keyword.key, value);
 	}

 	/**
 	 * Returns the mapped value for the given source object assuming it's a value for the given
 	 * {@link MongoPersistentProperty}.
 	 * 
-	 * @param source the source object to be mapped
+	 * @param value the source object to be mapped
 	 * @param property the property the value is a value for
 	 * @param newKey the key the value will be bound to eventually
 	 * @return
 	 */
-	private Object getMappedValue(Object source, MongoPersistentProperty property, String newKey) {
+	private Object getMappedValue(Field documentField, Object value) {

-		if (property == null) {
-			return convertSimpleOrDBObject(source, null);
-		}
+		if (documentField.isIdField()) {

-		if (property.isIdProperty() || "_id".equals(newKey)) {
-
-			if (source instanceof DBObject) {
-				DBObject valueDbo = (DBObject) source;
+			if (value instanceof DBObject) {
+				DBObject valueDbo = (DBObject) value;
 				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
 					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
 					List<Object> ids = new ArrayList<Object>();
@@ -163,63 +173,25 @@ public class QueryMapper {
 				} else if (valueDbo.containsField("$ne")) {
 					valueDbo.put("$ne", convertId(valueDbo.get("$ne")));
 				} else {
-					return getMappedObject((DBObject) source, null);
+					return getMappedObject((DBObject) value, null);
 				}

 				return valueDbo;

 			} else {
-				return convertId(source);
+				return convertId(value);
 			}
 		}

-		if (property.isAssociation()) {
-			return Keyword.isKeyword(source) ? getMappedKeyword(new Keyword(source), property) : convertAssociation(source,
-					property);
+		if (Keyword.isKeyword(value)) {
+			return getMappedKeyword(new Keyword((DBObject) value), null);
 		}

-		return convertSimpleOrDBObject(source, mappingContext.getPersistentEntity(property));
-	}
-
-	private MongoPersistentProperty getTargetProperty(String key, MongoPersistentEntity<?> entity) {
-
-		if (isIdKey(key, entity)) {
-			return entity.getIdProperty();
+		if (documentField.isAssociation()) {
+			return convertAssociation(value, documentField.getProperty());
 		}

-		PersistentPropertyPath<MongoPersistentProperty> path = getPath(key, entity);
-		return path == null ? null : path.getLeafProperty();
-	}
-
-	private PersistentPropertyPath<MongoPersistentProperty> getPath(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null) {
-			return null;
-		}
-
-		try {
-			PropertyPath path = PropertyPath.from(key, entity.getTypeInformation());
-			return mappingContext.getPersistentPropertyPath(path);
-		} catch (PropertyReferenceException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the translated key assuming the given one is a propert (path) reference.
-	 * 
-	 * @param key the source key
-	 * @param entity the base entity
-	 * @return the translated key
-	 */
-	private String determineKey(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null && DEFAULT_ID_NAMES.contains(key)) {
-			return "_id";
-		}
-
-		PersistentPropertyPath<MongoPersistentProperty> path = getPath(key, entity);
-		return path == null ? key : path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE);
+		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
 	}

 	/**
@@ -243,7 +215,7 @@ public class QueryMapper {
 	}

 	/**
-	 * Converts the given source assuming it's actually an association to anoter object.
+	 * Converts the given source assuming it's actually an association to another object.
 	 * 
 	 * @param source
 	 * @param property
@@ -263,29 +235,17 @@ public class QueryMapper {
 			return result;
 		}

-		return source instanceof DBRef ? source : converter.toDBRef(source, property);
-	}
-
-	/**
-	 * Returns whether the given key will be considered an id key.
-	 * 
-	 * @param key
-	 * @param entity
-	 * @return
-	 */
-	private boolean isIdKey(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null) {
-			return false;
+		if (property.isMap()) {
+			BasicDBObject result = new BasicDBObject();
+			DBObject dbObject = (DBObject) source;
+			for (String key : dbObject.keySet()) {
+				Object o = dbObject.get(key);
+				result.put(key, o instanceof DBRef ? o : converter.toDBRef(o, property));
+			}
+			return result;
 		}

-		MongoPersistentProperty idProperty = entity.getIdProperty();
-
-		if (idProperty != null) {
-			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
-		}
-
-		return DEFAULT_ID_NAMES.contains(key);
+		return source == null || source instanceof DBRef ? source : converter.toDBRef(source, property);
 	}

 	/**
@@ -315,16 +275,27 @@ public class QueryMapper {
 		String key;
 		Object value;

-		Keyword(Object source) {
+		public Keyword(DBObject source, String key) {
+			this.key = key;
+			this.value = source.get(key);
+		}

-			Assert.isInstanceOf(DBObject.class, source);
+		public Keyword(DBObject dbObject) {

-			DBObject value = (DBObject) source;
+			Set<String> keys = dbObject.keySet();
+			Assert.isTrue(keys.size() == 1, "Can only use a single value DBObject!");

-			Assert.isTrue(value.keySet().size() == 1, "Keyword must have a single key only!");
+			this.key = keys.iterator().next();
+			this.value = dbObject.get(key);
+		}

-			this.key = value.keySet().iterator().next();
-			this.value = value.get(key);
+		/**
+		 * Returns whether the current keyword is the {@code $exists} keyword.
+		 * 
+		 * @return
+		 */
+		public boolean isExists() {
+			return "$exists".equalsIgnoreCase(key);
 		}

 		/**
@@ -334,7 +305,11 @@ public class QueryMapper {
 		 * @param value
 		 * @return
 		 */
-		static boolean isKeyword(Object value) {
+		public static boolean isKeyword(Object value) {
+
+			if (value instanceof String) {
+				return ((String) value).startsWith("$");
+			}

 			if (!(value instanceof DBObject)) {
 				return false;
@@ -344,4 +319,192 @@ public class QueryMapper {
 			return dbObject.keySet().size() == 1 && dbObject.keySet().iterator().next().startsWith("$");
 		}
 	}
+
+	/**
+	 * Value object to represent a field and its meta-information.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class Field {
+
+		private static final String ID_KEY = "_id";
+
+		protected final String name;
+
+		/**
+		 * Creates a new {@link Field} without meta-information but the given name.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 */
+		public Field(String name) {
+
+			Assert.hasText(name, "Name must not be null!");
+			this.name = name;
+		}
+
+		/**
+		 * Returns a new {@link Field} with the given name.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @return
+		 */
+		public Field with(String name) {
+			return new Field(name);
+		}
+
+		/**
+		 * Returns whether the current field is the id field.
+		 * 
+		 * @return
+		 */
+		public boolean isIdField() {
+			return ID_KEY.equals(name);
+		}
+
+		/**
+		 * Returns the underlying {@link MongoPersistentProperty} backing the field.
+		 * 
+		 * @return
+		 */
+		public MongoPersistentProperty getProperty() {
+			return null;
+		}
+
+		/**
+		 * Returns the {@link MongoPersistentEntity} that field is conatined in.
+		 * 
+		 * @return
+		 */
+		public MongoPersistentEntity<?> getPropertyEntity() {
+			return null;
+		}
+
+		/**
+		 * Returns whether the field represents an association.
+		 * 
+		 * @return
+		 */
+		public boolean isAssociation() {
+			return false;
+		}
+
+		/**
+		 * Returns the key to be used in the mapped document eventually.
+		 * 
+		 * @return
+		 */
+		public String getMappedKey() {
+			return isIdField() ? ID_KEY : name;
+		}
+	}
+
+	/**
+	 * Extension of {@link Field} to be backed with mapping metadata.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class MetadataBackedField extends Field {
+
+		private final MongoPersistentEntity<?> entity;
+		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+		private final MongoPersistentProperty property;
+
+		/**
+		 * Creates a new {@link MetadataBackedField} with the given name, {@link MongoPersistentEntity} and
+		 * {@link MappingContext}.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @param entity must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 */
+		public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
+
+			super(name);
+
+			Assert.notNull(entity, "MongoPersistentEntity must not be null!");
+
+			this.entity = entity;
+			this.mappingContext = context;
+
+			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
+			this.property = path == null ? null : path.getLeafProperty();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#with(java.lang.String)
+		 */
+		@Override
+		public MetadataBackedField with(String name) {
+			return new MetadataBackedField(name, entity, mappingContext);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdKey()
+		 */
+		@Override
+		public boolean isIdField() {
+
+			MongoPersistentProperty idProperty = entity.getIdProperty();
+
+			if (idProperty != null) {
+				return idProperty.getName().equals(name) || idProperty.getFieldName().equals(name);
+			}
+
+			return DEFAULT_ID_NAMES.contains(name);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getProperty()
+		 */
+		@Override
+		public MongoPersistentProperty getProperty() {
+			return property;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getEntity()
+		 */
+		@Override
+		public MongoPersistentEntity<?> getPropertyEntity() {
+			MongoPersistentProperty property = getProperty();
+			return property == null ? null : mappingContext.getPersistentEntity(property);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isAssociation()
+		 */
+		@Override
+		public boolean isAssociation() {
+
+			MongoPersistentProperty property = getProperty();
+			return property == null ? false : property.isAssociation();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey()
+		 */
+		@Override
+		public String getMappedKey() {
+
+			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
+			return path == null ? name : path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE);
+		}
+
+		private PersistentPropertyPath<MongoPersistentProperty> getPath(String name) {
+
+			try {
+				PropertyPath path = PropertyPath.from(name, entity.getTypeInformation());
+				return mappingContext.getPersistentPropertyPath(path);
+			} catch (PropertyReferenceException e) {
+				return null;
+			}
+		}
+	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Spring Data MongoDB specific converter infrastructure.
+ */
+package org.springframework.data.mongodb.core.convert;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/CustomMetric.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/CustomMetric.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+/**
+ * Value object to create custom {@link Metric}s on the fly.
+ * 
+ * @author Oliver Gierke
+ */
+public class CustomMetric implements Metric {
+
+	private final double multiplier;
+
+	/**
+	 * Creates a custom {@link Metric} using the given multiplier.
+	 * 
+	 * @param multiplier
+	 */
+	public CustomMetric(double multiplier) {
+		this.multiplier = multiplier;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier()
+	 */
+	public double getMultiplier() {
+		return multiplier;
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB geo-spatial queries.
+ */
+package org.springframework.data.mongodb.core.geo;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB document indexing.
+ */
+package org.springframework.data.mongodb.core.index;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
@@ -23,7 +23,6 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
@@ -38,7 +37,6 @@ import org.springframework.util.StringUtils;
 * 
 * @author Jon Brisbin
 * @author Oliver Gierke
- * @author Patryk Wasik
 */
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
 		MongoPersistentEntity<T>, ApplicationContextAware {
@@ -47,8 +45,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	private final SpelExpressionParser parser;
 	private final StandardEvaluationContext context;

-	private MongoPersistentProperty versionProperty;
-
 	/**
 	 * Creates a new {@link BasicMongoPersistentEntity} with the given {@link TypeInformation}. Will default the
 	 * collection name to the entities simple type name.
@@ -73,27 +69,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		}
 	}

-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.MutablePersistentEntity#addPersistentProperty(P)
-	 */
-	@Override
-	public void addPersistentProperty(MongoPersistentProperty property) {
-
-		if (property.isVersionProperty()) {
-
-			if (this.versionProperty != null) {
-				throw new MappingException(String.format(
-						"Attempt to add version property %s but already have property %s registered "
-								+ "as version. Check your mapping configuration!", property.getField(), versionProperty.getField()));
-			}
-
-			this.versionProperty = property;
-		}
-
-		super.addPersistentProperty(property);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
@@ -110,27 +85,10 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection()
 	 */
 	public String getCollection() {
-
 		Expression expression = parser.parseExpression(collection, ParserContext.TEMPLATE_EXPRESSION);
 		return expression.getValue(context, String.class);
 	}

-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getVersionProperty()
-	 */
-	public MongoPersistentProperty getVersionProperty() {
-		return versionProperty;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasVersionProperty()
-	 */
-	public boolean hasVersionProperty() {
-		return getVersionProperty() != null;
-	}
-
 	/**
 	 * {@link Comparator} implementation inspecting the {@link MongoPersistentProperty}'s order.
 	 * 
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
@@ -153,14 +153,6 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		return getField().getAnnotation(DBRef.class);
 	}

-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isVersionProperty()
-	 */
-	public boolean isVersionProperty() {
-		return getField().isAnnotationPresent(Version.class);
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess()
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core.mapping;

 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
+import java.util.AbstractMap;

 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -51,7 +52,7 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 	 */
 	@Override
 	protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
-		return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType());
+		return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType()) && !AbstractMap.class.isAssignableFrom(type.getType());
 	}

 	/*
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java
@@ -21,7 +21,6 @@ import org.springframework.data.mapping.PersistentEntity;
 * MongoDB specific {@link PersistentEntity} abstraction.
 * 
 * @author Oliver Gierke
- * @author Patryk Wasik
 */
 public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersistentProperty> {

@@ -31,19 +30,4 @@ public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersi
 	 * @return
 	 */
 	String getCollection();
-
-	/**
-	 * Returns the {@link MongoPersistentProperty} that represents the version attribute of an entity. Will not be
-	 * {@literal null} if {@link #hasVersionProperty()}.
-	 * 
-	 * @return
-	 */
-	MongoPersistentProperty getVersionProperty();
-
-	/**
-	 * Returns whether the entity has a property representing the version of the entity.
-	 * 
-	 * @return
-	 */
-	boolean hasVersionProperty();
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java
@@ -56,13 +56,6 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	DBRef getDBRef();

-	/**
-	 * Returns whether the property is representing the version attribute of an entity.
-	 * 
-	 * @return
-	 */
-	boolean isVersionProperty();
-
 	/**
 	 * Simple {@link Converter} implementation to transform a {@link MongoPersistentProperty} into its field name.
 	 * 
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Version.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Version.java
@@ -27,10 +27,13 @@ import java.lang.annotation.Target;
 * 
 * @since 1.4
 * @author Patryk Wasik
+ * @deprecated use {@link org.springframework.data.annotation.Version} instead.
 */
+@Deprecated
@Documented
@Target({ FIELD })
@Retention(RUNTIME)
+@org.springframework.data.annotation.Version
 public @interface Version {

 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
+import org.springframework.context.ApplicationListener;
+import org.springframework.data.auditing.AuditingHandler;
+import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.util.Assert;
+
+/**
+ * Event listener to populate auditing related fields on an entity about to be saved.
+ * 
+ * @author Oliver Gierke
+ */
+public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>> {
+
+	private final IsNewAwareAuditingHandler<Object> auditingHandler;
+
+	/**
+	 * Creates a new {@link AuditingEventListener} using the given {@link MappingContext} and {@link AuditingHandler}.
+	 * 
+	 * @param auditingHandler must not be {@literal null}.
+	 */
+	public AuditingEventListener(IsNewAwareAuditingHandler<Object> auditingHandler) {
+
+		Assert.notNull(auditingHandler, "IsNewAwareAuditingHandler must not be null!");
+		this.auditingHandler = auditingHandler;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
+	 */
+	public void onApplicationEvent(BeforeConvertEvent<Object> event) {
+
+		Object entity = event.getSource();
+		auditingHandler.markAudited(entity);
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 the original author or authors.
 *
 * 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
+ *      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,
@@ -13,15 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core.mapping.event;

 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Event being thrown before a domain object is converted to be persisted.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
 */
 public class BeforeConvertEvent<T> extends MongoMappingEvent<T> {

-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 252614269008845243L;

 	public BeforeConvertEvent(T source) {
 		super(source, null);
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Mapping event callback infrastructure for the MongoDB document-to-object mapping subsystem.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for the MongoDB document-to-object mapping subsystem.
+ */
+package org.springframework.data.mongodb.core.mapping;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,30 +16,42 @@
 package org.springframework.data.mongodb.core.mapreduce;

 /**
+ * Value object to encapsulate results of a map-reduce count.
+ * 
 * @author Mark Pollack
+ * @author Oliver Gierke
 */
 public class MapReduceCounts {

-	private final int inputCount;
-	private final int emitCount;
-	private final int outputCount;
+	public static MapReduceCounts NONE = new MapReduceCounts(-1, -1, -1);
+
+	private final long inputCount;
+	private final long emitCount;
+	private final long outputCount;
+
+	/**
+	 * Creates a new {@link MapReduceCounts} using the given input count, emit count, and output count.
+	 * 
+	 * @param inputCount
+	 * @param emitCount
+	 * @param outputCount
+	 */
+	public MapReduceCounts(long inputCount, long emitCount, long outputCount) {

-	public MapReduceCounts(int inputCount, int emitCount, int outputCount) {
-		super();
 		this.inputCount = inputCount;
 		this.emitCount = emitCount;
 		this.outputCount = outputCount;
 	}

-	public int getInputCount() {
+	public long getInputCount() {
 		return inputCount;
 	}

-	public int getEmitCount() {
+	public long getEmitCount() {
 		return emitCount;
 	}

-	public int getOutputCount() {
+	public long getOutputCount() {
 		return outputCount;
 	}

@@ -59,12 +71,15 @@ public class MapReduceCounts {
 	 */
 	@Override
 	public int hashCode() {
+
 		final int prime = 31;
-		int result = 1;
+		long result = 1;
+
 		result = prime * result + emitCount;
 		result = prime * result + inputCount;
 		result = prime * result + outputCount;
-		return result;
+
+		return Long.valueOf(result).intValue();
 	}

 	/*
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java
@@ -118,15 +118,14 @@ public class MapReduceResults<T> implements Iterable<T> {
 		DBObject counts = (DBObject) rawResults.get("counts");

 		if (counts == null) {
-			return new MapReduceCounts(-1, -1, -1);
+			return MapReduceCounts.NONE;
 		}

 		if (counts.get("input") != null && counts.get("emit") != null && counts.get("output") != null) {
-			return new MapReduceCounts((Integer) counts.get("input"), (Integer) counts.get("emit"),
-					(Integer) counts.get("output"));
+			return new MapReduceCounts(getAsLong(counts, "input"), getAsLong(counts, "emit"), getAsLong(counts, "output"));
 		}

-		return new MapReduceCounts(-1, -1, -1);
+		return MapReduceCounts.NONE;
 	}

 	/**
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB map-reduce operations.
+ */
+package org.springframework.data.mongodb.core.mapreduce;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,14 +18,15 @@ package org.springframework.data.mongodb.core.query;
 import java.util.HashMap;
 import java.util.Map;

+import org.springframework.util.ObjectUtils;
+
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;

 public class Field {

-	private Map<String, Integer> criteria = new HashMap<String, Integer>();
-
-	private Map<String, Object> slices = new HashMap<String, Object>();
+	private final Map<String, Integer> criteria = new HashMap<String, Integer>();
+	private final Map<String, Object> slices = new HashMap<String, Object>();

 	public Field include(String key) {
 		criteria.put(key, Integer.valueOf(1));
@@ -50,11 +51,54 @@ public class Field {
 	public DBObject getFieldsObject() {
 		DBObject dbo = new BasicDBObject();
 		for (String k : criteria.keySet()) {
-			dbo.put(k, (criteria.get(k)));
+			dbo.put(k, criteria.get(k));
 		}
 		for (String k : slices.keySet()) {
-			dbo.put(k, new BasicDBObject("$slice", (slices.get(k))));
+			dbo.put(k, new BasicDBObject("$slice", slices.get(k)));
 		}
 		return dbo;
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object object) {
+
+		if (this == object) {
+			return true;
+		}
+
+		if (!(object instanceof Field)) {
+			return false;
+		}
+
+		Field that = (Field) object;
+
+		if (!this.criteria.equals(that.criteria)) {
+			return false;
+		}
+
+		if (!this.slices.equals(that.slices)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int result = 17;
+
+		result += 31 * ObjectUtils.nullSafeHashCode(this.criteria);
+		result += 31 * ObjectUtils.nullSafeHashCode(this.slices);
+
+		return result;
+	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 */
 package org.springframework.data.mongodb.core.query;

+import org.springframework.data.mongodb.core.geo.CustomMetric;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.Metric;
 import org.springframework.data.mongodb.core.geo.Metrics;
@@ -31,10 +32,12 @@ import com.mongodb.DBObject;
 */
 public class NearQuery {

-	private final DBObject criteria;
+	private final Point point;
 	private Query query;
-	private Double maxDistance;
+	private Distance maxDistance;
 	private Metric metric;
+	private boolean spherical;
+	private Integer num;

 	/**
 	 * Creates a new {@link NearQuery}.
@@ -45,13 +48,11 @@ public class NearQuery {

 		Assert.notNull(point);

-		this.criteria = new BasicDBObject();
-		this.criteria.put("near", point.asList());
+		this.point = point;
+		this.spherical = false;

-		this.metric = metric;
 		if (metric != null) {
-			spherical(true);
-			distanceMultiplier(metric);
+			in(metric);
 		}
 	}

@@ -105,12 +106,13 @@ public class NearQuery {
 	}

 	/**
-	 * Returns the {@link Metric} underlying the actual query.
+	 * Returns the {@link Metric} underlying the actual query. If no metric was set explicitly {@link Metrics#NEUTRAL}
+	 * will be returned.
 	 * 
-	 * @return
+	 * @return will never be {@literal null}.
 	 */
 	public Metric getMetric() {
-		return metric;
+		return metric == null ? Metrics.NEUTRAL : metric;
 	}

 	/**
@@ -120,68 +122,96 @@ public class NearQuery {
 	 * @return
 	 */
 	public NearQuery num(int num) {
-		this.criteria.put("num", num);
+		this.num = num;
 		return this;
 	}

 	/**
-	 * Sets the max distance results shall have from the configured origin. Will normalize the given value using a
-	 * potentially already configured {@link Metric}.
+	 * Sets the max distance results shall have from the configured origin. If a {@link Metric} was set before the given
+	 * value will be interpreted as being a value in that metric. E.g.
+	 * 
+	 * <pre>
+	 * NearQuery query = near(10.0, 20.0, Metrics.KILOMETERS).maxDistance(150);
+	 * </pre>
+	 * 
+	 * Will set the maximum distance to 150 kilometers.
 	 * 
 	 * @param maxDistance
 	 * @return
 	 */
 	public NearQuery maxDistance(double maxDistance) {
-		this.maxDistance = getNormalizedDistance(maxDistance, this.metric);
-		return this;
+		return maxDistance(new Distance(maxDistance, getMetric()));
 	}

 	/**
 	 * Sets the maximum distance supplied in a given metric. Will normalize the distance but not reconfigure the query's
-	 * {@link Metric}.
+	 * result {@link Metric} if one was configured before.
 	 * 
 	 * @param maxDistance
 	 * @param metric must not be {@literal null}.
 	 * @return
 	 */
 	public NearQuery maxDistance(double maxDistance, Metric metric) {
+
 		Assert.notNull(metric);
-		this.spherical(true);
-		return maxDistance(getNormalizedDistance(maxDistance, metric));
+		return maxDistance(new Distance(maxDistance, metric));
 	}

 	/**
-	 * Sets the maximum distance to the given {@link Distance}.
+	 * Sets the maximum distance to the given {@link Distance}. Will set the returned {@link Metric} to be the one of the
+	 * given {@link Distance} if no {@link Metric} was set before.
 	 * 
-	 * @param distance
+	 * @param distance must not be {@literal null}.
 	 * @return
 	 */
 	public NearQuery maxDistance(Distance distance) {
+
 		Assert.notNull(distance);
-		return maxDistance(distance.getValue(), distance.getMetric());
+
+		if (distance.getMetric() != Metrics.NEUTRAL) {
+			this.spherical(true);
+		}
+
+		if (this.metric == null) {
+			in(distance.getMetric());
+		}
+
+		this.maxDistance = distance;
+		return this;
 	}

 	/**
-	 * Configures a distance multiplier the resulting distances get applied.
+	 * Returns the maximum {@link Distance}.
+	 * 
+	 * @return
+	 */
+	public Distance getMaxDistance() {
+		return this.maxDistance;
+	}
+
+	/**
+	 * Configures a {@link CustomMetric} with the given multiplier.
 	 * 
 	 * @param distanceMultiplier
 	 * @return
 	 */
 	public NearQuery distanceMultiplier(double distanceMultiplier) {
-		this.criteria.put("distanceMultiplier", distanceMultiplier);
+
+		this.metric = new CustomMetric(distanceMultiplier);
 		return this;
 	}

 	/**
-	 * Configures the distance multiplier to the multiplier of the given {@link Metric}. Does <em>not</em> recalculate the
-	 * {@link #maxDistance(double)}.
+	 * Configures the distance multiplier to the multiplier of the given {@link Metric}.
 	 * 
+	 * @deprecated use {@link #in(Metric)} instead.
 	 * @param metric must not be {@literal null}.
 	 * @return
 	 */
+	@Deprecated
 	public NearQuery distanceMultiplier(Metric metric) {
 		Assert.notNull(metric);
-		return distanceMultiplier(metric.getMultiplier());
+		return in(metric);
 	}

 	/**
@@ -191,10 +221,19 @@ public class NearQuery {
 	 * @return
 	 */
 	public NearQuery spherical(boolean spherical) {
-		this.criteria.put("spherical", spherical);
+		this.spherical = spherical;
 		return this;
 	}

+	/**
+	 * Returns whether spharical values will be returned.
+	 * 
+	 * @return
+	 */
+	public boolean isSpherical() {
+		return this.spherical;
+	}
+
 	/**
 	 * Will cause the results' distances being returned in kilometers. Sets {@link #distanceMultiplier(double)} and
 	 * {@link #spherical(boolean)} accordingly.
@@ -215,6 +254,18 @@ public class NearQuery {
 		return adaptMetric(Metrics.MILES);
 	}

+	/**
+	 * Will cause the results' distances being returned in the given metric. Sets {@link #distanceMultiplier(double)}
+	 * accordingly as well as {@link #spherical(boolean)} if the given {@link Metric} is not {@link Metrics#NEUTRAL}.
+	 * 
+	 * @param metric the metric the results shall be returned in. Uses {@link Metrics#NEUTRAL} if {@literal null} is
+	 *          passed.
+	 * @return
+	 */
+	public NearQuery in(Metric metric) {
+		return adaptMetric(metric == null ? Metrics.NEUTRAL : metric);
+	}
+
 	/**
 	 * Configures the given {@link Metric} to be used as base on for this query and recalculate the maximum distance if no
 	 * metric was set before.
@@ -223,12 +274,12 @@ public class NearQuery {
 	 */
 	private NearQuery adaptMetric(Metric metric) {

-		if (this.metric == null && maxDistance != null) {
-			maxDistance(this.maxDistance, metric);
+		if (metric != Metrics.NEUTRAL) {
+			spherical(true);
 		}

-		spherical(true);
-		return distanceMultiplier(metric);
+		this.metric = metric;
+		return this;
 	}

 	/**
@@ -249,18 +300,27 @@ public class NearQuery {
 	 */
 	public DBObject toDBObject() {

-		BasicDBObject dbObject = new BasicDBObject(criteria.toMap());
+		BasicDBObject dbObject = new BasicDBObject();
+
 		if (query != null) {
 			dbObject.put("query", query.getQueryObject());
 		}
+
 		if (maxDistance != null) {
-			dbObject.put("maxDistance", maxDistance);
+			dbObject.put("maxDistance", this.maxDistance.getNormalizedValue());
 		}

+		if (metric != null) {
+			dbObject.put("distanceMultiplier", metric.getMultiplier());
+		}
+
+		if (num != null) {
+			dbObject.put("num", num);
+		}
+
+		dbObject.put("near", point.asList());
+		dbObject.put("spherical", spherical);
+
 		return dbObject;
 	}
-
-	private double getNormalizedDistance(double distance, Metric metric) {
-		return metric == null ? distance : distance / metric.getMultiplier();
-	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,22 +46,33 @@ public class Query {
 	private String hint;

 	/**
-	 * Static factory method to create a Query using the provided criteria
+	 * Static factory method to create a {@link Query} using the provided {@link Criteria}.
 	 * 
-	 * @param critera
+	 * @param criteria must not be {@literal null}.
 	 * @return
 	 */
-	public static Query query(Criteria critera) {
-		return new Query(critera);
+	public static Query query(Criteria criteria) {
+		return new Query(criteria);
 	}

 	public Query() {
 	}

+	/**
+	 * Creates a new {@link Query} using the given {@link Criteria}.
+	 * 
+	 * @param criteria must not be {@literal null}.
+	 */
 	public Query(Criteria criteria) {
 		addCriteria(criteria);
 	}

+	/**
+	 * Adds the given {@link Criteria} to the current {@link Query}.
+	 * 
+	 * @param criteria must not be {@literal null}.
+	 * @return
+	 */
 	public Query addCriteria(Criteria criteria) {
 		CriteriaDefinition existing = this.criteria.get(criteria.getKey());
 		String key = criteria.getKey();
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -52,7 +52,10 @@ public class Update {

 	/**
 	 * Creates an {@link Update} instance from the given {@link DBObject}. Allows to explicitly exlude fields from making
-	 * it into the created {@link Update} object.
+	 * it into the created {@link Update} object. Note, that this will set attributes directly and <em>not</em> use
+	 * {@literal $set}. This means fields not given in the {@link DBObject} will be nulled when executing the update. To
+	 * create an only-updating {@link Update} instance of a {@link DBObject}, call {@link #set(String, Object)} for each
+	 * value in it.
 	 * 
 	 * @param object the source {@link DBObject} to create the update from.
 	 * @param exclude the fields to exclude.
@@ -69,7 +72,7 @@ public class Update {
 				continue;
 			}

-			update.set(key, object.get(key));
+			update.modifierOps.put(key, object.get(key));
 		}

 		return update;
@@ -160,7 +163,7 @@ public class Update {
 	 * @return
 	 */
 	public Update pop(String key, Position pos) {
-		addMultiFieldOperation("$pop", key, (pos == Position.FIRST ? -1 : 1));
+		addMultiFieldOperation("$pop", key, pos == Position.FIRST ? -1 : 1);
 		return this;
 	}

@@ -214,22 +217,23 @@ public class Update {
 		return dbo;
 	}

-	@SuppressWarnings("unchecked")
 	protected void addMultiFieldOperation(String operator, String key, Object value) {
+
 		Object existingValue = this.modifierOps.get(operator);
-		LinkedHashMap<String, Object> keyValueMap;
+		DBObject keyValueMap;
+
 		if (existingValue == null) {
-			keyValueMap = new LinkedHashMap<String, Object>();
+			keyValueMap = new BasicDBObject();
 			this.modifierOps.put(operator, keyValueMap);
 		} else {
-			if (existingValue instanceof LinkedHashMap) {
-				keyValueMap = (LinkedHashMap<String, Object>) existingValue;
+			if (existingValue instanceof BasicDBObject) {
+				keyValueMap = (BasicDBObject) existingValue;
 			} else {
 				throw new InvalidDataAccessApiUsageException("Modifier Operations should be a LinkedHashMap but was "
 						+ existingValue.getClass());
 			}
 		}
+
 		keyValueMap.put(key, value);
 	}
-
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import com.mongodb.gridfs.GridFSFile;
 * Collection of operations to store and read files from MongoDB GridFS.
 * 
 * @author Oliver Gierke
+ * @author Philipp Schneider
 */
 public interface GridFsOperations extends ResourcePatternResolver {

@@ -42,27 +43,60 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 */
 	GridFSFile store(InputStream content, String filename);

+	/**
+	 * Stores the given content into a file with the given name and content type.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @param contentType can be {@literal null}.
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename, String contentType);
+
 	/**
 	 * Stores the given content into a file with the given name using the given metadata. The metadata object will be
 	 * marshalled before writing.
 	 * 
 	 * @param content must not be {@literal null}.
 	 * @param filename must not be {@literal null} or empty.
-	 * @param metadata
+	 * @param metadata can be {@literal null}.
 	 * @return the {@link GridFSFile} just created
 	 */
 	GridFSFile store(InputStream content, String filename, Object metadata);

+	/**
+	 * Stores the given content into a file with the given name and content type using the given metadata. The metadata
+	 * object will be marshalled before writing.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @param contentType can be {@literal null}.
+	 * @param metadata can be {@literal null}
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename, String contentType, Object metadata);
+
 	/**
 	 * Stores the given content into a file with the given name using the given metadata.
 	 * 
 	 * @param content must not be {@literal null}.
 	 * @param filename must not be {@literal null} or empty.
-	 * @param metadata must not be {@literal null}.
+	 * @param metadata can be {@literal null}.
 	 * @return the {@link GridFSFile} just created
 	 */
 	GridFSFile store(InputStream content, String filename, DBObject metadata);

+	/**
+	 * Stores the given content into a file with the given name and content type using the given metadata.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @param contentType can be {@literal null}.
+	 * @param metadata can be {@literal null}.
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename, String contentType, DBObject metadata);
+
 	/**
 	 * Returns all files matching the given query. Note, that currently {@link Sort} criterias defined at the
 	 * {@link Query} will not be regarded as MongoDB does not support ordering for GridFS file access.
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ import com.mongodb.gridfs.GridFSInputFile;
 * {@link GridFsOperations} implementation to store content into MongoDB GridFS.
 * 
 * @author Oliver Gierke
+ * @author Philipp Schneider
 */
 public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {

@@ -87,15 +88,37 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 		return store(content, filename, (Object) null);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String)
+	 */
+	public GridFSFile store(InputStream content, String filename, String contentType) {
+		return store(content, filename, contentType, (Object) null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.Object)
 	 */
 	public GridFSFile store(InputStream content, String filename, Object metadata) {

-		DBObject dbObject = new BasicDBObject();
-		converter.write(metadata, dbObject);
-		return store(content, filename, dbObject);
+		return store(content, filename, null, metadata);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String, java.lang.Object)
+	 */
+	public GridFSFile store(InputStream content, String filename, String contentType, Object metadata) {
+
+		DBObject dbObject = null;
+
+		if (metadata != null) {
+			dbObject = new BasicDBObject();
+			converter.write(metadata, dbObject);
+		}
+
+		return store(content, filename, contentType, dbObject);
 	}

 	/*
@@ -103,16 +126,30 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.DBObject)
 	 */
 	public GridFSFile store(InputStream content, String filename, DBObject metadata) {
+		return this.store(content, filename, null, metadata);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.DBObject)
+	 */
+	public GridFSFile store(InputStream content, String filename, String contentType, DBObject metadata) {

 		Assert.notNull(content);
 		Assert.hasText(filename);
-		Assert.notNull(metadata);

 		GridFSInputFile file = getGridFs().createFile(content);
 		file.setFilename(filename);
-		file.setMetaData(metadata);
-		file.save();

+		if (metadata != null) {
+			file.setMetaData(metadata);
+		}
+
+		if (contentType != null) {
+			file.setContentType(contentType);
+		}
+
+		file.save();
 		return file;
 	}

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB GridFS feature.
+ */
+package org.springframework.data.mongodb.gridfs;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ServerInfo.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ServerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,19 +15,20 @@
 */
 package org.springframework.data.mongodb.monitor;

-import java.net.InetAddress;
 import java.net.UnknownHostException;

-import com.mongodb.Mongo;
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.jmx.support.MetricType;

+import com.mongodb.Mongo;
+
 /**
 * Expose basic server information via JMX
 * 
 * @author Mark Pollack
+ * @author Thomas Darimont
 */
@ManagedResource(description = "Server Information")
 public class ServerInfo extends AbstractMonitor {
@@ -36,9 +37,20 @@ public class ServerInfo extends AbstractMonitor {
 		this.mongo = mongo;
 	}

+	/**
+	 * Returns the hostname of the used server reported by mongo.
+	 * 
+	 * @return the reported hostname can also be an IP address.
+	 * @throws UnknownHostException
+	 */
 	@ManagedOperation(description = "Server host name")
 	public String getHostName() throws UnknownHostException {
-		return InetAddress.getLocalHost().getHostName();
+
+		/* 
+		 * UnknownHostException is not necessary anymore, but clients could have
+		 * called this method in a try..catch(UnknownHostException) already
+		 */
+		return getServerStatus().getServerUsed().getHost();
 	}

 	@ManagedMetric(displayName = "Uptime Estimate")
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Spring Data's MongoDB abstraction.
+ */
+package org.springframework.data.mongodb;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * CDI support for MongoDB specific repository implementation.
+ */
+package org.springframework.data.mongodb.repository.cdi;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support infrastructure for the configuration of MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.config;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -117,7 +117,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {

 		protected List<?> readCollection(Query query) {

-			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();

 			String collectionName = metadata.getCollectionName();
 			return operations.find(query, metadata.getJavaType(), collectionName);
@@ -175,7 +175,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		Object execute(Query query) {

-			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();
 			long count = operations.count(query, metadata.getCollectionName());

 			List<?> result = operations.find(query.with(pageable), metadata.getJavaType(), metadata.getCollectionName());
@@ -198,8 +198,8 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		@Override
 		Object execute(Query query) {

-			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
-			return operations.findOne(query, entityInformation.getJavaType());
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			return operations.findOne(query, metadata.getJavaType());
 		}
 	}

@@ -236,8 +236,8 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		 */
 		Object execute(Query query, Query countQuery) {

-			MongoEntityInformation<?, ?> information = method.getEntityInformation();
-			long count = operations.count(countQuery, information.getCollectionName());
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			long count = operations.count(countQuery, metadata.getCollectionName());

 			return new GeoPage<Object>(doExecuteQuery(query), accessor.getPageable(), count);
 		}
@@ -254,18 +254,23 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {

 			Distance maxDistance = accessor.getMaxDistance();
 			if (maxDistance != null) {
-				nearQuery.maxDistance(maxDistance);
+				nearQuery.maxDistance(maxDistance).in(maxDistance.getMetric());
 			}

-			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
-			return (GeoResults<Object>) operations.geoNear(nearQuery, entityInformation.getJavaType(),
-					entityInformation.getCollectionName());
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			return (GeoResults<Object>) operations.geoNear(nearQuery, metadata.getJavaType(), metadata.getCollectionName());
 		}

 		private boolean isListOfGeoResult() {

 			TypeInformation<?> returnType = method.getReturnType();
-			return returnType.getType().equals(List.class) && GeoResult.class.equals(returnType.getComponentType());
+
+			if (!returnType.getType().equals(List.class)) {
+				return false;
+			}
+
+			TypeInformation<?> componentType = returnType.getComponentType();
+			return componentType == null ? false : GeoResult.class.equals(componentType.getType());
 		}
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.repository.query.ParameterAccessor;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;

@@ -85,12 +86,12 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return delegate.getSort();
 	}

-	/* (non-Javadoc)
-	  * @see org.springframework.data.repository.query.ParameterAccessor#getBindableParameter(int)
-	  */
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
+	 */
 	public Object getBindableValue(int index) {
-
-		return getConvertedValue(delegate.getBindableValue(index));
+		return getConvertedValue(delegate.getBindableValue(index), null);
 	}

 	/*
@@ -101,7 +102,8 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return delegate.getMaxDistance();
 	}

-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
 	 */
 	public Point getGeoNearLocation() {
@@ -111,11 +113,12 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 	/**
 	 * Converts the given value with the underlying {@link MongoWriter}.
 	 * 
-	 * @param value
+	 * @param value can be {@literal null}.
+	 * @param typeInformation can be {@literal null}.
 	 * @return
 	 */
-	private Object getConvertedValue(Object value) {
-		return writer.convertToMongoType(value);
+	private Object getConvertedValue(Object value, TypeInformation<?> typeInformation) {
+		return writer.convertToMongoType(value, typeInformation == null ? null : typeInformation.getActualType());
 	}

 	/* 
@@ -186,7 +189,7 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 				}
 			}

-			return getConvertedValue(next);
+			return getConvertedValue(next, property.getTypeInformation());
 		}

 		/*
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/EntityInformationCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/EntityInformationCreator.java
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.springframework.data.mongodb.repository.query;
-
-import java.io.Serializable;
-
-/**
- * Interface for components being able to provide {@link EntityInformationCreator} for a given {@link Class}.
- * 
- * @author Oliver Gierke
- */
-public interface EntityInformationCreator {
-
-	/**
-	 * Returns a {@link MongoEntityInformation} for the given domain class.
-	 * 
-	 * @param domainClass the domain class to create the {@link MongoEntityInformation} for, must not be {@literal null}.
-	 * @return
-	 */
-	<T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
-
-	/**
-	 * Returns a {@link MongoEntityInformation} for the given domain class and class to retrieve the collection to query
-	 * against from.
-	 * 
-	 * @param domainClass the domain class to create the {@link MongoEntityInformation} for, must not be {@literal null}.
-	 * @param collectionClass the class to derive the collection from queries to retrieve the domain classes from shall be
-	 *          ran against, must not be {@literal null}.
-	 * @return
-	 */
-	<T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
-			Class<?> collectionClass);
-
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.repository.query;
+
+import org.springframework.data.repository.core.EntityMetadata;
+
+/**
+ * Extension of {@link EntityMetadata} to additionally expose the collection name an entity shall be persisted to.
+ * 
+ * @author Oliver Gierke
+ */
+public interface MongoEntityMetadata<T> extends EntityMetadata<T> {
+
+	/**
+	 * Returns the name of the collection the entity shall be persisted to.
+	 * 
+	 * @return
+	 */
+	String getCollectionName();
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -268,15 +268,16 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	private String toLikeRegex(String source, Type type) {

 		switch (type) {
-		case STARTING_WITH:
-			source = source + "*";
-			break;
-		case ENDING_WITH:
-			source = "*" + source;
-			break;
-		case CONTAINING:
-			source = "*" + source + "*";
-			break;
+			case STARTING_WITH:
+				source = "^" + source;
+				break;
+			case ENDING_WITH:
+				source = source + "$";
+				break;
+			case CONTAINING:
+				source = "*" + source + "*";
+				break;
+			default:
 		}

 		return source.replaceAll("\\*", ".*");
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,9 +20,12 @@ import java.util.Arrays;
 import java.util.List;

 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.geo.GeoPage;
 import org.springframework.data.mongodb.core.geo.GeoResult;
 import org.springframework.data.mongodb.core.geo.GeoResults;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.Parameters;
@@ -33,8 +36,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

 /**
- * TODO - Extract methods for {@link #getAnnotatedQuery()} into superclass as it is currently copied from Spring Data
- * JPA
+ * Mongo specific implementation of {@link QueryMethod}.
 * 
 * @author Oliver Gierke
 */
@@ -45,19 +47,24 @@ public class MongoQueryMethod extends QueryMethod {
 			.asList(GeoResult.class, GeoResults.class, GeoPage.class);

 	private final Method method;
-	private final MongoEntityInformation<?, ?> entityInformation;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+
+	private MongoEntityMetadata<?> metadata;

 	/**
 	 * Creates a new {@link MongoQueryMethod} from the given {@link Method}.
 	 * 
 	 * @param method
 	 */
-	public MongoQueryMethod(Method method, RepositoryMetadata metadata, EntityInformationCreator entityInformationCreator) {
+	public MongoQueryMethod(Method method, RepositoryMetadata metadata,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
 		super(method, metadata);
-		Assert.notNull(entityInformationCreator, "DefaultEntityInformationCreator must not be null!");
+
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+
 		this.method = method;
-		this.entityInformation = entityInformationCreator.getEntityInformation(metadata.getReturnedDomainClass(method),
-				getDomainClass());
+		this.mappingContext = mappingContext;
 	}

 	/*
@@ -101,14 +108,30 @@ public class MongoQueryMethod extends QueryMethod {
 		return StringUtils.hasText(value) ? value : null;
 	}

-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.QueryMethod#getEntityInformation()
 	 */
 	@Override
-	public MongoEntityInformation<?, ?> getEntityInformation() {
+	@SuppressWarnings("unchecked")
+	public MongoEntityMetadata<?> getEntityInformation() {

-		return entityInformation;
+		if (metadata == null) {
+
+			Class<?> returnedObjectType = getReturnedObjectType();
+			Class<?> domainClass = getDomainClass();
+
+			MongoPersistentEntity<?> returnedEntity = mappingContext.getPersistentEntity(getReturnedObjectType());
+			MongoPersistentEntity<?> managedEntity = mappingContext.getPersistentEntity(domainClass);
+			returnedEntity = returnedEntity == null ? managedEntity : returnedEntity;
+			MongoPersistentEntity<?> collectionEntity = domainClass.isAssignableFrom(returnedObjectType) ? returnedEntity
+					: managedEntity;
+
+			this.metadata = new SimpleMongoEntityMetadata<Object>((Class<Object>) returnedEntity.getType(),
+					collectionEntity.getCollection());
+		}
+
+		return this.metadata;
 	}

 	/*
@@ -121,12 +144,11 @@ public class MongoQueryMethod extends QueryMethod {
 	}

 	/**
-	 * Returns whether te query is a geoNear query.
+	 * Returns whether te query is a geo near query.
 	 * 
 	 * @return
 	 */
 	public boolean isGeoNearQuery() {
-
 		return isGeoNearQuery(this.method);
 	}

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.repository.query;
+
+import org.springframework.util.Assert;
+
+/**
+ * Bean based implementation of {@link MongoEntityMetadata}.
+ * 
+ * @author Oliver Gierke
+ */
+class SimpleMongoEntityMetadata<T> implements MongoEntityMetadata<T> {
+
+	private final Class<T> type;
+	private final String collectionName;
+
+	/**
+	 * Creates a new {@link SimpleMongoEntityMetadata} using the given type and collection name.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @param collectionName must not be {@literal null} or empty.
+	 */
+	public SimpleMongoEntityMetadata(Class<T> type, String collectionName) {
+
+		Assert.notNull(type, "Type must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+
+		this.type = type;
+		this.collectionName = collectionName;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.core.EntityMetadata#getJavaType()
+	 */
+	public Class<T> getJavaType() {
+		return type;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.query.MongoEntityMetadata#getCollectionName()
+	 */
+	public String getCollectionName() {
+		return collectionName;
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Query derivation mechanism for MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.query;
+
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/DefaultEntityInformationCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/DefaultEntityInformationCreator.java
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.springframework.data.mongodb.repository.support;
-
-import java.io.Serializable;
-
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.repository.query.EntityInformationCreator;
-import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.util.Assert;
-
-/**
- * Simple {@link EntityInformationCreator} to to create {@link MongoEntityInformation} instances based on a
- * {@link MappingContext}.
- * 
- * @author Oliver Gierke
- */
-public class DefaultEntityInformationCreator implements EntityInformationCreator {
-
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	public DefaultEntityInformationCreator(
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
-		this.mappingContext = mappingContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.support.EntityInformationCreator#getEntityInformation(java.lang.Class)
-	 */
-	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return getEntityInformation(domainClass, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.support.EntityInformationCreator#getEntityInformation(java.lang.Class, java.lang.Class)
-	 */
-	@SuppressWarnings("unchecked")
-	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
-			Class<?> collectionClass) {
-
-		MongoPersistentEntity<T> persistentEntity = (MongoPersistentEntity<T>) mappingContext
-				.getPersistentEntity(domainClass);
-		String customCollectionName = collectionClass == null ? null : mappingContext.getPersistentEntity(collectionClass)
-				.getCollection();
-
-		return new MappingMongoEntityInformation<T, ID>(persistentEntity, customCollectionName);
-	}
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.query.Order;
-import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.mongodb.repository.query.MongoEntityMetadata;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
 import org.springframework.data.mongodb.repository.query.QueryUtils;
 import org.springframework.data.repository.core.support.QueryCreationListener;
@@ -85,7 +85,7 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 			}
 		}

-		MongoEntityInformation<?, ?> metadata = query.getQueryMethod().getEntityInformation();
+		MongoEntityMetadata<?> metadata = query.getQueryMethod().getEntityInformation();
 		operations.indexOps(metadata.getCollectionName()).ensureIndex(index);
 		LOG.debug(String.format("Created %s!", index));
 	}
@@ -99,4 +99,4 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 		org.springframework.data.domain.Sort.Order order = sort.getOrderFor(property);
 		return order == null ? Order.DESCENDING : order.isAscending() ? Order.ASCENDING : Order.DESCENDING;
 	}
-}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.repository.support;

 import java.io.Serializable;
+
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -57,7 +58,8 @@ public class MappingMongoEntityInformation<T, ID extends Serializable> extends A
 		this.customCollectionName = customCollectionName;
 	}

-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.support.EntityInformation#getId(java.lang.Object)
 	 */
 	@SuppressWarnings("unchecked")
@@ -65,6 +67,10 @@ public class MappingMongoEntityInformation<T, ID extends Serializable> extends A

 		MongoPersistentProperty idProperty = entityMetadata.getIdProperty();

+		if (idProperty == null) {
+			return null;
+		}
+
 		try {
 			return (ID) BeanWrapper.create(entity, null).getProperty(idProperty);
 		} catch (Exception e) {
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,10 +21,11 @@ import java.io.Serializable;
 import java.lang.reflect.Method;

 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.query.EntityInformationCreator;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.query.MongoQueryMethod;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
@@ -46,20 +47,18 @@ import org.springframework.util.Assert;
 public class MongoRepositoryFactory extends RepositoryFactorySupport {

 	private final MongoOperations mongoOperations;
-	private final EntityInformationCreator entityInformationCreator;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;

 	/**
-	 * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoTemplate} and {@link MappingContext}.
+	 * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoOperations}.
 	 * 
-	 * @param template must not be {@literal null}
-	 * @param mappingContext
+	 * @param mongoOperations must not be {@literal null}
 	 */
 	public MongoRepositoryFactory(MongoOperations mongoOperations) {

 		Assert.notNull(mongoOperations);
 		this.mongoOperations = mongoOperations;
-		this.entityInformationCreator = new DefaultEntityInformationCreator(mongoOperations.getConverter()
-				.getMappingContext());
+		this.mappingContext = mongoOperations.getConverter().getMappingContext();
 	}

 	/*
@@ -117,7 +116,7 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 		 */
 		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) {

-			MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, entityInformationCreator);
+			MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, mappingContext);
 			String namedQueryName = queryMethod.getNamedQueryName();

 			if (namedQueries.hasQuery(namedQueryName)) {
@@ -136,7 +135,16 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
 	 */
 	@Override
+	@SuppressWarnings("unchecked")
 	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return entityInformationCreator.getEntityInformation(domainClass);
+
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(domainClass);
+
+		if (entity == null) {
+			throw new MappingException(String.format("Could not lookup mapping metadata for domain class %s!",
+					domainClass.getName()));
+		}
+
+		return new MappingMongoEntityInformation<T, ID>((MongoPersistentEntity<T>) entity);
 	}
-}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java
@@ -41,8 +41,8 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 	 * @param operations the operations to set
 	 */
 	public void setMongoOperations(MongoOperations operations) {
-
 		this.operations = operations;
+		setMappingContext(operations.getConverter().getMappingContext());
 	}

 	/**
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support infrastructure for query derivation of MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.support;
+
--- a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
+++ b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
@@ -1,3 +1,4 @@
-http\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd=org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
-http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-1.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
@@ -11,8 +11,7 @@

 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd" />

--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
@@ -11,8 +11,7 @@

 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />

--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+						xmlns:beans="http://www.springframework.org/schema/beans"
+						xmlns:tool="http://www.springframework.org/schema/tool"
+						xmlns:context="http://www.springframework.org/schema/context"
+						xmlns:repository="http://www.springframework.org/schema/data/repository"
+						targetNamespace="http://www.springframework.org/schema/data/mongo"
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+
+	<xsd:element name="mongo" type="mongoType">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+Defines a Mongo instance used for accessing MongoDB'.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.Mongo"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a Mongo instance. If not configured a default com.mongodb.Mongo instance will be created.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="port" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="host" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="username" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The username to use when connecting to a MongoDB server.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="password" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The password to use when connecting to a MongoDB server.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo URI string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDbFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" type="xsd:boolean" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports type="org.springframework.data.mongodb.core.convert.MappingMongoConverter" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+        Top-level element that contains one or more custom converters to be used for mapping
+        domain objects to and from Mongo's DBObject]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType" minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string" />
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a DbFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDbFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a Mongo. Will default to 'mongo'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to 'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoTemplate">
+						The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="jmx">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a MongoDB server'.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the Mongo object that determines what server to monitor. (by default "mongo").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.mongodb.core.mapping.event.AuditingEventListener" />
+					<tool:exports type="org.springframework.data.auditing.IsNewAwareAuditingHandler" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes" />
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" />
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="NONE" />
+			<xsd:enumeration value="NORMAL" />
+			<xsd:enumeration value="SAFE" />
+			<xsd:enumeration value="FSYNC_SAFE" />
+			<xsd:enumeration value="REPLICAS_SAFE" />
+			<xsd:enumeration value="JOURNAL_SAFE" />
+			<xsd:enumeration value="MAJORITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+	<!--  MLP
+	<xsd:attributeGroup name="writeConcern">
+		<xsd:attribute name="write-concern">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="NONE" />
+					<xsd:enumeration value="NORMAL" />
+					<xsd:enumeration value="SAFE" />
+					<xsd:enumeration value="FSYNC_SAFE" />
+					<xsd:enumeration value="REPLICA_SAFE" />
+					<xsd:enumeration value="JOURNAL_SAFE" />
+					<xsd:enumeration value="MAJORITY" />
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+	-->
+	<xsd:complexType name="mongoType">
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="options" type="optionsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver options
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoOptions"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDbFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>		
+		<!-- MLP 
+		<xsd:attributeGroup ref="writeConcern" />
+		-->
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongo").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The comma delimited list of host:port entries to use for replica set/pairs.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>				
+	</xsd:complexType>
+
+	<xsd:complexType name="optionsType">
+		<xsd:attribute name="connections-per-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="threads-allowed-to-block-for-connection-multiplier" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
+then 50 threads can block more than that and an exception will be thrown.			
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-wait-time" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connect-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The connect timeout in milliseconds. 0 is default and infinite.	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The socket timeout.  0 is default and infinite.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-keep-alive" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>		
+		<xsd:attribute name="auto-connect-retry" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls whether or not on a connect, the system retries automatically.  Default is false. 
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-number" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This specifies the number of servers to wait for on the write operation, and exception raising behavior.  The 'w' option to the getlasterror command.  Defaults to 0.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls timeout for write operations in milliseconds.  The 'wtimeout' option to the getlasterror command.  Defaults to 0 (indefinite).  Greater than zero is number of milliseconds to wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-fsync" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>						
+		<xsd:attribute name="slave-ok" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>				
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+  Element defining a custom converterr.
+      ]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
@@ -19,8 +19,13 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;

 import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.test.util.ReflectionTestUtils;

 import com.mongodb.Mongo;

@@ -63,6 +68,17 @@ public class AbstractMongoConfigurationUnitTests {
 		assertScanningDisabled(" ");
 	}

+	@Test
+	public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
+
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
+		MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
+		BasicMongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(Entity.class);
+		StandardEvaluationContext spElContext = (StandardEvaluationContext) ReflectionTestUtils.getField(entity, "context");
+
+		assertThat(spElContext.getBeanResolver(), is(notNullValue()));
+	}
+
 	private static void assertScanningDisabled(final String value) throws ClassNotFoundException {

 		AbstractMongoConfiguration configuration = new SampleMongoConfiguration() {
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.joda.time.DateTime;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
+
+/**
+ * Integration test for the auditing support.
+ * 
+ * @author Oliver Gierke
+ */
+public class AuditingIntegrationTests {
+
+	@Test
+	public void enablesAuditingAndSetsPropertiesAccordingly() {
+
+		ApplicationContext context = new ClassPathXmlApplicationContext("auditing.xml", getClass());
+
+		Entity entity = new Entity();
+		BeforeConvertEvent<Entity> event = new BeforeConvertEvent<Entity>(entity);
+		context.publishEvent(event);
+
+		assertThat(entity.created, is(notNullValue()));
+		assertThat(entity.modified, is(entity.created));
+
+		entity.id = 1L;
+		event = new BeforeConvertEvent<Entity>(entity);
+		context.publishEvent(event);
+
+		assertThat(entity.created, is(notNullValue()));
+		assertThat(entity.modified, is(not(entity.created)));
+	}
+
+	class Entity {
+
+		@CreatedDate
+		DateTime created;
+
+		@LastModifiedDate
+		DateTime modified;
+
+		@Id
+		Long id;
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import com.mongodb.ServerAddress;
 * Unit tests for {@link ServerAddressPropertyEditor}.
 * 
 * @author Oliver Gierke
+ * @author Thomas Darimont
 */
 public class ServerAddressPropertyEditorUnitTests {

@@ -70,6 +71,16 @@ public class ServerAddressPropertyEditorUnitTests {
 		assertSingleAddressOfLocalhost(editor.getValue());
 	}

+	/**
+	 * @see DATAMONGO-693
+	 */
+	@Test
+	public void interpretEmptyStringAsNull() {
+
+		editor.setAsText("");
+		assertNull(editor.getValue());
+	}
+
 	private static void assertSingleAddressOfLocalhost(Object result) throws UnknownHostException {

 		assertThat(result, is(instanceOf(ServerAddress[].class)));
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java
@@ -27,7 +27,7 @@ import com.mongodb.WriteConcern;
 * 
 * @author Oliver Gierke
 */
-public class StringToWriteConcernConverterUnitTest {
+public class StringToWriteConcernConverterUnitTests {

 	StringToWriteConcernConverter converter = new StringToWriteConcernConverter();

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoDbUtilsIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoDbUtilsIntegrationTests.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.scheduling.concurrent.ThreadPoolExecutorFactoryBean;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.MongoException;
+
+/**
+ * Integration tests for {@link MongoDbUtils}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoDbUtilsIntegrationTests {
+
+	static final String DATABASE_NAME = "dbAuthTests";
+	static final UserCredentials CREDENTIALS = new UserCredentials("admin", "admin");
+
+	static Mongo mongo;
+	static MongoTemplate template;
+	static ThreadPoolExecutorFactoryBean factory;
+	static ExecutorService service;
+
+	Exception exception;
+
+	@BeforeClass
+	public static void setUp() throws Exception {
+
+		mongo = new Mongo();
+		template = new MongoTemplate(mongo, DATABASE_NAME);
+
+		// Create sample user
+		template.execute(new DbCallback<Void>() {
+			public Void doInDB(DB db) throws MongoException, DataAccessException {
+				db.addUser("admin", "admin".toCharArray());
+				return null;
+			}
+		});
+
+		factory = new ThreadPoolExecutorFactoryBean();
+		factory.setCorePoolSize(2);
+		factory.setMaxPoolSize(10);
+		factory.setWaitForTasksToCompleteOnShutdown(true);
+		factory.afterPropertiesSet();
+
+		service = factory.getObject();
+	}
+
+	@AfterClass
+	public static void tearDown() {
+
+		factory.destroy();
+
+		// Remove test database
+
+		template.execute(new DbCallback<Void>() {
+			public Void doInDB(DB db) throws MongoException, DataAccessException {
+				db.dropDatabase();
+				return null;
+			}
+		});
+	}
+
+	/**
+	 * @see DATAMONGO-585
+	 */
+	@Test
+	public void authenticatesCorrectlyInMultithreadedEnvironment() throws Exception {
+
+		Callable<Void> callable = new Callable<Void>() {
+			public Void call() throws Exception {
+
+				try {
+					DB db = MongoDbUtils.getDB(mongo, DATABASE_NAME, CREDENTIALS);
+					assertThat(db, is(notNullValue()));
+				} catch (Exception o_O) {
+					MongoDbUtilsIntegrationTests.this.exception = o_O;
+				}
+
+				return null;
+			}
+		};
+
+		List<Callable<Void>> callables = new ArrayList<Callable<Void>>();
+
+		for (int i = 0; i < 10; i++) {
+			callables.add(callable);
+		}
+
+		service.invokeAll(callables);
+
+		if (exception != null) {
+			fail("Exception occurred!" + exception);
+		}
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.NestedRuntimeException;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.dao.InvalidDataAccessResourceUsageException;
+import org.springframework.data.mongodb.UncategorizedMongoDbException;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoException.DuplicateKey;
+import com.mongodb.MongoException.Network;
+import com.mongodb.MongoInternalException;
+import com.mongodb.ServerAddress;
+
+/**
+ * Unit tests for {@link MongoExceptionTranslator}.
+ * 
+ * @author Michal Vich
+ * @author Oliver Gierke
+ */
+public class MongoExceptionTranslatorUnitTests {
+
+	MongoExceptionTranslator translator;
+
+	@Before
+	public void setUp() {
+		translator = new MongoExceptionTranslator();
+	}
+
+	@Test
+	public void translateDuplicateKey() {
+
+		DuplicateKey exception = new DuplicateKey(1, "Duplicated key");
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, DuplicateKeyException.class, "Duplicated key");
+	}
+
+	@Test
+	public void translateNetwork() {
+
+		Network exception = new Network("IOException", new IOException("IOException"));
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, DataAccessResourceFailureException.class, "IOException");
+
+	}
+
+	@Test
+	public void translateCursorNotFound() throws UnknownHostException {
+
+		MongoException.CursorNotFound exception = new MongoException.CursorNotFound(1, new ServerAddress());
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, DataAccessResourceFailureException.class);
+	}
+
+	@Test
+	public void translateToDuplicateKeyException() {
+
+		checkTranslatedMongoException(DuplicateKeyException.class, 11000);
+		checkTranslatedMongoException(DuplicateKeyException.class, 11001);
+	}
+
+	@Test
+	public void translateToDataAccessResourceFailureException() {
+
+		checkTranslatedMongoException(DataAccessResourceFailureException.class, 12000);
+		checkTranslatedMongoException(DataAccessResourceFailureException.class, 13440);
+	}
+
+	@Test
+	public void translateToInvalidDataAccessApiUsageException() {
+
+		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 10003);
+		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 12001);
+		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 12010);
+		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 12011);
+		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 12012);
+	}
+
+	@Test
+	public void translateToUncategorizedMongoDbException() {
+
+		MongoException exception = new MongoException(0, "");
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, UncategorizedMongoDbException.class);
+	}
+
+	@Test
+	public void translateMongoInternalException() {
+
+		MongoInternalException exception = new MongoInternalException("Internal exception");
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, InvalidDataAccessResourceUsageException.class);
+	}
+
+	@Test
+	public void translateUnsupportedException() {
+
+		RuntimeException exception = new RuntimeException();
+		assertThat(translator.translateExceptionIfPossible(exception), is(nullValue()));
+	}
+
+	private void checkTranslatedMongoException(Class<? extends Exception> clazz, int code) {
+
+		try {
+			translator.translateExceptionIfPossible(new MongoException(code, ""));
+			fail("Expected exception of type " + clazz.getName() + "!");
+		} catch (NestedRuntimeException e) {
+			Throwable cause = e.getRootCause();
+			assertThat(cause, is(instanceOf(MongoException.class)));
+			assertThat(((MongoException) cause).getCode(), is(code));
+		}
+	}
+
+	private static void expectExceptionWithCauseMessage(NestedRuntimeException e,
+			Class<? extends NestedRuntimeException> type) {
+		expectExceptionWithCauseMessage(e, type, null);
+	}
+
+	private static void expectExceptionWithCauseMessage(NestedRuntimeException e,
+			Class<? extends NestedRuntimeException> type, String message) {
+
+		assertThat(e, is(instanceOf(type)));
+
+		if (message != null) {
+			assertThat(e.getRootCause(), is(notNullValue()));
+			assertThat(e.getRootCause().getMessage(), containsString(message));
+		}
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,17 +21,21 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.data.mongodb.config.ServerAddressPropertyEditor;
 import org.springframework.data.mongodb.config.WriteConcernPropertyEditor;
 import org.springframework.test.util.ReflectionTestUtils;

+import com.mongodb.Mongo;
+import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;

 /**
 * Integration tests for {@link MongoFactoryBean}.
 * 
 * @author Oliver Gierke
+ * @author Thomas Darimont
 */
-public class MongoFactoryBeanIntegrationTest {
+public class MongoFactoryBeanIntegrationTests {

 	/**
 	 * @see DATAMONGO-408
@@ -49,4 +53,22 @@ public class MongoFactoryBeanIntegrationTest {
 		MongoFactoryBean bean = factory.getBean("&factory", MongoFactoryBean.class);
 		assertThat(ReflectionTestUtils.getField(bean, "writeConcern"), is((Object) WriteConcern.SAFE));
 	}
+
+	/**
+	 * @see DATAMONGO-693
+	 */
+	@Test
+	public void createMongoInstanceWithHostAndEmptyReplicaSets() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("host", "localhost");
+		definition.getPropertyValues().addPropertyValue("replicaPair", "");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerCustomEditor(ServerAddress.class, ServerAddressPropertyEditor.class);
+		factory.registerBeanDefinition("factory", definition);
+
+		Mongo mongo = factory.getBean(Mongo.class);
+		assertNotNull(mongo);
+	}
 }
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.util.TypeInformation;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -78,7 +79,7 @@ public abstract class MongoOperationsUnitTests {
 				return null;
 			}

-			public Object convertToMongoType(Object obj) {
+			public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation) {
 				return null;
 			}

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core;

 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.core.query.Update.*;
@@ -30,6 +31,7 @@ import java.util.List;
 import java.util.Map;

 import org.bson.types.ObjectId;
+import org.hamcrest.CoreMatchers;
 import org.joda.time.DateTime;
 import org.junit.After;
 import org.junit.Assert;
@@ -42,12 +44,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.Version;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.MongoDataIntegrityViolationException;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -55,6 +60,7 @@ import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.Index.Duplicates;
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -82,20 +88,18 @@ import com.mongodb.WriteResult;
 * @author Thomas Risberg
 * @author Amol Nayak
 * @author Patryk Wasik
+ * @author Thomas Darimont
 */
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("classpath:infrastructure.xml")
 public class MongoTemplateTests {

-	@Autowired
-	MongoTemplate template;
-	@Autowired
-	MongoDbFactory factory;
+	@Autowired MongoTemplate template;
+	@Autowired MongoDbFactory factory;

 	MongoTemplate mappingTemplate;

-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+	@Rule public ExpectedException thrown = ExpectedException.none();

 	@Autowired
 	@SuppressWarnings("unchecked")
@@ -145,7 +149,10 @@ public class MongoTemplateTests {
 		template.dropCollection(TestClass.class);
 		template.dropCollection(Sample.class);
 		template.dropCollection(MyPerson.class);
+		template.dropCollection(TypeWithFieldAnnotation.class);
+		template.dropCollection(TypeWithDate.class);
 		template.dropCollection("collection");
+		template.dropCollection("personX");
 	}

 	@Test
@@ -212,19 +219,14 @@ public class MongoTemplateTests {

 		template.insert(person);

-		try {
+		thrown.expect(DataIntegrityViolationException.class);
+		thrown.expectMessage("Execution");
+		thrown.expectMessage("$push");
+		thrown.expectMessage("firstName");

-			Query query = new Query(Criteria.where("firstName").is("Amol"));
-			Update upd = new Update().push("age", 29);
-			template.updateFirst(query, upd, Person.class);
-			fail("Expected DataIntegrityViolationException!");
-
-		} catch (DataIntegrityViolationException e) {
-
-			assertThat(e.getMessage(),
-					is("Execution of update with '{ \"$push\" : { \"age\" : 29}}'' using '{ \"firstName\" : \"Amol\"}' "
-							+ "query failed: Cannot apply $push/$pushAll modifier to non-array"));
-		}
+		Query query = new Query(Criteria.where("firstName").is("Amol"));
+		Update upd = new Update().push("age", 29);
+		template.updateFirst(query, upd, Person.class);
 	}

 	/**
@@ -277,7 +279,8 @@ public class MongoTemplateTests {
 		} catch (DataIntegrityViolationException e) {
 			assertThat(
 					e.getMessage(),
-					startsWith("Insert list failed: E11000 duplicate key error index: database.person.$_id_  dup key: { : ObjectId"));
+					CoreMatchers
+							.startsWith("Insert list failed: E11000 duplicate key error index: database.person.$_id_  dup key: { : ObjectId"));
 		}
 	}

@@ -770,8 +773,7 @@ public class MongoTemplateTests {
 			Query q3 = new Query(Criteria.where("age").in(l1, l2));
 			template.find(q3, PersonWithIdPropertyOfTypeObjectId.class);
 			Assert.fail("Should have trown an InvalidDocumentStoreApiUsageException");
-		} catch (InvalidMongoDbApiUsageException e) {
-		}
+		} catch (InvalidMongoDbApiUsageException e) {}
 	}

 	@Test
@@ -954,6 +956,7 @@ public class MongoTemplateTests {
 	}

 	@Test
+	@SuppressWarnings("deprecation")
 	public void testUsingReadPreference() throws Exception {
 		this.template.execute("readPref", new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
@@ -1028,7 +1031,7 @@ public class MongoTemplateTests {
 		assertThat(lastMongoAction.getCollectionName(), is("personWithIdPropertyOfTypeObjectId"));
 		assertThat(lastMongoAction.getDefaultWriteConcern(), equalTo(WriteConcern.NONE));
 		assertThat(lastMongoAction.getDocument(), notNullValue());
-		assertThat(lastMongoAction.getEntityClass().toString(), is(PersonWithIdPropertyOfTypeObjectId.class.toString()));
+		assertThat(lastMongoAction.getEntityType().toString(), is(PersonWithIdPropertyOfTypeObjectId.class.toString()));
 		assertThat(lastMongoAction.getMongoActionOperation(), is(MongoActionOperation.UPDATE));
 		assertThat(lastMongoAction.getQuery(), equalTo(q.getQueryObject()));

@@ -1310,6 +1313,31 @@ public class MongoTemplateTests {
 		template.save(person);
 	}

+	/**
+	 * @see DATAMONGO-562
+	 */
+	@Test
+	public void optimisticLockingHandlingWithExistingId() {
+
+		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
+		person.id = new ObjectId().toString();
+		person.age = 29;
+		person.firstName = "Patryk";
+		template.save(person);
+	}
+
+	/**
+	 * @see DATAMONGO-617
+	 */
+	@Test
+	public void doesNotFailOnVersionInitForUnversionedEntity() {
+
+		DBObject dbObject = new BasicDBObject();
+		dbObject.put("firstName", "Oliver");
+
+		template.insert(dbObject, template.determineCollectionName(PersonWithVersionPropertyOfTypeInteger.class));
+	}
+
 	/**
 	 * @see DATAMONGO-539
 	 */
@@ -1409,6 +1437,237 @@ public class MongoTemplateTests {
 		template.save("Foobar!", "collection");
 	}

+	/**
+	 * @see DATAMONGO-588
+	 */
+	@Test
+	public void initializesVersionOnInsert() {
+
+		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
+		person.firstName = "Dave";
+
+		template.insert(person);
+
+		assertThat(person.version, is(0));
+	}
+
+	/**
+	 * @see DATAMONGO-588
+	 */
+	@Test
+	public void initializesVersionOnBatchInsert() {
+
+		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
+		person.firstName = "Dave";
+
+		template.insertAll(Arrays.asList(person));
+
+		assertThat(person.version, is(0));
+	}
+
+	/**
+	 * @see DATAMONGO-568
+	 */
+	@Test
+	public void queryCantBeNull() {
+
+		List<PersonWithIdPropertyOfTypeObjectId> result = template.findAll(PersonWithIdPropertyOfTypeObjectId.class);
+		assertThat(template.find(null, PersonWithIdPropertyOfTypeObjectId.class), is(result));
+	}
+
+	/**
+	 * @see DATAMONGO-620
+	 */
+	@Test
+	public void versionsObjectIntoDedicatedCollection() {
+
+		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
+		person.firstName = "Dave";
+
+		template.save(person, "personX");
+		assertThat(person.version, is(0));
+
+		template.save(person, "personX");
+		assertThat(person.version, is(1));
+	}
+
+	/**
+	 * @see DATAMONGO-621
+	 */
+	@Test
+	public void correctlySetsLongVersionProperty() {
+
+		PersonWithVersionPropertyOfTypeLong person = new PersonWithVersionPropertyOfTypeLong();
+		person.firstName = "Dave";
+
+		template.save(person);
+		assertThat(person.version, is(0L));
+	}
+
+	/**
+	 * @see DATAMONGO-622
+	 */
+	@Test(expected = DuplicateKeyException.class)
+	public void preventsDuplicateInsert() {
+
+		template.setWriteConcern(WriteConcern.SAFE);
+
+		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
+		person.firstName = "Dave";
+
+		template.save(person);
+		assertThat(person.version, is(0));
+
+		person.version = null;
+		template.save(person);
+	}
+
+	/**
+	 * @see DATAMONGO-629
+	 */
+	@Test
+	public void countAndFindWithoutTypeInformation() {
+
+		Person person = new Person();
+		template.save(person);
+
+		Query query = query(where("_id").is(person.getId()));
+		String collectionName = template.getCollectionName(Person.class);
+
+		assertThat(template.find(query, HashMap.class, collectionName), hasSize(1));
+		assertThat(template.count(query, collectionName), is(1L));
+	}
+
+	/**
+	 * @see DATAMONGO-571
+	 */
+	@Test
+	public void nullsPropertiesForVersionObjectUpdates() {
+
+		VersionedPerson person = new VersionedPerson();
+		person.firstname = "Dave";
+		person.lastname = "Matthews";
+
+		template.save(person);
+		assertThat(person.id, is(notNullValue()));
+
+		person.lastname = null;
+		template.save(person);
+
+		person = template.findOne(query(where("id").is(person.id)), VersionedPerson.class);
+		assertThat(person.lastname, is(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-571
+	 */
+	@Test
+	public void nullsValuesForUpdatesOfUnversionedEntity() {
+
+		Person person = new Person("Dave");
+		template.save(person);
+
+		person.setFirstName(null);
+		template.save(person);
+
+		person = template.findOne(query(where("id").is(person.getId())), Person.class);
+		assertThat(person.getFirstName(), is(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-651
+	 */
+	@Test
+	public void throwsMongoSpecificExceptionForDataIntegrityViolations() {
+
+		WriteResult result = mock(WriteResult.class);
+		when(result.getError()).thenReturn("ERROR");
+
+		MongoActionOperation operation = MongoActionOperation.INSERT;
+
+		MongoTemplate mongoTemplate = new MongoTemplate(factory);
+		mongoTemplate.setWriteResultChecking(WriteResultChecking.EXCEPTION);
+
+		try {
+			mongoTemplate.handleAnyWriteResultErrors(result, null, operation);
+			fail("Expected MonogoDataIntegrityViolationException!");
+		} catch (MongoDataIntegrityViolationException o_O) {
+			assertThat(o_O.getActionOperation(), is(operation));
+			assertThat(o_O.getWriteResult(), is(result));
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-679
+	 */
+	@Test
+	public void savesJsonStringCorrectly() {
+
+		DBObject dbObject = new BasicDBObject().append("first", "first").append("second", "second");
+
+		template.save(dbObject.toString(), "collection");
+
+		List<DBObject> result = template.findAll(DBObject.class, "collection");
+		assertThat(result.size(), is(1));
+		assertThat(result.get(0).containsField("first"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-675
+	 */
+	@Test
+	public void updateConsidersMappingAnnotations() {
+
+		TypeWithFieldAnnotation entity = new TypeWithFieldAnnotation();
+		entity.emailAddress = "old";
+
+		template.save(entity);
+
+		Query query = query(where("_id").is(entity.id));
+		Update update = Update.update("emailAddress", "new");
+
+		FindAndModifyOptions options = new FindAndModifyOptions().returnNew(true);
+		TypeWithFieldAnnotation result = template.findAndModify(query, update, options, TypeWithFieldAnnotation.class);
+		assertThat(result.emailAddress, is("new"));
+	}
+
+	/**
+	 * @see DATAMONGO-671
+	 */
+	@Test
+	public void findsEntityByDateReference() {
+
+		TypeWithDate entity = new TypeWithDate();
+		entity.date = new Date(System.currentTimeMillis() - 10);
+		template.save(entity);
+
+		Query query = query(where("date").lt(new Date()));
+		List<TypeWithDate> result = template.find(query, TypeWithDate.class);
+
+		assertThat(result, hasSize(1));
+		assertThat(result.get(0).date, is(notNullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-540
+	 */
+	@Test
+	public void findOneAfterUpsertForNonExistingObjectReturnsTheInsertedObject() {
+
+		String idValue = "4711";
+		Query query = new Query(Criteria.where("id").is(idValue));
+
+		String fieldValue = "bubu";
+		Update update = Update.update("field", fieldValue);
+
+		template.upsert(query, update, Sample.class);
+		Sample result = template.findOne(query, Sample.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.field, is(fieldValue));
+		assertThat(result.id, is(idValue));
+	}
+
 	static class MyId {

 		String first;
@@ -1417,14 +1676,12 @@ public class MongoTemplateTests {

 	static class TypeWithMyId {

-		@Id
-		MyId id;
+		@Id MyId id;
 	}

 	public static class Sample {

-		@Id
-		String id;
+		@Id String id;
 		String field;
 	}

@@ -1478,4 +1735,22 @@ public class MongoTemplateTests {
 		String state;
 		String city;
 	}
+
+	static class VersionedPerson {
+
+		@Version Long version;
+		String id, firstname, lastname;
+	}
+
+	static class TypeWithFieldAnnotation {
+
+		@Id ObjectId id;
+		@Field("email") String emailAddress;
+	}
+
+	static class TypeWithDate {
+
+		@Id String id;
+		Date date;
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Spring Buildmaster	11d9f04fd1	DATAMONGO-729 - Release version 1.2.3.RELEASE.	2013-07-24 06:32:22 -07:00
Oliver Gierke	67b91e446e	DATAMONGO-729 - Prepare 1.2.3 release. Upgraded to Spring Data Build 1.0.4.RELEASE, Spring Data Commons 1.5.2.RELEASE. Updated changelog, notice and readmes. Removed Snapshot repository in favor of the release one.	2013-07-24 12:40:47 +02:00
Thomas Darimont	1124841e17	DATAMONGO-728 - Added missing package-info files.	2013-07-23 16:33:39 +02:00
Spring Buildmaster	10ccbf131d	DATAMONGO-727 - Prepare next development iteration.	2013-07-19 06:37:58 -07:00
Spring Buildmaster	b29930b512	DATAMONGO-727 - Release version 1.2.2.RELEASE.	2013-07-19 06:37:54 -07:00
Oliver Gierke	d671fb13ae	DATAMONGO-727 - Prepare 1.2.2.RELEASE.	2013-07-19 15:21:57 +02:00
Oliver Gierke	b0a10d19c3	DATAMONGO-723 - Cleand up a few misnamed test cases. Reactivated test cases that were name Test instead of Tests by accident.	2013-07-12 18:44:28 +02:00
Oliver Gierke	d8ef7e1472	DATAMONGO-717 - Partial back-port of change in AbstractMongoConfiguration. Backported a part of DATAMONGO-569 to avoid lifecycle issues on MongoMappingContext. ….initialize() was called to early so that other lifecycle callbacks (e.g. setApplicationContext(…)) are applied too late.	2013-07-10 23:00:36 +02:00
Thomas Darimont	b9a25eabae	DATAMONGO-685 - ServerInfo should return used hostname reported by MongoDB. Added test case getHostNameShouldReturnServerNameReportedByMongo() to MongoMonitorIntegrationTests. Modified MongoMonitorIntegrationTests to use common mongo-infrastructure configuration. ServerInfo.getHostName() is now derived from serverStatus.serverUsed. Original pull request: #51.	2013-07-10 14:30:40 +02:00
Oliver Gierke	e92e5c737f	DATAMONGO-540 - Fixed test case. Apparently the test case was not working on MongoDB instances in version 2.2.	2013-07-08 14:07:24 +02:00
Thomas Darimont	6e46fb12cb	DATAMONGO-671 - Improve test case to not fail on fast machines.	2013-07-05 12:00:27 +02:00
Thomas Darimont	031d446a1c	DATAMONGO-540 - Added test case to show findOne(…) works after upsert.	2013-07-05 12:00:18 +02:00
Oliver Gierke	e6bab1ce60	DATAMONGO-671 - Added integration tests to show lookups by date are working.	2013-07-05 12:00:04 +02:00
Oliver Gierke	2fffe0a5c4	DATAMONGO-714 - Updated formatter to latest changes.	2013-07-05 11:51:35 +02:00
Thomas Darimont	2493de5f91	DATAMONGO-693 - More robust handling of host and replica set config in MongoFactoryBean. MongoFactoryBean now considers empty strings for the replicaPair property as not set at all. The ServerAdressPropertyEditor also returns null as value for empty text strings. Deprecated setter for replica pair on MongoFactoryBean.	2013-07-02 16:37:54 +02:00
Oliver Gierke	bd11bab076	DATAMONGO-675 - MongoTemplate now maps Update in findAndModify(…). The Update object handed to ….findAndModify(…) is now handed through the QueryMapper before being executed.	2013-07-01 08:27:29 +02:00
Oliver Gierke	b667984563	DATAMONGO-706 - Fixed DBRef conversion for nested keywords.	2013-06-29 13:07:52 +02:00
Oliver Gierke	7ef167ed96	DATAMONGO-705 - Fixed handling of DBRefs in QueryMapper. QueryMapper now converts values to become DBRefs correctly in getMappedKeyword(…). Added an exclusion path for the value handling in case we have an $exists keyword.	2013-06-25 19:29:11 +02:00
Andrew Duncan	303a057d86	DATAMONGO-701 - Improve performance of starts-with and ends-with queries. This changes the starts-with regex to the prefixed form using ^ to better make use of any index on the queried field. Also changes ending-with queries to use the $ anchor.	2013-06-25 18:03:09 +02:00
Ivan Sopov	607072c0d3	DATAMONGO-704 - Removed references to SimpleMongoConverter from JavaDoc. Removing SimpleMongoConverter references from javadocs In commit `2832b524d3` MappingMongoConverter was made default instead of SimpleMongoConverter. Also SimpleMongoConverter was completely removed between 1.0.0.M3 and 1.0.0.M4 releases. This is an update for JavaDocs, that still reference SimpleMongoConverter as the default MongoConverter.	2013-06-25 17:32:05 +02:00
Oliver Gierke	11e9c562b3	DATAMONGO-683 - QueryMapper now handles default ID names it mapping metadata missing. Changed the implementation so that _id is considered an id field if no metadata is present. Heavily refactored QueryMapper internals so that the conversion code is more readable.	2013-05-24 09:18:57 +02:00
Oliver Gierke	220b211faa	DATAMONGO-679 - Fixed saving plain JSON strings in MongoTemplate. MongoTemplate.doSave(…) didn't handle plain JSON strings correctly. It now correctly passes the marshaled object to the underlying method.	2013-05-23 20:46:08 +02:00
Patryk Wąsik	c0c51fcc29	DATAMONGO-677 - QueryMapper now handles DBRefs in Maps correctly. QueryMapper now handle Map with DBRef value, which is needed to process an update in MongoTemplate.doUpdate(…) to save versioned document correctly.	2013-05-23 20:10:29 +02:00
Oliver Gierke	ed9eddf10e	DATAMONGO-682 - Performance improvement for mapping hotspots. This commit includes the MongoDB specific parts for the mapping subsystem performance improvements. Reworked PerformanceTest to output more reasonable numbers. Heavily inspired by Patryk Wasik's contribution at https://github.com/SpringSource/spring-data-mongodb/pull/37. GitHub PR: #37 Conflicts: spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java	2013-05-23 19:52:34 +02:00
Oliver Gierke	e23d73d55e	DATACMNS-379 - Adapt to changes in Spring Data Commons.	2013-05-12 23:50:42 +02:00
Philipp Schneider	9627fbaebf	DATAMONGO-663 - Added equals(…) and hashCode() to Field.	2013-04-26 15:37:38 +02:00
Spring Buildmaster	ef93d4db0b	DATAMONGO-654 - Prepare next development iteration.	2013-04-17 02:50:13 -07:00
Spring Buildmaster	928b5a7742	DATAMONGO-654 - Release 1.2.1.RELEASE.	2013-04-17 02:50:08 -07:00
Oliver Gierke	118a52a8d6	DATAMONGO-654 - Prepare 1.2.1.RELEASE. Upgraded to Spring Data Build 1.0.3.RELEASE. Upgraded to Spring Data Commons 1.5.1.RELEASE. Updated changelog, notice and readme. Polished readme.md.	2013-04-17 11:28:46 +02:00
Oliver Gierke	b47e8ca3da	DATAMONGO-656 - Fixed potential NPE in MongoTemplate.	2013-04-17 10:24:37 +02:00
Oliver Gierke	8527d6eb43	DATAMONGO-651 - MongoTemplate now throws Mongo-specific exception with WriteResult. If the WriteResultChecking is set to EXCEPTION on a MongoTemplate, we now throw a Mongo-specific exception that captures both the WriteResult and MongoActionOperation for further evaluation.	2013-04-15 17:05:56 +02:00
Oliver Gierke	d645c778c3	DATAMONGO-571 - Fixed setting null values during update of versioned entities. In case of updating a versioned object,the Update object is now constructed from plain key value pairs, not using $set anymore. This will correctly set the null values in the updated document.	2013-04-11 12:01:53 +02:00
Oliver Gierke	5c47f1ae9e	DATAMONGO-650 - Added snapshot repository to resolve Spring Data Commons.	2013-04-11 11:08:02 +02:00
Oliver Gierke	9f324bac19	DATAMONGO-648 - Replaced XSD ids with XSD strings. This change allows usage of Spring Data MongoDB XML namespace elements with <bean /> element using a profile. This scenario creates the case of e.g. two <mongo:db-factory /> declarations in the same XML file.	2013-04-10 20:34:29 +02:00
Oliver Gierke	186caba1ac	DATAMONGO-642 - MongoChangeSetPersister now considers mapped collection. So far the change set persister has used the plain domain type name to persist data. We now consider the collection name defined by the object mapping (through @Document(collection = "…")).	2013-04-02 11:42:50 +02:00
Oliver Gierke	2ebb7e801d	DATAMONGO-641 - Fixed potential NullPointerException in MongoLog4jAppender. Log4j appender now only closes Mongo instance if available.	2013-04-02 10:59:13 +02:00
Oliver Gierke	a932f3474e	DATAMONGO-641 - Reformatting to prepare fix.	2013-04-02 10:59:05 +02:00
Oliver Gierke	e992456532	DATAMONGO-638 - MappingContext does not create PersistentEntities for AbstractMaps.	2013-03-28 16:29:55 +01:00
Oliver Gierke	7b34c5cac4	DATAMONGO-629 - Fixed QueryMapper not to massage queries without type information. So far the QueryMapper applied the id massaging (especially interpreting the default id keys) even if there was no persistence metadata available to do so. This caused e.g. queries handed into MongoTemplate.count(Query, String) to get keys of "id" massaged into "_id" which shouldn't be the case as we cannot assume anything about the documents and the keys contained in them. So we now only apply the defaults if there is at least persistence metadata present. This means that for methods on MongoOperations that don't take type information of any kind the queries have to be defined in terms of the document, not the object model as we cannot refer to it.	2013-03-27 12:04:06 +01:00
Andrey Bloschetsov	16baf00f5e	DATAMONGO-637 - Fixed typo in Query.query(…). Correcting mispelled "critera". Polished JavaDoc a little.	2013-03-27 11:28:22 +01:00
Oliver Gierke	61a2c56a27	DATAMONGO-632 - Removed schemaLocation attribute from namespace references.	2013-03-25 18:46:34 +01:00
Oliver Gierke	e62437b64a	DATAMONGO-633 - Back down to bug fix versions of SD Parent and Core. Avoid version bump to Querydsl 3.0.	2013-03-25 18:44:18 +01:00
Oliver Gierke	e9a7e887be	DATAMONGO-635 - Fixed some Sonar warnings.	2013-03-25 18:13:21 +01:00
Oliver Gierke	b91a66f6f9	DATAMONGO-622 - Saving unversioned object now uses doInsert(…). We now rather use doInsert(…) if a versioned object is saved the first time to prevent accidental updates not bumping the version number.	2013-02-26 11:39:36 +01:00
Oliver Gierke	a047e54e5a	DATAMONGO-621 - Initializing version property now uses ConversionService. The BeanWrapper used in MongoTemplate.initializeVersionProperty(…) now uses the ConversionService held in the MongoConverter.	2013-02-26 11:39:30 +01:00
Oliver Gierke	8197ff57c8	DATAMONGO-620 - Updating versioned object uses explicit collection name. We're now handing the collection name given to doSaveVersioned(…) to the update method.	2013-02-26 11:39:22 +01:00
Oliver Gierke	a2136719e1	DATAMONGO-617 - Fixed potential NullPointerException in MongoTemplate.insert(…). If MongoTemplate.insert(…) was called with a Mongo-simple type (such as a raw DBBobject) it caused a NullPointerException during the lookup of a version property. This is now fixed by correcting the guard.	2013-02-20 12:07:32 +01:00
Oliver Gierke	7bcf142c8d	DATAMONGO-613 - Readded JConsole image and upgrade to Spring Data Build 1.1.	2013-02-11 12:41:12 +01:00
Oliver Gierke	d50d03a80e	DATAMONGO-612 - Fixed reconfiguration of dist.id.	2013-02-11 12:39:15 +01:00
Spring Buildmaster	ba894a4511	DATAMONGO-609 - Prepare next development iteration.	2013-02-08 13:22:05 +01:00
Spring Buildmaster	2bc6ebc250	DATAMONGO-609 - Release version 1.2.0.RELEASE	2013-02-08 04:15:46 -08:00
Oliver Gierke	909110cf4e	DATAMONGO-609 - Upgraded to parent project and Spring Data Commons in release versions.	2013-02-08 13:05:49 +01:00
Oliver Gierke	ba094da5a7	DATAMONGO-611 - Upgraded to MongoDB Java driver 2.10.1.	2013-02-08 13:04:33 +01:00
Oliver Gierke	876b31bc52	DATAMONGO-609 - Updated changelog.	2013-02-08 13:00:20 +01:00
Oliver Gierke	dc8e8281eb	DATAMONGO-606 - Add JodaTime specific Converter implementations if JodaTime is present on classpath.	2013-02-06 17:53:41 +01:00
Oliver Gierke	48deb1a150	DATAMONGO-603 - Polishing unit tests.	2013-02-06 17:39:33 +01:00
Michal Vich	48625956b7	DATAMONGO-568 - MongoTemplate.find(…) does not throw NullPointerException anymore. Trigger findAll(…) if the Query object given to a find(…) method is null.	2013-02-06 15:04:39 +01:00
Michal Vich	782cf6e10d	DATAMONGO-81 - Added more unit tests for MongoExceptionTranslator.	2013-02-06 14:41:56 +01:00
Oliver Gierke	c28e51cf86	DATAMONGO-603 - Make sure geo queries and repositories get correct Metric applied. Heavily refactored NearQuery to simplify implementation and testability. Made sure the metric of the maximum distance is applied if no metric had been defined before. Adapted query preparation code to re-enforce the correct metric being set to not rely on the auto-application behavior of NearQuery to be safe against potential further refactorings.	2013-02-01 15:38:29 +01:00
Oliver Gierke	4b1065cac5	DATAMONGO-598 - Set needed properties and activate distribution artifact upload.	2013-01-29 20:36:41 +01:00
Oliver Gierke	c807b2abcf	DATAMONGO-601 - Fixed exposing password by MongoDbUtils. MongoDbUtils is now not exposing the plain password in the exception message piped into CannotGetMongoDbConnectionException but uses the newly introduced toString() method of UserCredentials (see DATACMNS-275).	2013-01-29 13:16:06 +01:00
Oliver Gierke	19ad2d3aac	DATACMNS-274 - Adapt to moved type MappingContextIsNewStrategyFactory.	2013-01-29 10:54:36 +01:00
Oliver Gierke	bd7fe5bfd3	DATAMONGO-600 - Fixed parameter binding for derived queries on properties using polymorphism. We need to retain the type in the serialized DBObject in case a derived query binds parameters for properties that use polymorphism as we serialize the object as nested document and this only matches in an all-or-nothing way. So if the type information is missing, we won't see any results. So we now hand the TypeInformation of the property into the conversion logic and transparently skip the type information removal in case the types differ.	2013-01-25 11:29:39 +01:00
Oliver Gierke	a237999037	DATAMONGO-598 - Upgraded to new build infrastructure. Fixed test ordering issue in Cross-Store module.	2013-01-18 14:45:48 +01:00
Oliver Gierke	d8a9752724	DATAMONGO-592 - Fix handling of SpEL evaluation values. During constructor parameter value resolution the value to be used can result from evaluating a SpEL expression on the root document. This value has to be converted recursively if it is a nested document. Adapted to the altered API in SD Commons and override potentiallyConvertSpelValue(…) to re-invoke converter.	2012-12-16 15:26:25 +01:00
Philipp Schneider	4c8bf0dec2	DATAMONGO-583 - Using while (…) instead of for (…) for DBCursors to avoid memory leak. Instead of iterating over the DBCursor using a for-loop we now use a while-loop to avoid the potential memory leak outlined in [0]. [0] https://jira.mongodb.org/browse/JAVA-664	2012-12-13 12:07:11 +05:30
Oliver Gierke	cffc27d83a	DATAMONGO-590 - Code cleanups in MongoTemplate and error handling APIs.	2012-12-13 12:06:55 +05:30
Oliver Gierke	42ab4cb7b4	DATAMONGO-588 - Version attribute now gets initialized on insert. The version attribute of an entity has not been correctly initialized to 0 when inserting objects using MongoTemplate.insert(…). We now set it to 0 correctly.	2012-12-10 17:38:16 +09:00
Oliver Gierke	42df25434f	DATAMONGO-585 - Fix concurrency issue in database authentication. So far the authentication of the database was synchronized after the check whether the database under consideration had already been authenticated. This can cause threads to concurrently try to authenticate the database which is rejected by the driver. Improved the synchronization block to include both the ….isAuthenticated() check as well as the authentication.	2012-12-03 11:37:06 +01:00
Oliver Gierke	4e16f7ebe2	DATACMNS-378 - Fixed ClassCastException in MapReduceResults. The parseCount(…) method now safely converts both integer and long values from the source DBObject.	2012-11-29 13:22:38 +01:00
Oliver Gierke	04a87b373d	DATAMONGO-577 - Cleaned up obsolete property. The version property in BasicMongoPersistentEntity became obsolete after the upgrade in Spring Data Commons.	2012-11-28 17:39:20 +01:00
Oliver Gierke	c4eca7eadd	DATAMONGO-581 - Expose the PersistentEntity managed in the repository factory bean. MongoRepositoryFactoryBean now populates the MappingContext of the super class when the MongoOperations instance is set.	2012-11-28 17:35:47 +01:00
Philipp Schneider	3a9dc2b98c	DATAMONGO-503 - Added support for content type on GridFsOperations. Added methods to take the content type of the file to be created. Clarified nullability of arguments in JavaDoc. Pull request: #19.	2012-11-28 14:30:05 +01:00
Oliver Gierke	c568b7cbc2	DATAMONGO-580 - Improved BeanDefinitionParser for MappingMongoConverter.	2012-11-27 14:44:00 +01:00
Oliver Gierke	9482350062	DATAMONGO-577 - Added support for auditing. Introduced AuditingEventListener to invoke auditing subsystem available through Spring Data Commons. Added <mongo:auditing /> namespace element to transparently activate it.	2012-11-27 14:00:52 +01:00
Oliver Gierke	772a140def	DATAMONGO-576 - Configure java.util.logging to prevent verbose test logging. Added Slf4j bridge and configured surefire to configure JUL accordingly.	2012-11-23 10:50:29 +01:00
Oliver Gierke	936259a766	DATAMONGO-575 - Improved implementation of entity metadata lookup in MongoQueryMethod. Got rid of obsolete EntityInformationCreator API and moved to a custom EntityMetadata extension instead.	2012-11-23 10:00:49 +01:00
Oliver Gierke	533d21281e	DATAMONGO-570 - Guard against null values in references. QueryMapper does not try to convert null values into DBRef objects anymore but returns the plain null value as is.	2012-11-13 18:23:02 +01:00
Oliver Gierke	6977fa87e6	DATAMONGO-573 - Moved to Logback for test logging.	2012-11-13 17:54:19 +01:00
Oliver Gierke	41dcebb010	DATAMONGO-559 - Upgraded to Spring Data Commons 1.5.0.BUILD-SNAPSHOT.	2012-11-13 17:54:19 +01:00
Oliver Gierke	ef077182f6	DATAMONGO-563 - Upgraded MongoDB Java driver to 2.9.2.	2012-11-13 17:54:19 +01:00
Dave Syer	21e7c63766	Update README.md	2012-10-26 18:02:05 +02:00
Jan Kronquist	4b018a9d7d	DATAMONGO-562 - Saving versioned entity with already set id now works. Instead of inspecting the id property we now assume the version property unset for initialization and work from there.	2012-10-24 16:07:26 +02:00
Spring Buildmaster	ecf15b93e0	DATAMONGO-559 - Prepare next development iteration.	2012-10-17 15:00:21 -07:00