DATAMONGO-873 - Prepare next development iteration.

Updated readme, changelog,... to reflect recent version number. Updated reference to spring.io.

Original Pull Request: #144.

CONTRIBUTING.MD

@@ -0,0 +1 @@
+You find the contribution guidelines for Spring Data projects [here](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.md).

README.md

@@ -1,149 +1,141 @@
-Spring Data - Document
-======================
+# Spring Data MongoDB
 
 The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
-As the name implies, the **Document** modules provides integration with document databases such as [MongoDB](http://www.mongodb.org/) and [CouchDB](http://couchdb.apache.org/).
 
-Getting Help
-------------
+The Spring Data MongoDB project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a repository style data access layer.
 
-At this point your best bet is to look at the Look at the [JavaDocs](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/spring-data-mongodb/apidocs/) for MongoDB integration and corresponding and source code. For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
+## Getting Help
 
-The [User Guide](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) (A work in progress). 
+For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
+
+* the [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
+* the [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
+* for more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
 
+## Quick Start
 
-Quick Start
------------
+### Maven configuration
 
-## MongoDB
+Add the Maven dependency:
 
-For those in a hurry:
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>1.3.5.RELEASE</version>
+</dependency>
+```
 
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
 
-* Download the jar through Maven:
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>1.4.0.BUILD-SNAPSHOT</version>
+</dependency>
 
-      <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> 
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>http://repo.springsource.org/libs-snapshot</url>
+</repository>
+```
 
 ### MongoTemplate
-MongoTemplate is the central support class for Mongo database operations.  It provides
+
+MongoTemplate is the central support class for Mongo database operations. It provides:
 
 * Basic POJO mapping support to and from BSON
-* Connection Affinity callback
+* Convenience methods to interact with the store (insert object, update objects) and MongoDB specific ones (geo-spatial operations, upserts, map-reduce etc.)
+* Connection affinity callback
 * Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/dao.html#dao-exceptions).
 
-Future plans are to support optional logging and/or exception throwing based on WriteResult return value, common map-reduce operations, GridFS operations.  A simple API for partial document updates is also planned.
+### Spring Data repositories
 
-### Easy Data Repository generation
+To simplify the creation of data repositories Spring Data MongoDB provides a generic repository programming model. It will automatically create a repository proxy 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.  
+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 like expression is shown below:
 
-The Repository interface is
+```java
+public interface PersonRepository extends CrudRepository<Person, Long> {
 
-        public interface Repository<T, ID extends Serializable> { 
+  List<Person> findByLastname(String lastname);
 
-          T save(T entity);
+  List<Person> findByFirstnameLike(String firstname);
+}
+```
 
-          List<T> save(Iterable<? extends T> entities);
+The queries issued on execution will be derived from the method name. Extending `CrudRepository` causes CRUD methods being pulled into the interface so that you can easily save and find single entities and collections of them.
 
-          T findById(ID id);
+You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
 
-          boolean exists(ID id);
+```java
+@Configuration
+@EnableMongoRepositories
+class ApplicationConfig extends AbstractMongoConfiguration {
 
-          List<T> findAll();
+  @Override
+  public Mongo mongo() throws Exception {
+    return new Mongo();
+  }
 
-          Long count();
+  @Override
+  protected String getDatabaseName() {
+    return "springdata";
+  }
+}
+```
 
-          void delete(T entity);
+This sets up a connection to a local MongoDB instance and enables the detection of Spring Data repositories (through `@EnableMongoRepositories`). The same configuration would look like this in XML:
 
-          void delete(Iterable<? extends T> entities);
+```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" />
+</bean>
 
-          void deleteAll();
-        }
+<mongo:repositories base-package="com.acme.repository" />
+```
 
+This will find the repository interface and register a proxy object in the container. You can use it as shown below:
 
-The MongoRepository extends Repository and will in future add more Mongo specific methods.
+```java
+@Service
+public class MyService {
 
-    public interface MongoRepository<T, ID extends Serializable> extends
-        Repository<T, ID> {
-    }
+  private final PersonRepository repository;
 
-SimpleMongoRepository is the out of the box implementation of the MongoRepository you can use for basid CRUD operations.  
+  @Autowired
+  public MyService(PersonRepository repository) {
+    this.repository = repository;
+  }
 
-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.  
+  public void doWork() {
 
-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
+     repository.deleteAll();
 
-    public interface PersonRepository extends MongoRepository<Person, Long> {
+     Person person = new Person();
+     person.setFirstname("Oliver");
+     person.setLastname("Gierke");
+     person = repository.save(person);
 
-      List<Person> findByLastname(String lastname);
+     List<Person> lastNameResults = repository.findByLastname("Gierke");
+     List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
+ }
+}
+```
 
-      List<Person> findByFirstnameLike(String firstname);
-    }
-
-You can have Spring automatically generate the implemention 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>
-
-        <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>
-
-This will register an object in the container named PersonRepository.  You can use it as shown below
-
-     @Service
-     public class MyService {
-
-        @Autowired
-        PersonRepository repository;
-
-
-        public void doWork() {
-
-           repository.deleteAll();
-
-           Person person = new Person();
-           person.setFirstname("Oliver");
-           person.setLastname("Gierke");
-           person = repository.save(person);
-
-           List<Person> lastNameResults = repository.findByLastname("Gierke");
-
-           List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
-
-       }
-    }
-
-
-## CouchDB
-
-TBD
-
-
-Contributing to Spring Data
----------------------------
+## Contributing to Spring Data
 
 Here are some ways for you to get involved in the community:
 

etc/formatting.xml

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="Spring Data" version="12">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<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="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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<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="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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<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="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="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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>

pom.xml

@@ -1,301 +1,128 @@
 <?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-document-dist</artifactId>
-  <name>Spring Data Document Distribution</name>
-  <version>1.0.0.M4</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>spring-data-document-parent</module>
-    <module>spring-data-mongodb</module>
-    <module>spring-data-mongodb-cross-store</module>
-    <module>spring-data-mongodb-log4j</module>
-    <!-- <module>spring-data-couchdb</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.3.6.BUILD-SNAPSHOT</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://projects.spring.io/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.2.2.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.6.5.RELEASE</springdata.commons>
+		<mongo>2.10.1</mongo>
+	</properties>
+	
+	<developers>
+		<developer>
+			<id>ogierke</id>
+			<name>Oliver Gierke</name>
+			<email>ogierke at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Project Lean</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>trisberg</id>
+			<name>Thomas Risberg</name>
+			<email>trisberg at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>mpollack</id>
+			<name>Mark Pollack</name>
+			<email>mpollack at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>jbrisbin</id>
+			<name>Jon Brisbin</name>
+			<email>jbrisbin at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-6</timezone>
+		</developer>
+		<developer>
+			<id>tdarimont</id>
+			<name>Thomas Darimont</name>
+			<email>tdarimont at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>cstrobl</id>
+			<name>Christoph Strobl</name>
+			<email>cstrobl at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</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>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- dist.* properties are used by the antrun tasks below -->
-    <dist.id>spring-data-document</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></highlightDefaultLanguage>
-          <!-- callouts -->
-          <entities>
-            <entity>
-              <name>version</name>
-              <value>${pom.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-document-reference.pdf"
-                  failonerror="false"/>
-          </postProcess>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <javadoc:aggregate>true</javadoc: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-document-dist';
-         make sure the zip file is just 'spring-data-document'. -->
-    <finalName>${dist.finalName}</finalName>
-  </build>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <!-- necessary for bundlor and utils -->
-      <id>repository.plugin.springsource.release</id>
-      <name>SpringSource Maven Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://maven.springframework.org/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-document/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>
+		<!-- MongoDB -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo}</version>
+		</dependency>
+	</dependencies>
+	
+	<repositories>
+		<repository>
+			<id>spring-lib-snapshot</id>
+			<url>http://repo.spring.io/libs-snapshot</url>
+		</repository>
+	</repositories>
+	
+	<pluginRepositories>
+ 		<pluginRepository>
+ 			<id>spring-plugins-release</id>
+ 			<url>http://repo.spring.io/plugins-release</url>
+ 		</pluginRepository>
+ 	</pluginRepositories>
 
 </project>

spring-data-couchdb/pom.xml

@@ -1,156 +0,0 @@
-<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-document-parent</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
-    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-couchdb</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Data CouchDB Support</name>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>tareq.abedrabbo</id>
-      <name>Tareq Abedrabbo</name>
-      <email>tareq.abedrabbo@opencredo.com</email>
-      <organization>OpenCredo</organization>
-      <organizationUrl>http://www.opencredo.org</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>+0</timezone>
-    </developer>
-    <developer>
-      <id>tomas.lukosius</id>
-      <name>Tomas Lukosius</name>
-      <email>tomas.lukosius@opencredo.com</email>
-      <organization>OpenCredo</organization>
-      <organizationUrl>http://www.opencredo.org</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>+0</timezone>
-    </developer>
-  </developers>
-
-  <dependencies>
-
-    <!--  Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-	<!--  Spring Data -->
-    <dependency>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-commons-core</artifactId>
-    </dependency>
-
-    <!-- Dependencies for web analytics functionality - to me moved into spring framework  -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-
-    <!-- Jackson JSON -->
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-
-    <!-- Couch DB -->
-    <dependency>
-      <groupId>com.google.code.jcouchdb</groupId>
-      <artifactId>jcouchdb</artifactId>
-      <version>0.11.0-1</version>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchServerResourceUsageException.java

@@ -1,34 +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.document.couchdb;
-
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.web.client.HttpServerErrorException;
-
-public class CouchServerResourceUsageException extends InvalidDataAccessResourceUsageException {
-
-  /**
-   * Create a new CouchServerResourceUsageException,
-   * wrapping an arbitrary HttpServerErrorException.
-   *
-   * @param cause the HttpServerErrorException thrown
-   */
-  public CouchServerResourceUsageException(HttpServerErrorException cause) {
-    super(cause != null ? cause.getMessage() : null, cause);
-  }
-
-}
-

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchUsageException.java

@@ -1,34 +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.document.couchdb;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.web.client.HttpClientErrorException;
-
-public class CouchUsageException extends InvalidDataAccessApiUsageException {
-
-  /**
-   * Create a new CouchUsageException,
-   * wrapping an arbitrary HttpServerErrorException.
-   *
-   * @param cause the HttpServerErrorException thrown
-   */
-  public CouchUsageException(HttpClientErrorException cause) {
-    super(cause != null ? cause.getMessage() : null, cause);
-  }
-
-}
-

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/DocumentExistsException.java

@@ -1,34 +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.document.couchdb;
-
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.web.client.HttpStatusCodeException;
-
-public class DocumentExistsException extends DataIntegrityViolationException {
-
-  /**
-   * Create a new DocumentExistsException,
-   * wrapping an arbitrary HttpServerErrorException.
-   *
-   * @param cause the HttpServerErrorException thrown
-   */
-  public DocumentExistsException(String documentId, HttpStatusCodeException cause) {
-    super(cause != null ? cause.getMessage() : null, cause);
-  }
-
-}
-

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/UncategorizedCouchDataAccessException.java

@@ -1,34 +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.document.couchdb;
-
-import org.springframework.dao.UncategorizedDataAccessException;
-import org.springframework.web.client.RestClientException;
-
-public class UncategorizedCouchDataAccessException extends UncategorizedDataAccessException {
-
-  /**
-   * Create a new HibernateSystemException,
-   * wrapping an arbitrary HibernateException.
-   *
-   * @param cause the HibernateException thrown
-   */
-  public UncategorizedCouchDataAccessException(RestClientException cause) {
-    super(cause != null ? cause.getMessage() : null, cause);
-  }
-
-}
-

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/admin/CouchAdmin.java

@@ -1,64 +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.document.couchdb.admin;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.document.couchdb.support.CouchUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestOperations;
-import org.springframework.web.client.RestTemplate;
-
-public class CouchAdmin implements CouchAdminOperations {
-
-  private String databaseUrl;
-  private RestOperations restOperations = new RestTemplate();
-
-  public CouchAdmin(String databaseUrl) {
-
-    if (!databaseUrl.trim().endsWith("/")) {
-      this.databaseUrl = databaseUrl.trim() + "/";
-    } else {
-      this.databaseUrl = databaseUrl.trim();
-    }
-  }
-
-  public List<String> listDatabases() {
-    String dbs = restOperations.getForObject(databaseUrl + "_all_dbs", String.class);
-    return Arrays.asList(StringUtils.commaDelimitedListToStringArray(dbs));
-  }
-
-  public void createDatabase(String dbName) {
-    org.springframework.util.Assert.hasText(dbName);
-    restOperations.put(databaseUrl + dbName, null);
-
-  }
-
-  public void deleteDatabase(String dbName) {
-    org.springframework.util.Assert.hasText(dbName);
-    restOperations.delete(CouchUtils.ensureTrailingSlash(databaseUrl + dbName));
-
-  }
-
-  public DbInfo getDatabaseInfo(String dbName) {
-    String url = CouchUtils.ensureTrailingSlash(databaseUrl + dbName);
-    Map dbInfoMap = (Map) restOperations.getForObject(url, Map.class);
-    return new DbInfo(dbInfoMap);
-  }
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/admin/DbInfo.java

@@ -1,72 +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.document.couchdb.admin;
-
-import java.util.Collections;
-import java.util.Map;
-
-public class DbInfo {
-
-  private Map dbInfoMap;
-
-  public DbInfo(Map dbInfoMap) {
-    super();
-    this.dbInfoMap = dbInfoMap;
-  }
-
-  public boolean isCompactRunning() {
-    return (Boolean) this.dbInfoMap.get("compact_running");
-  }
-
-  public String getDbName() {
-    return (String) this.dbInfoMap.get("db_name");
-  }
-
-  public long getDiskFormatVersion() {
-    return (Long) this.dbInfoMap.get("disk_format_version");
-  }
-
-  public long getDiskSize() {
-    return (Long) this.dbInfoMap.get("disk_size");
-  }
-
-  public long getDocCount() {
-    return (Long) this.dbInfoMap.get("doc_count");
-  }
-
-  public long getDocDeleteCount() {
-    return (Long) this.dbInfoMap.get("doc_del_count");
-  }
-
-  public long getInstanceStartTime() {
-    return (Long) this.dbInfoMap.get("instance_start_time");
-  }
-
-  public long getPurgeSequence() {
-    return (Long) this.dbInfoMap.get("purge_seq");
-  }
-
-  public long getUpdateSequence() {
-    return (Long) this.dbInfoMap.get("update_seq");
-  }
-
-  public Map getDbInfoMap() {
-    return Collections.unmodifiableMap(dbInfoMap);
-  }
-
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/config/CouchJmxParser.java

@@ -1,70 +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.document.couchdb.config;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.couchdb.monitor.ServerInfo;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-public class CouchJmxParser implements BeanDefinitionParser {
-
-  public BeanDefinition parse(Element element, ParserContext parserContext) {
-    String databaseUrl = element.getAttribute("database-url");
-    if (!StringUtils.hasText(databaseUrl)) {
-      databaseUrl = "http://localhost:5984";
-    }
-    registerJmxComponents(databaseUrl, element, parserContext);
-    return null;
-  }
-
-  protected void registerJmxComponents(String databaseUrl, Element element, ParserContext parserContext) {
-    Object eleSource = parserContext.extractSource(element);
-
-    CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
-
-    /*
-      createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-      createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-      */
-    createBeanDefEntry(ServerInfo.class, compositeDef, databaseUrl, eleSource, parserContext);
-    //createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
-
-
-    parserContext.registerComponent(compositeDef);
-
-  }
-
-  protected void createBeanDefEntry(Class clazz, CompositeComponentDefinition compositeDef, String databaseUrl, Object eleSource, ParserContext parserContext) {
-    BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
-    builder.getRawBeanDefinition().setSource(eleSource);
-    builder.addConstructorArg(databaseUrl);
-    BeanDefinition assertDef = builder.getBeanDefinition();
-    String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
-    compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
-  }
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/CouchOperations.java

@@ -1,63 +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.document.couchdb.core;
-
-import java.net.URI;
-
-
-public interface CouchOperations {
-
-  /**
-   * Reads a document from the database and maps it a Java object.
-   * </p>
-   * This method is intended to work when a default database
-   * is set on the CouchDbDocumentOperations instance.
-   *
-   * @param id          the id of the CouchDB document to read
-   * @param targetClass the target type to map to
-   * @return the mapped object
-   */
-  <T> T findOne(String id, Class<T> targetClass);
-
-  /**
-   * Reads a document from the database and maps it a Java object.
-   *
-   * @param uri         the full URI of the document to read
-   * @param targetClass the target type to map to
-   * @return the mapped object
-   */
-  <T> T findOne(URI uri, Class<T> targetClass);
-
-
-  /**
-   * Maps a Java object to JSON and writes it to the database
-   * </p>
-   * This method is intended to work when a default database
-   * is set on the CouchDbDocumentOperations instance.
-   *
-   * @param id       the id of the document to write
-   * @param document the object to write
-   */
-  void save(String id, Object document);
-
-  /**
-   * Maps a Java object to JSON and writes it to the database
-   *
-   * @param uri      the full URI of the document to write
-   * @param document the object to write
-   */
-  void save(URI uri, Object document);
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/CouchTemplate.java

@@ -1,143 +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.document.couchdb.core;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.couchdb.CouchServerResourceUsageException;
-import org.springframework.data.document.couchdb.CouchUsageException;
-import org.springframework.data.document.couchdb.DocumentRetrievalFailureException;
-import org.springframework.data.document.couchdb.UncategorizedCouchDataAccessException;
-import org.springframework.data.document.couchdb.support.CouchUtils;
-import org.springframework.http.*;
-import org.springframework.util.Assert;
-import org.springframework.web.client.*;
-
-
-public class CouchTemplate implements CouchOperations {
-
-  protected final Log logger = LogFactory.getLog(this.getClass());
-
-  private String defaultDocumentUrl;
-
-  private RestOperations restOperations = new RestTemplate();
-
-  /**
-   * Constructs an instance of CouchDbDocumentTemplate with a default database
-   *
-   * @param defaultDatabaseUrl the default database to connect to
-   */
-  public CouchTemplate(String defaultDatabaseUrl) {
-    Assert.hasText(defaultDatabaseUrl, "defaultDatabaseUrl must not be empty");
-    defaultDocumentUrl = CouchUtils.addId(defaultDatabaseUrl);
-  }
-
-  /**
-   * Constructs an instance of CouchDbDocumentTemplate with a default database
-   *
-   * @param defaultDatabaseUrl the default database to connect to
-   */
-  public CouchTemplate(String defaultDatabaseUrl, RestOperations restOperations) {
-    this(defaultDatabaseUrl);
-    Assert.notNull(restOperations, "restOperations must not be null");
-    this.restOperations = restOperations;
-  }
-
-
-  public <T> T findOne(String id, Class<T> targetClass) {
-    Assert.state(defaultDocumentUrl != null, "defaultDatabaseUrl must be set to use this method");
-    try {
-      return restOperations.getForObject(defaultDocumentUrl, targetClass, id);
-      //TODO check this exception translation and centralize.
-    } catch (HttpClientErrorException clientError) {
-      if (clientError.getStatusCode() == HttpStatus.NOT_FOUND) {
-        throw new DocumentRetrievalFailureException(defaultDocumentUrl + "/" + id);
-      }
-      throw new CouchUsageException(clientError);
-    } catch (HttpServerErrorException serverError) {
-      throw new CouchServerResourceUsageException(serverError);
-    } catch (RestClientException otherError) {
-      throw new UncategorizedCouchDataAccessException(otherError);
-    }
-  }
-
-  public <T> T findOne(URI uri, Class<T> targetClass) {
-    Assert.state(uri != null, "uri must be set to use this method");
-    try {
-      return restOperations.getForObject(uri, targetClass);
-      //TODO check this exception translation and centralize.
-    } catch (HttpClientErrorException clientError) {
-      if (clientError.getStatusCode() == HttpStatus.NOT_FOUND) {
-        throw new DocumentRetrievalFailureException(uri.getPath());
-      }
-      throw new CouchUsageException(clientError);
-    } catch (HttpServerErrorException serverError) {
-      throw new CouchServerResourceUsageException(serverError);
-    } catch (RestClientException otherError) {
-      throw new UncategorizedCouchDataAccessException(otherError);
-    }
-  }
-
-  public void save(String id, Object document) {
-    Assert.notNull(document, "document must not be null for save");
-    HttpEntity<?> httpEntity = createHttpEntity(document);
-    try {
-      ResponseEntity<Map> response = restOperations.exchange(defaultDocumentUrl, HttpMethod.PUT, httpEntity, Map.class, id);
-      //TODO update the document revision id on the object from the returned value
-      //TODO better exception translation
-    } catch (RestClientException e) {
-      throw new UncategorizedCouchDataAccessException(e);
-    }
-
-  }
-
-  public void save(URI uri, Object document) {
-    Assert.notNull(document, "document must not be null for save");
-    Assert.notNull(uri, "URI must not be null for save");
-    HttpEntity<?> httpEntity = createHttpEntity(document);
-    try {
-      ResponseEntity<Map> response = restOperations.exchange(uri, HttpMethod.PUT, httpEntity, Map.class);
-      //TODO update the document revision id on the object from the returned value
-      //TODO better exception translation
-    } catch (RestClientException e) {
-      throw new UncategorizedCouchDataAccessException(e);
-    }
-
-
-  }
-
-  private HttpEntity<?> createHttpEntity(Object document) {
-
-    if (document instanceof HttpEntity) {
-      HttpEntity httpEntity = (HttpEntity) document;
-      Assert.isTrue(httpEntity.getHeaders().getContentType().equals(MediaType.APPLICATION_JSON),
-          "HttpEntity payload with non application/json content type found.");
-      return httpEntity;
-    }
-
-    HttpHeaders httpHeaders = new HttpHeaders();
-    httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-    HttpEntity<Object> httpEntity = new HttpEntity<Object>(document, httpHeaders);
-
-    return httpEntity;
-  }
-
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/support/CouchDbMappingJacksonHttpMessageConverter.java

@@ -1,315 +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.document.couchdb.core.support;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.*;
-
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.type.TypeFactory;
-import org.codehaus.jackson.type.JavaType;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.AbstractHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.http.converter.HttpMessageNotWritableException;
-import org.springframework.util.Assert;
-
-public class CouchDbMappingJacksonHttpMessageConverter extends
-    AbstractHttpMessageConverter<Object> {
-
-  public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-  private static final String ROWS_FIELD_NAME = "rows";
-  private static final String VALUE_FIELD_NAME = "value";
-  private static final String INCLUDED_DOC_FIELD_NAME = "doc";
-  private static final String TOTAL_ROWS_FIELD_NAME = "total_rows";
-
-  private ObjectMapper objectMapper = new ObjectMapper();
-
-  private boolean prefixJson = false;
-
-  /**
-   * Construct a new {@code BindingJacksonHttpMessageConverter}.
-   */
-  public CouchDbMappingJacksonHttpMessageConverter() {
-    super(new MediaType("application", "json", DEFAULT_CHARSET));
-  }
-
-  /**
-   * Sets the {@code ObjectMapper} for this view. If not set, a default
-   * {@link ObjectMapper#ObjectMapper() ObjectMapper} is used.
-   * <p/>
-   * Setting a custom-configured {@code ObjectMapper} is one way to take
-   * further control of the JSON serialization process. For example, an
-   * extended {@link org.codehaus.jackson.map.SerializerFactory} can be
-   * configured that provides custom serializers for specific types. The other
-   * option for refining the serialization process is to use Jackson's
-   * provided annotations on the types to be serialized, in which case a
-   * custom-configured ObjectMapper is unnecessary.
-   */
-  public void setObjectMapper(ObjectMapper objectMapper) {
-    Assert.notNull(objectMapper, "'objectMapper' must not be null");
-    this.objectMapper = objectMapper;
-  }
-
-  /**
-   * Indicates whether the JSON output by this view should be prefixed with
-   * "{} &&". Default is false.
-   * <p/>
-   * Prefixing the JSON string in this manner is used to help prevent JSON
-   * Hijacking. The prefix renders the string syntactically invalid as a
-   * script so that it cannot be hijacked. This prefix does not affect the
-   * evaluation of JSON, but if JSON validation is performed on the string,
-   * the prefix would need to be ignored.
-   */
-  public void setPrefixJson(boolean prefixJson) {
-    this.prefixJson = prefixJson;
-  }
-
-  @Override
-  public boolean canRead(Class<?> clazz, MediaType mediaType) {
-    JavaType javaType = getJavaType(clazz);
-    return this.objectMapper.canDeserialize(javaType) && canRead(mediaType);
-  }
-
-  /**
-   * Returns the Jackson {@link JavaType} for the specific class.
-   * <p/>
-   * <p/>
-   * Default implementation returns
-   * {@link TypeFactory#type(java.lang.reflect.Type)}, but this can be
-   * overridden in subclasses, to allow for custom generic collection
-   * handling. For instance:
-   * <p/>
-   * <pre class="code">
-   * protected JavaType getJavaType(Class&lt;?&gt; clazz) {
-   * if (List.class.isAssignableFrom(clazz)) {
-   * return TypeFactory.collectionType(ArrayList.class, MyBean.class);
-   * } else {
-   * return super.getJavaType(clazz);
-   * }
-   * }
-   * </pre>
-   *
-   * @param clazz the class to return the java type for
-   * @return the java type
-   */
-  protected JavaType getJavaType(Class<?> clazz) {
-    return TypeFactory.type(clazz);
-  }
-
-  @Override
-  public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-    return this.objectMapper.canSerialize(clazz) && canWrite(mediaType);
-  }
-
-  @Override
-  protected boolean supports(Class<?> clazz) {
-    // should not be called, since we override canRead/Write instead
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
-      throws IOException, HttpMessageNotReadableException {
-    JavaType javaType = getJavaType(clazz);
-    try {
-      return success(clazz, inputMessage);
-
-      // return this.objectMapper.readValue(inputMessage.getBody(),
-      // javaType);
-    } catch (Exception ex) {
-      throw new HttpMessageNotReadableException("Could not read JSON: "
-          + ex.getMessage(), ex);
-    }
-  }
-
-  private Object success(Class<?> clazz, HttpInputMessage inputMessage)
-      throws JsonParseException, IOException {
-
-    //Note, parsing code used from ektorp project
-    JsonParser jp = objectMapper.getJsonFactory().createJsonParser(
-        inputMessage.getBody());
-    if (jp.nextToken() != JsonToken.START_OBJECT) {
-      throw new RuntimeException("Expected data to start with an Object");
-    }
-    Map<String, Integer> fields = readHeaderFields(jp);
-
-    List result;
-    if (fields.containsKey(TOTAL_ROWS_FIELD_NAME)) {
-      int totalRows = fields.get(TOTAL_ROWS_FIELD_NAME);
-      if (totalRows == 0) {
-        return Collections.emptyList();
-      }
-      result = new ArrayList(totalRows);
-    } else {
-      result = new ArrayList();
-    }
-
-    ParseState state = new ParseState();
-
-    Object first = parseFirstRow(jp, state, clazz);
-    if (first == null) {
-      return Collections.emptyList();
-    } else {
-      result.add(first);
-    }
-
-    while (jp.getCurrentToken() != null) {
-      skipToField(jp, state.docFieldName, state);
-      if (atEndOfRows(jp)) {
-        return result;
-      }
-      result.add(jp.readValueAs(clazz));
-      endRow(jp, state);
-    }
-    return result;
-  }
-
-  private Object parseFirstRow(JsonParser jp, ParseState state, Class clazz)
-      throws JsonParseException, IOException, JsonProcessingException,
-      JsonMappingException {
-    skipToField(jp, VALUE_FIELD_NAME, state);
-    JsonNode value = null;
-    if (atObjectStart(jp)) {
-      value = jp.readValueAsTree();
-      jp.nextToken();
-      if (isEndOfRow(jp)) {
-        state.docFieldName = VALUE_FIELD_NAME;
-        Object doc = objectMapper.readValue(value, clazz);
-        endRow(jp, state);
-        return doc;
-      }
-    }
-    skipToField(jp, INCLUDED_DOC_FIELD_NAME, state);
-    if (atObjectStart(jp)) {
-      state.docFieldName = INCLUDED_DOC_FIELD_NAME;
-      Object doc = jp.readValueAs(clazz);
-      endRow(jp, state);
-      return doc;
-    }
-    return null;
-  }
-
-
-  private boolean isEndOfRow(JsonParser jp) {
-    return jp.getCurrentToken() == JsonToken.END_OBJECT;
-  }
-
-  private void endRow(JsonParser jp, ParseState state) throws IOException, JsonParseException {
-    state.inRow = false;
-    jp.nextToken();
-  }
-
-  private boolean atObjectStart(JsonParser jp) {
-    return jp.getCurrentToken() == JsonToken.START_OBJECT;
-  }
-
-  private boolean atEndOfRows(JsonParser jp) {
-    return jp.getCurrentToken() != JsonToken.START_OBJECT;
-  }
-
-  private void skipToField(JsonParser jp, String fieldName, ParseState state) throws JsonParseException, IOException {
-    String lastFieldName = null;
-    while (jp.getCurrentToken() != null) {
-      switch (jp.getCurrentToken()) {
-        case FIELD_NAME:
-          lastFieldName = jp.getCurrentName();
-          jp.nextToken();
-          break;
-        case START_OBJECT:
-          if (!state.inRow) {
-            state.inRow = true;
-            jp.nextToken();
-          } else {
-            if (isInField(fieldName, lastFieldName)) {
-              return;
-            } else {
-              jp.skipChildren();
-            }
-          }
-          break;
-        default:
-          if (isInField(fieldName, lastFieldName)) {
-            jp.nextToken();
-            return;
-          }
-          jp.nextToken();
-          break;
-      }
-    }
-  }
-
-  private boolean isInField(String fieldName, String lastFieldName) {
-    return lastFieldName != null && lastFieldName.equals(fieldName);
-  }
-
-
-  private Map<String, Integer> readHeaderFields(JsonParser jp)
-      throws JsonParseException, IOException {
-    Map<String, Integer> map = new HashMap<String, Integer>();
-    jp.nextToken();
-    String nextFieldName = jp.getCurrentName();
-    while (!nextFieldName.equals(ROWS_FIELD_NAME)) {
-      jp.nextToken();
-      map.put(nextFieldName, Integer.valueOf(jp.getIntValue()));
-      jp.nextToken();
-      nextFieldName = jp.getCurrentName();
-    }
-    return map;
-  }
-
-  @Override
-  protected void writeInternal(Object o, HttpOutputMessage outputMessage)
-      throws IOException, HttpMessageNotWritableException {
-
-    JsonEncoding encoding = getEncoding(outputMessage.getHeaders()
-        .getContentType());
-    JsonGenerator jsonGenerator = this.objectMapper.getJsonFactory()
-        .createJsonGenerator(outputMessage.getBody(), encoding);
-    try {
-      if (this.prefixJson) {
-        jsonGenerator.writeRaw("{} && ");
-      }
-      this.objectMapper.writeValue(jsonGenerator, o);
-    } catch (JsonGenerationException ex) {
-      throw new HttpMessageNotWritableException("Could not write JSON: "
-          + ex.getMessage(), ex);
-    }
-  }
-
-  private JsonEncoding getEncoding(MediaType contentType) {
-    if (contentType != null && contentType.getCharSet() != null) {
-      Charset charset = contentType.getCharSet();
-      for (JsonEncoding encoding : JsonEncoding.values()) {
-        if (charset.name().equals(encoding.getJavaName())) {
-          return encoding;
-        }
-      }
-    }
-    return JsonEncoding.UTF8;
-  }
-
-  private static class ParseState {
-    boolean inRow;
-    String docFieldName = "";
-  }
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java

@@ -1,41 +0,0 @@
-/*
- * Copyright 2002-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.document.couchdb.monitor;
-
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Base class to encapsulate common configuration settings when connecting to a CouchDB database
- *
- * @author Mark Pollack
- */
-public abstract class AbstractMonitor {
-
-
-  protected RestTemplate restTemplate;
-  protected String databaseUrl;
-
-  /**
-   * Gets the databaseUrl used to connect to CouchDB
-   *
-   * @return
-   */
-  public String getDatabaseUrl() {
-    return this.databaseUrl;
-  }
-
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java

@@ -1,62 +0,0 @@
-/*
- * Copyright 2002-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.document.couchdb.monitor;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Map;
-
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Expose basic server information via JMX
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Server Information")
-public class ServerInfo extends AbstractMonitor {
-
-
-  public ServerInfo(String databaseUrl) {
-    this.databaseUrl = databaseUrl;
-    this.restTemplate = new RestTemplate();
-  }
-
-
-  @ManagedOperation(description = "Server host name")
-  public String getHostName() throws UnknownHostException {
-    return InetAddress.getLocalHost().getHostName();
-  }
-
-
-  @ManagedOperation(description = "CouchDB Server Version")
-  public String getVersion() {
-    return (String) getRoot().get("version");
-  }
-
-  @ManagedOperation(description = "Message of the day")
-  public String getMotd() {
-    return (String) getRoot().get("greeting");
-  }
-
-  public Map getRoot() {
-    Map map = restTemplate.getForObject(getDatabaseUrl(), Map.class);
-    return map;
-  }
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/package-info.java

@@ -1,4 +0,0 @@
-/**
- * CouchDB specific JMX monitoring support.
- */
-package org.springframework.data.document.couchdb.monitor;

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java

@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-
-package org.springframework.data.document.couchdb.support;
-
-import org.springframework.dao.DataAccessException;
-
-/**
- * Helper class featuring helper methods for internal CouchDB classes.
- * <p/>
- * <p>Mainly intended for internal use within the framework.
- *
- * @author Thomas Risberg
- * @author Tareq Abedrabbo
- * @since 1.0
- */
-public abstract class CouchUtils {
-
-  /**
-   * Convert the given runtime exception to an appropriate exception from the
-   * <code>org.springframework.dao</code> hierarchy.
-   * Return null if no translation is appropriate: any other exception may
-   * have resulted from user code, and should not be translated.
-   *
-   * @param ex runtime exception that occurred
-   * @return the corresponding DataAccessException instance,
-   *         or <code>null</code> if the exception should not be translated
-   */
-  public static DataAccessException translateCouchExceptionIfPossible(RuntimeException ex) {
-
-    return null;
-  }
-
-  /**
-   * Adds an id variable to a URL
-   *
-   * @param url the URL to modify
-   * @return the modified URL
-   */
-  public static String addId(String url) {
-    return ensureTrailingSlash(url) + "{id}";
-  }
-
-
-  /**
-   * Adds a 'changes since' variable to a URL
-   *
-   * @param url
-   * @return
-   */
-  public static String addChangesSince(String url) {
-    return ensureTrailingSlash(url) + "_changes?since={seq}";
-  }
-
-  /**
-   * Ensures that a URL ends with a slash.
-   *
-   * @param url the URL to modify
-   * @return the modified URL
-   */
-  public static String ensureTrailingSlash(String url) {
-    if (!url.endsWith("/")) {
-      url += "/";
-    }
-    return url;
-  }
-
-}

spring-data-couchdb/src/main/resources/META-INF/spring.handlers

@@ -1 +0,0 @@
-http\://www.springframework.org/schema/data/couch=org.springframework.data.document.couchdb.config.CouchNamespaceHandler

spring-data-couchdb/src/main/resources/META-INF/spring.schemas

@@ -1,2 +0,0 @@
-http\://www.springframework.org/schema/data/couch/spring-couch-1.0.xsd=org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd
-http\://www.springframework.org/schema/data/couch/spring-couch.xsd=org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd

spring-data-couchdb/src/main/resources/META-INF/spring.tooling

@@ -1,4 +0,0 @@
-# Tooling related information for the Couch DB namespace
-http\://www.springframework.org/schema/data/couch@name=Couch Namespace
-http\://www.springframework.org/schema/data/couch@prefix=couch
-http\://www.springframework.org/schema/data/couch@icon=org/springframework/jdbc/config/spring-jdbc.gif

spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsd:schema xmlns="http://www.springframework.org/schema/data/couch"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            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/couch"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-  <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/data/repository"
-              schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
-
-
-  <xsd:element name="jmx">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-Defines a JMX Model MBeans for monitoring a CouchDB server'.
-			]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:attribute name="database-url" type="xsd:string" use="optional">
-        <xsd:annotation>
-          <xsd:documentation><![CDATA[
-The database URL of the CouchDB]]></xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java

@@ -1,77 +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.document.couchdb;
-
-import java.util.Date;
-
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-
-/**
- * @author Tareq Abedrabbo (tareq.abedrabbo@opencredo.com)
- * @since 13/01/2011
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class DummyDocument {
-
-  private String message;
-
-  private String timestamp = new Date().toString();
-
-  public DummyDocument() {
-  }
-
-  public DummyDocument(String message) {
-    this.message = message;
-  }
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public String getTimestamp() {
-    return timestamp;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    DummyDocument document = (DummyDocument) o;
-
-    if (message != null ? !message.equals(document.message) : document.message != null) return false;
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return message != null ? message.hashCode() : 0;
-  }
-
-  @Override
-  public String toString() {
-    return "DummyDocument{" +
-        "message='" + message + '\'' +
-        ", timestamp=" + timestamp +
-        '}';
-  }
-}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java

@@ -1,52 +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.document.couchdb;
-
-import org.hamcrest.Description;
-import org.hamcrest.Factory;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.springframework.http.HttpEntity;
-
-/**
- * Matches the content of the body of an HttpEntity.
- *
- * @author Tareq Abedrabbo
- * @since 31/01/2011
- */
-public class IsBodyEqual extends TypeSafeMatcher<HttpEntity> {
-
-  private Object object;
-
-  public IsBodyEqual(Object object) {
-    this.object = object;
-  }
-
-  @Override
-  public boolean matchesSafely(HttpEntity httpEntity) {
-    return httpEntity.getBody().equals(object);
-  }
-
-  public void describeTo(Description description) {
-    description.appendText("body equals ").appendValue(object);
-  }
-
-  @Factory
-  public static Matcher<HttpEntity> bodyEqual(Object object) {
-    return new IsBodyEqual(object);
-  }
-}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java

@@ -1,38 +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.document.couchdb.admin;
-
-import java.util.List;
-
-import junit.framework.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.data.document.couchdb.core.CouchConstants;
-
-public class CouchAdminIntegrationTests {
-
-  @Test
-  @Ignore("until CI has couch server running")
-  public void dbLifecycle() {
-
-    CouchAdmin admin = new CouchAdmin(CouchConstants.COUCHDB_URL);
-    admin.deleteDatabase("foo");
-    List<String> dbs = admin.listDatabases();
-    admin.createDatabase("foo");
-    List<String> newDbs = admin.listDatabases();
-    Assert.assertEquals(dbs.size() + 1, newDbs.size());
-  }
-}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java

@@ -1,118 +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.document.couchdb.core;
-
-import static org.junit.Assume.assumeNoException;
-import static org.junit.Assume.assumeTrue;
-import static org.springframework.http.HttpStatus.OK;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.springframework.http.*;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Base class for CouchDB integration tests. Checks whether CouchDB is available before running each test,
- * in which case the test is executed. If CouchDB is not available, tests are ignored.
- *
- * @author Tareq Abedrabbo (tareq.abedrabbo@opencredo.com)
- * @since 13/01/2011
- */
-
-public abstract class AbstractCouchTemplateIntegrationTests {
-
-
-  protected static final Log log = LogFactory.getLog(AbstractCouchTemplateIntegrationTests.class);
-
-  protected static final RestTemplate restTemplate = new RestTemplate();
-
-  /**
-   * This methods ensures that the database is running. Otherwise, the test is ignored.
-   */
-  @BeforeClass
-  public static void assumeDatabaseIsUpAndRunning() {
-    try {
-      ResponseEntity<String> responseEntity = restTemplate.getForEntity(CouchConstants.COUCHDB_URL, String.class);
-      assumeTrue(responseEntity.getStatusCode().equals(OK));
-      log.debug("CouchDB is running on " + CouchConstants.COUCHDB_URL +
-          " with status " + responseEntity.getStatusCode());
-    } catch (RestClientException e) {
-      log.debug("CouchDB is not running on " + CouchConstants.COUCHDB_URL);
-      assumeNoException(e);
-    }
-  }
-
-  @Before
-  public void setUpTestDatabase() throws Exception {
-    RestTemplate template = new RestTemplate();
-    template.setErrorHandler(new DefaultResponseErrorHandler() {
-      @Override
-      public void handleError(ClientHttpResponse response) throws IOException {
-        // do nothing, error status will be handled in the switch statement
-      }
-    });
-    ResponseEntity<String> response = template.getForEntity(CouchConstants.TEST_DATABASE_URL, String.class);
-    HttpStatus statusCode = response.getStatusCode();
-    switch (statusCode) {
-      case NOT_FOUND:
-        createNewTestDatabase();
-        break;
-      case OK:
-        deleteExisitingTestDatabase();
-        createNewTestDatabase();
-        break;
-      default:
-        throw new IllegalStateException("Unsupported http status [" + statusCode + "]");
-    }
-  }
-
-  private void deleteExisitingTestDatabase() {
-    restTemplate.delete(CouchConstants.TEST_DATABASE_URL);
-  }
-
-  private void createNewTestDatabase() {
-    restTemplate.put(CouchConstants.TEST_DATABASE_URL, null);
-  }
-
-  /**
-   * Reads a CouchDB document and converts it to the expected type.
-   */
-  protected <T> T getDocument(String id, Class<T> expectedType) {
-    String url = CouchConstants.TEST_DATABASE_URL + "{id}";
-    return restTemplate.getForObject(url, expectedType, id);
-  }
-
-  /**
-   * Writes a CouchDB document
-   */
-  protected String putDocument(Object document) {
-    HttpHeaders headers = new HttpHeaders();
-    headers.setContentType(MediaType.APPLICATION_JSON);
-    HttpEntity request = new HttpEntity(document, headers);
-    String id = UUID.randomUUID().toString();
-    restTemplate.put(CouchConstants.TEST_DATABASE_URL + "{id}", request, id);
-    return id;
-  }
-}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java

@@ -1,27 +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.document.couchdb.core;
-
-public abstract class CouchConstants {
-
-  public static final String COUCHDB_URL = "http://127.0.0.1:5984/";
-  public static final String TEST_DATABASE_URL = COUCHDB_URL + "si_couchdb_test/";
-
-  public CouchConstants() {
-    // TODO Auto-generated constructor stub
-  }
-
-}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java

@@ -1,39 +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.document.couchdb.core;
-
-import java.util.UUID;
-
-import junit.framework.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.data.document.couchdb.DummyDocument;
-
-public class CouchTemplateIntegrationTests extends AbstractCouchTemplateIntegrationTests {
-
-
-  @Test
-  @Ignore("until CI has couch server running")
-  public void saveAndFindTest() {
-    CouchTemplate template = new CouchTemplate(CouchConstants.TEST_DATABASE_URL);
-    DummyDocument document = new DummyDocument("hello");
-    String id = UUID.randomUUID().toString();
-    template.save(id, document);
-    DummyDocument foundDocument = template.findOne(id, DummyDocument.class);
-    Assert.assertEquals(document.getMessage(), foundDocument.getMessage());
-  }
-}

spring-data-couchdb/src/test/resources/log4j.properties

@@ -1,13 +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 %p [%c] - <%m>%n
-
-log4j.category.org.apache.activemq=ERROR
-log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.transaction=INFO
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG

spring-data-couchdb/src/test/resources/server-jmx.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:couch="http://www.springframework.org/schema/data/couch"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/data/couch http://www.springframework.org/schema/data/couch/spring-couch-1.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
-
-  <couch:jmx/>
-
-  <context:mbean-export/>
-
-  <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean"
-        p:port="1099"/>
-
-  <!-- Expose JMX over RMI -->
-  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry"
-        p:objectName="connector:name=rmi"
-        p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector"/>
-
-</beans>

spring-data-couchdb/template.mf

@@ -1,24 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.couchdb
-Bundle-Name: Spring Data Couch DB Support
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
-Import-Template: 
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.jmx.*;version="[3.0.0, 4.0.0)",
- org.springframework.remoting.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.data.document.*;version="[1.0.0, 2.0.0)",
- org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.w3c.dom.*;version="0"
-
-

spring-data-document-parent/pom.xml

@@ -1,415 +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-document-parent</artifactId>
-  <name>Spring Data Document Parent</name>
-  <url>http://www.springsource.org/spring-data/data-document</url>
-  <version>1.0.0.M4</version>
-  <packaging>pom</packaging>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- versions for commonly-used dependencies -->
-    <junit.version>4.8.1</junit.version>
-    <log4j.version>1.2.15</log4j.version>
-    <org.mockito.version>1.8.4</org.mockito.version>
-    <org.slf4j.version>1.5.10</org.slf4j.version>
-    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version>3.0.6.RELEASE</org.springframework.version>
-    <data.commons.version>1.2.0.M1</data.commons.version>
-    <aspectj.version>1.6.11.RELEASE</aspectj.version>
-  </properties>
-  <profiles>
-    <profile>
-      <id>strict</id>
-      <properties>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-      </properties>
-    </profile>
-    <profile>
-      <id>fast</id>
-      <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-      </properties>
-    </profile>
-    <profile>
-      <id>staging</id>
-      <distributionManagement>
-        <site>
-          <id>spring-site-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/data-document/docs</url>
-        </site>
-        <repository>
-          <id>spring-milestone-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/data-document/milestone</url>
-        </repository>
-        <snapshotRepository>
-          <id>spring-snapshot-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/data-document/snapshot</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>bootstrap</id>
-      <!-- TODO: move the repositories in here before release -->
-    </profile>
-  </profiles>
-  <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-document/docs/${project.version}
-      </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>
-  <dependencyManagement>
-    <!--
-        inheritable <dependency> declarations for child poms. children still
-        must explicitly declare the groupId/artifactId of these dependencies
-        in order for them to show up on the classpath, but metadata like
-        <version> and <scope> are inherited, which cuts down on verbosity.
-        see
-        http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-dep-manage.html
-      -->
-    <dependencies>
-
-      <!--  Spring -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-orm</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-expression</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${org.springframework.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <!--  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-commons-aspects</artifactId>
-        <version>${data.commons.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-couchdb</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-mongodb</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <!-- Logging -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jdmk</groupId>
-            <artifactId>jmxtools</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jmx</groupId>
-            <artifactId>jmxri</artifactId>
-          </exclusion>
-        </exclusions>
-        <scope>runtime</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>jsr250-api</artifactId>
-        <version>1.0</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>${org.mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <!--
-        dependency definitions to be inherited by child poms. any
-        <dependency> declarations here will automatically show up on child
-        project classpaths. only items that are truly common across all
-        projects (modules and samples) should go here. otherwise, consider
-        <dependencyManagement> above
-      -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</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>
-        <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>
-        <configuration>
-          <useFile>false</useFile>
-          <includes>
-            <include>**/*Tests.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/Abstract*.java</exclude>
-          </excludes>
-          <junitArtifactName>junit:junit</junitArtifactName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <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>true</failOnWarnings>
-          </configuration>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <!-- necessary for bundlor and utils -->
-      <id>repository.plugin.springsource.release</id>
-      <name>SpringSource Maven Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://maven.springframework.org/release</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>repository.springframework.maven.milestone</id>
-      <name>Spring Framework Maven Milestone Repository</name>
-      <url>http://maven.springframework.org/milestone</url>
-    </repository>
-    <repository>
-      <id>repository.springframework.maven.snapshot</id>
-      <name>Spring Framework Maven Snapshot Repository</name>
-      <url>http://maven.springframework.org/snapshot</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>
-</project>

spring-data-mongodb-cross-store/pom.xml

@@ -1,219 +1,145 @@
-<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-document-parent</artifactId>
-    <version>1.0.0.M4</version>
-    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-cross-store</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Data MongoDB Cross-store Persistence Support</name>
-  <dependencies>
+<?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">
 
-    <!--  Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aspects</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.3.6.BUILD-SNAPSHOT</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>
-    </dependency>
-    <!-- <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-commons-aspects</artifactId>
-    </dependency> -->
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-mongodb</artifactId>
-    </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>
 
+		<!-- Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>1.3.6.BUILD-SNAPSHOT</version>
+		</dependency>
 
-    <!-- Logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>runtime</scope>
-    </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>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <optional>true</optional>
-    </dependency>
+		<!-- JPA -->
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<version>${jpa}</version>
+		</dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
+		<!-- 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>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
+	</dependencies>
 
-    <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>
-
-    <!-- JPA -->
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</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>
-
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>jboss-repository</id>
-      <name>JBoss Public Repository</name>
-      <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>spring-maven-milestones</id>
-      <name>Springframework Maven Milestone Repository</name>
-      <url>http://maven.springframework.org/milestone</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>spring-maven-release</id>
-      <name>Springframework Maven Release Repository</name>
-      <url>http://maven.springframework.org/release</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <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>
+	<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>

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java

@@ -1,30 +1,22 @@
-/*
- * 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.document.couchdb.core;
-
-import org.junit.Test;
-
-/**
- * Unit tests for CouchTemplate with mocks
- */
-public class CouchTemplateTests {
-
-  @Test
-  public void foo() {
-
-  }
-}
+/*
+ * 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.crossstore;
+
+import org.springframework.data.crossstore.ChangeSetBacked;
+
+public interface DocumentBacked extends ChangeSetBacked {
+
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java

@@ -0,0 +1,197 @@
+/*
+ * 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.crossstore;
+
+import javax.persistence.EntityManagerFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.crossstore.ChangeSet;
+import org.springframework.data.crossstore.ChangeSetBacked;
+import org.springframework.data.crossstore.ChangeSetPersister;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.BasicDBObject;
+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";
+
+	private static final String ENTITY_ID = "_entity_id";
+
+	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
+
+	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
+
+	protected final Logger log = LoggerFactory.getLogger(getClass());
+
+	private MongoTemplate mongoTemplate;
+
+	private EntityManagerFactory entityManagerFactory;
+
+	public void setMongoTemplate(MongoTemplate mongoTemplate) {
+		this.mongoTemplate = mongoTemplate;
+	}
+
+	public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
+		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 {
+
+		if (id == null) {
+			log.debug("Unable to load MongoDB data for null id");
+			return;
+		}
+
+		String collName = getCollectionNameForEntity(entityClass);
+
+		final DBObject dbk = new BasicDBObject();
+		dbk.put(ENTITY_ID, id);
+		dbk.put(ENTITY_CLASS, entityClass.getName());
+		if (log.isDebugEnabled()) {
+			log.debug("Loading MongoDB data for " + dbk);
+		}
+		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				for (DBObject dbo : collection.find(dbk)) {
+					String key = (String) dbo.get(ENTITY_FIELD_NAME);
+					if (log.isDebugEnabled()) {
+						log.debug("Processing key: " + key);
+					}
+					if (!changeSet.getValues().containsKey(key)) {
+						String className = (String) dbo.get(ENTITY_FIELD_CLASS);
+						if (className == null) {
+							throw new DataIntegrityViolationException("Unble to convert property " + key + ": Invalid metadata, "
+									+ ENTITY_FIELD_CLASS + " not available");
+						}
+						Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
+						Object value = mongoTemplate.getConverter().read(clazz, dbo);
+						if (log.isDebugEnabled()) {
+							log.debug("Adding to ChangeSet: " + key);
+						}
+						changeSet.set(key, value);
+					}
+				}
+				return null;
+			}
+		});
+	}
+
+	/*
+	 * (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) {
+			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
+		}
+		Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+		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.");
+			return 0L;
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug("Flush: changeset: " + cs.getValues());
+		}
+
+		String collName = getCollectionNameForEntity(entity.getClass());
+		if (mongoTemplate.getCollection(collName) == null) {
+			mongoTemplate.createCollection(collName);
+		}
+
+		for (String key : cs.getValues().keySet()) {
+			if (key != null && !key.startsWith("_") && !key.equals(ChangeSetPersister.ID_KEY)) {
+				Object value = cs.getValues().get(key);
+				final DBObject dbQuery = new BasicDBObject();
+				dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
+				dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
+				dbQuery.put(ENTITY_FIELD_NAME, key);
+				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
+					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						return collection.findOne(dbQuery);
+					}
+				});
+				if (value == null) {
+					if (log.isDebugEnabled()) {
+						log.debug("Flush: removing: " + dbQuery);
+					}
+					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.remove(dbQuery);
+							return null;
+						}
+					});
+				} else {
+					final DBObject dbDoc = new BasicDBObject();
+					dbDoc.putAll(dbQuery);
+					if (log.isDebugEnabled()) {
+						log.debug("Flush: saving: " + dbQuery);
+					}
+					mongoTemplate.getConverter().write(value, dbDoc);
+					dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
+					if (dbId != null) {
+						dbDoc.put("_id", dbId.get("_id"));
+					}
+					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.save(dbDoc);
+							return null;
+						}
+					});
+				}
+			}
+		}
+		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 mongoTemplate.getCollectionName(entityClass);
+	}
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj

@@ -0,0 +1,270 @@
+/*
+ * 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.crossstore;
+
+import java.lang.reflect.Field;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Transient;
+import javax.persistence.Entity;
+
+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;
+import org.springframework.data.crossstore.ChangeSet;
+import org.springframework.data.crossstore.ChangeSetPersister;
+import org.springframework.data.crossstore.ChangeSetPersister.NotFoundException;
+import org.springframework.data.crossstore.HashMapChangeSet;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * Aspect to turn an object annotated with @Document into a persistent document using Mongo.
+ * 
+ * @author Thomas Risberg
+ */
+public aspect MongoDocumentBacking {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class);
+
+	// Aspect shared config
+	private ChangeSetPersister<Object> changeSetPersister;
+
+	public void setChangeSetPersister(ChangeSetPersister<Object> changeSetPersister) {
+		this.changeSetPersister = changeSetPersister;
+	}
+
+	// ITD to introduce N state to Annotated objects
+	declare parents : (@Entity *) implements DocumentBacked;
+
+	// The annotated fields that will be persisted in MongoDB rather than with JPA
+	declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
+
+	// -------------------------------------------------------------------------
+	// Advise user-defined constructors of ChangeSetBacked objects to create a new
+	// backing ChangeSet
+	// -------------------------------------------------------------------------
+	pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
+		execution((DocumentBacked+).new(..)) &&
+		!execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity);
+
+	pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity, ChangeSet cs) : 
+		execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity) && 
+		args(cs);
+
+	protected pointcut entityFieldGet(DocumentBacked entity) :
+        get(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        !get(* DocumentBacked.*);
+
+	protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
+        set(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        args(newVal) &&
+        !set(* DocumentBacked.*);
+
+	// intercept EntityManager.merge calls
+	public pointcut entityManagerMerge(EntityManager em, Object entity) : 
+    call(* EntityManager.merge(Object)) &&
+    target(em) &&
+    args(entity);
+
+	// intercept EntityManager.remove calls
+	// public pointcut entityManagerRemove(EntityManager em, Object entity) :
+	// call(* EntityManager.remove(Object)) &&
+	// target(em) &&
+	// args(entity);
+
+	// move changeSet from detached entity to the newly merged persistent object
+	Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
+		Object mergedEntity = proceed(em, entity);
+		if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
+			((DocumentBacked) mergedEntity).changeSet = ((DocumentBacked) entity).getChangeSet();
+		}
+		return mergedEntity;
+	}
+
+	// clear changeSet from removed entity
+	// Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
+	// if (entity instanceof DocumentBacked) {
+	// removeChangeSetValues((DocumentBacked)entity);
+	// }
+	// return proceed(em, entity);
+	// }
+
+	private static void removeChangeSetValues(DocumentBacked entity) {
+		LOGGER.debug("Removing all change-set values for " + entity);
+		ChangeSet nulledCs = new HashMapChangeSet();
+		DocumentBacked documentEntity = (DocumentBacked) entity;
+		@SuppressWarnings("unchecked")
+		ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>) documentEntity.itdChangeSetPersister;
+		try {
+			changeSetPersister.getPersistentState(documentEntity.getClass(), documentEntity.get_persistent_id(),
+					documentEntity.getChangeSet());
+		} catch (DataAccessException e) {
+		} catch (NotFoundException e) {
+		}
+		for (String key : entity.getChangeSet().getValues().keySet()) {
+			nulledCs.set(key, null);
+		}
+		entity.setChangeSet(nulledCs);
+	}
+
+	before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
+		LOGGER.debug("User-defined constructor called on DocumentBacked object of class " + entity.getClass());
+		// Populate all ITD fields
+		entity.setChangeSet(new HashMapChangeSet());
+		entity.itdChangeSetPersister = changeSetPersister;
+		entity.itdTransactionSynchronization = new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
+		// registerTransactionSynchronization(entity);
+	}
+
+	private static void registerTransactionSynchronization(DocumentBacked entity) {
+		if (TransactionSynchronizationManager.isSynchronizationActive()) {
+			if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Adding transaction synchronization for " + entity);
+				}
+				TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
+			} else {
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Transaction synchronization already active for " + entity);
+				}
+			}
+		} else {
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Transaction synchronization is not active for " + entity);
+			}
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	// ChangeSet-related mixins
+	// -------------------------------------------------------------------------
+	// Introduced field
+	@Transient
+	private ChangeSet DocumentBacked.changeSet;
+
+	@Transient
+	private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
+
+	@Transient
+	private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
+
+	public void DocumentBacked.setChangeSet(ChangeSet cs) {
+		this.changeSet = cs;
+	}
+
+	public ChangeSet DocumentBacked.getChangeSet() {
+		return changeSet;
+	}
+
+	// Flush the entity state to the persistent store
+	public void DocumentBacked.flush() {
+		Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
+		itdChangeSetPersister.persistState(this, this.changeSet);
+	}
+
+	public Object DocumentBacked.get_persistent_id() {
+		return itdChangeSetPersister.getPersistentId(this, this.changeSet);
+	}
+
+	// lifecycle methods
+	@javax.persistence.PostPersist
+	public void DocumentBacked.itdPostPersist() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PreUpdate
+	public void DocumentBacked.itdPreUpdate() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PostUpdate
+	public void DocumentBacked.itdPostUpdate() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PostRemove
+	public void DocumentBacked.itdPostRemove() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+		removeChangeSetValues(this);
+	}
+
+	@javax.persistence.PostLoad
+	public void DocumentBacked.itdPostLoad() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	/**
+	 * delegates field reads to the state accessors instance
+	 */
+	Object around(DocumentBacked entity): entityFieldGet(entity) {
+		Field f = field(thisJoinPoint);
+		String propName = f.getName();
+		LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName + "] using: " + entity.getChangeSet());
+		if (entity.getChangeSet().getValues().get(propName) == null) {
+			try {
+				this.changeSetPersister
+						.getPersistentState(entity.getClass(), entity.get_persistent_id(), entity.getChangeSet());
+			} catch (NotFoundException e) {
+			}
+		}
+		Object fValue = entity.getChangeSet().getValues().get(propName);
+		if (fValue != null) {
+			return fValue;
+		}
+		return proceed(entity);
+	}
+
+	/**
+	 * delegates field writes to the state accessors instance
+	 */
+	Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
+		Field f = field(thisJoinPoint);
+		String propName = f.getName();
+		LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName + "] with value=[" + newVal + "]");
+		entity.getChangeSet().set(propName, newVal);
+		return proceed(entity, newVal);
+	}
+
+	Field field(JoinPoint joinPoint) {
+		FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
+		return fieldSignature.getField();
+	}
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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
+ *      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,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.persistence.document;
+package org.springframework.data.mongodb.crossstore;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,8 +24,6 @@ import java.lang.annotation.Target;
  * @author Thomas Risberg
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({
-    ElementType.FIELD
-})
+@Target({ ElementType.FIELD })
 public @interface RelatedDocument {
 }

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;
+

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java

@@ -1,7 +0,0 @@
-package org.springframework.data.persistence.document;
-
-import org.springframework.data.persistence.ChangeSetBacked;
-
-public interface DocumentBacked extends ChangeSetBacked {
-
-}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java

@@ -1,63 +0,0 @@
-package org.springframework.data.persistence.document;
-
-//public class DocumentBackedTransactionSynchronization {
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.persistence.ChangeSetBacked;
-import org.springframework.data.persistence.ChangeSetPersister;
-import org.springframework.transaction.support.TransactionSynchronization;
-
-public class DocumentBackedTransactionSynchronization implements TransactionSynchronization {
-
-	protected final Log log = LogFactory.getLog(getClass());
-
-	private ChangeSetPersister<Object> changeSetPersister;
-
-	private ChangeSetBacked entity;
-
-	private int changeSetTxStatus = -1;
-
-	public DocumentBackedTransactionSynchronization(ChangeSetPersister<Object> changeSetPersister, ChangeSetBacked entity) {
-		this.changeSetPersister = changeSetPersister;
-		this.entity = entity;
-	}
-	
-	public void afterCommit() {
-		log.debug("After Commit called for " + entity);
-		changeSetPersister.persistState(entity, entity.getChangeSet());
-		changeSetTxStatus = 0;
-	}
-
-	public void afterCompletion(int status) {
-		log.debug("After Completion called with status = " + status);
-		if (changeSetTxStatus == 0) {
-			if (status == STATUS_COMMITTED) {
-				// this is good
-				log.debug("ChangedSetBackedTransactionSynchronization completed successfully for " + this.entity);
-			}
-			else {
-				// this could be bad - TODO: compensate
-				log.error("ChangedSetBackedTransactionSynchronization failed for " + this.entity);
-			}
-		}
-	}
-
-	public void beforeCommit(boolean readOnly) {
-	}
-
-	public void beforeCompletion() {
-	}
-
-	public void flush() {
-	}
-
-	public void resume() {
-		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
-	}
-
-	public void suspend() {
-		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
-	}
-	
-}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java

@@ -1,169 +0,0 @@
-package org.springframework.data.persistence.document.mongodb;
-
-import javax.persistence.EntityManagerFactory;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.MongoException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.mongodb.core.CollectionCallback;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.persistence.ChangeSet;
-import org.springframework.data.persistence.ChangeSetBacked;
-import org.springframework.data.persistence.ChangeSetPersister;
-import org.springframework.util.ClassUtils;
-
-public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
-
-  private static final String ENTITY_CLASS = "_entity_class";
-
-  private static final String ENTITY_ID = "_entity_id";
-
-  private static final String ENTITY_FIELD_NAME = "_entity_field_name";
-
-  private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
-
-  protected final Log log = LogFactory.getLog(getClass());
-
-  private MongoTemplate mongoTemplate;
-
-  private EntityManagerFactory entityManagerFactory;
-
-  public void setMongoTemplate(MongoTemplate mongoTemplate) {
-    this.mongoTemplate = mongoTemplate;
-  }
-
-  public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
-    this.entityManagerFactory = entityManagerFactory;
-  }
-
-
-  public void getPersistentState(Class<? extends ChangeSetBacked> entityClass,
-      Object id, final ChangeSet changeSet) 
-      throws DataAccessException, NotFoundException {
-    
-    if (id == null) {
-      log.debug("Unable to load MongoDB data for null id");
-      return;
-    }
-    
-    String collName = getCollectionNameForEntity(entityClass);
-
-    final DBObject dbk = new BasicDBObject();
-    dbk.put(ENTITY_ID, id);
-    dbk.put(ENTITY_CLASS, entityClass.getName());
-    if (log.isDebugEnabled()) {
-      log.debug("Loading MongoDB data for " + dbk);
-    }
-    mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-      public Object doInCollection(DBCollection collection)
-          throws MongoException, DataAccessException {
-        for (DBObject dbo : collection.find(dbk)) {
-          String key = (String) dbo.get(ENTITY_FIELD_NAME);
-          if (log.isDebugEnabled()) {
-            log.debug("Processing key: " + key);
-          }
-          if (!changeSet.getValues().containsKey(key)) {
-            String className = (String) dbo.get(ENTITY_FIELD_CLASS);
-            if (className == null) {
-              throw new DataIntegrityViolationException(
-                  "Unble to convert property " + key
-                      + ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
-            }
-            Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
-            Object value = mongoTemplate.getConverter().read(clazz, dbo);
-            if (log.isDebugEnabled()) {
-              log.debug("Adding to ChangeSet: " + key);
-            }
-            changeSet.set(key, value);
-          }
-        }
-        return null;
-      }
-    });
-  }
-
-  public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
-    log.debug("getPersistentId called on " + entity);
-    if (entityManagerFactory == null) {
-      throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
-    }
-    Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
-    return o;
-  }
-
-  public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
-    if (cs == null) {
-      log.debug("Flush: changeset was null, nothing to flush.");
-      return 0L;
-    }
-        
-    if (log.isDebugEnabled()) {
-      log.debug("Flush: changeset: " + cs.getValues());
-    }
-
-    String collName = getCollectionNameForEntity(entity.getClass());
-    DBCollection dbc = mongoTemplate.getCollection(collName);
-    if (dbc == null) {
-      dbc = mongoTemplate.createCollection(collName);
-    }
-    for (String key : cs.getValues().keySet()) {
-      if (key != null && !key.startsWith("_") && !key.equals(ChangeSetPersister.ID_KEY)) {
-        Object value = cs.getValues().get(key);
-        final DBObject dbQuery = new BasicDBObject();
-        dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
-        dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
-        dbQuery.put(ENTITY_FIELD_NAME, key);
-        DBObject dbId = mongoTemplate.execute(collName,
-            new CollectionCallback<DBObject>() {
-              public DBObject doInCollection(DBCollection collection)
-                  throws MongoException, DataAccessException {
-                return collection.findOne(dbQuery);
-              }
-            });
-        if (value == null) {
-          if (log.isDebugEnabled()) {
-            log.debug("Flush: removing: " + dbQuery);
-          }
-          mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-            public Object doInCollection(DBCollection collection)
-                throws MongoException, DataAccessException {
-              collection.remove(dbQuery);
-              return null;
-            }
-          });
-        }
-        else {
-          final DBObject dbDoc = new BasicDBObject();
-          dbDoc.putAll(dbQuery);
-          if (log.isDebugEnabled()) {
-            log.debug("Flush: saving: " + dbQuery);
-          }
-          mongoTemplate.getConverter().write(value, dbDoc);
-          dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
-          if (dbId != null) {
-            dbDoc.put("_id", dbId.get("_id"));
-          }
-          mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-            public Object doInCollection(DBCollection collection)
-                throws MongoException, DataAccessException {
-              collection.save(dbDoc);
-              return null;
-            }
-          });
-        }
-      }
-    }
-    return 0L;
-  }
-
-  private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
-    return ClassUtils.getQualifiedName(entityClass);
-  }
-
-}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj

@@ -1,257 +0,0 @@
-package org.springframework.data.persistence.document.mongodb;
-
-import java.lang.reflect.Field;
-
-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.springframework.dao.DataAccessException;
-import org.springframework.data.persistence.document.RelatedDocument;
-
-import org.springframework.data.persistence.document.DocumentBacked;
-import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
-import org.springframework.data.persistence.ChangeSet;
-import org.springframework.data.persistence.ChangeSetPersister;
-import org.springframework.data.persistence.ChangeSetPersister.NotFoundException;
-import org.springframework.data.persistence.HashMapChangeSet;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-/**
- * Aspect to turn an object annotated with @Document into a persistent document
- * using Mongo.
- * 
- * @author Thomas Risberg
- */
-public aspect MongoDocumentBacking {
-
-  private static final Log LOGGER = LogFactory
-      .getLog(MongoDocumentBacking.class);
-
-  // Aspect shared config
-  private ChangeSetPersister<Object> changeSetPersister;
-
-  public void setChangeSetPersister(
-      ChangeSetPersister<Object> changeSetPersister) {
-    this.changeSetPersister = changeSetPersister;
-  }
-
-  // ITD to introduce N state to Annotated objects
-  declare parents : (@Entity *) implements DocumentBacked;
-
-  // The annotated fields that will be persisted in MongoDB rather than with JPA
-  declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
-
-  // -------------------------------------------------------------------------
-  // Advise user-defined constructors of ChangeSetBacked objects to create a new
-  // backing ChangeSet
-  // -------------------------------------------------------------------------
-  pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
-		execution((DocumentBacked+).new(..)) &&
-		!execution((DocumentBacked+).new(ChangeSet)) &&
-		this(entity);
-
-  pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity,
-      ChangeSet cs) : 
-		execution((DocumentBacked+).new(ChangeSet)) &&
-		this(entity) && 
-		args(cs);
-
-  protected pointcut entityFieldGet(DocumentBacked entity) :
-        get(@RelatedDocument * DocumentBacked+.*) &&
-        this(entity) &&
-        !get(* DocumentBacked.*);
-
-  protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
-        set(@RelatedDocument * DocumentBacked+.*) &&
-        this(entity) &&
-        args(newVal) &&
-        !set(* DocumentBacked.*);
-
-  // intercept EntityManager.merge calls
-  public pointcut entityManagerMerge(EntityManager em, Object entity) : 
-    call(* EntityManager.merge(Object)) &&
-    target(em) &&
-    args(entity);
-  
-  // intercept EntityManager.remove calls
-//  public pointcut entityManagerRemove(EntityManager em, Object entity) : 
-//    call(* EntityManager.remove(Object)) &&
-//    target(em) &&
-//    args(entity);
-
-  // move changeSet from detached entity to the newly merged persistent object
-  Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
-    Object mergedEntity = proceed(em, entity);
-    if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
-      ((DocumentBacked)mergedEntity).changeSet = ((DocumentBacked)entity).getChangeSet();
-    }
-    return mergedEntity;
-  }
-
-  // clear changeSet from removed entity
-//  Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
-//    if (entity instanceof DocumentBacked) {
-//      removeChangeSetValues((DocumentBacked)entity);
-//    }
-//    return proceed(em, entity);
-//  }
-
-  private static void removeChangeSetValues(DocumentBacked entity) {
-    LOGGER.debug("Removing all change-set values for " + entity);	
-	ChangeSet nulledCs = new HashMapChangeSet();
-	DocumentBacked documentEntity = (DocumentBacked) entity;
-	@SuppressWarnings("unchecked")
-	ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>)documentEntity.itdChangeSetPersister;
-	try {
-        changeSetPersister.getPersistentState(
-            documentEntity.getClass(),
-            documentEntity.get_persistent_id(), 
-            documentEntity.getChangeSet());
-	} 
-	catch (DataAccessException e) {} 
-	catch (NotFoundException e) {}
-	for (String key :entity.getChangeSet().getValues().keySet()) {
-        nulledCs.set(key, null);
-	}
-	entity.setChangeSet(nulledCs);
-  }
-
-  before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
-    LOGGER
-        .debug("User-defined constructor called on DocumentBacked object of class "
-            + entity.getClass());
-    // Populate all ITD fields
-    entity.setChangeSet(new HashMapChangeSet());
-    entity.itdChangeSetPersister = changeSetPersister;
-    entity.itdTransactionSynchronization = 
-        new DocumentBackedTransactionSynchronization(changeSetPersister, entity);
-    //registerTransactionSynchronization(entity);
-  }
-
-  private static void registerTransactionSynchronization(DocumentBacked entity) {
-    if (TransactionSynchronizationManager.isSynchronizationActive()) {
-      if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
-        if (LOGGER.isDebugEnabled()) {
-          LOGGER.debug("Adding transaction synchronization for " + entity);
-        }
-        TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
-      }
-      else {
-        if (LOGGER.isDebugEnabled()) {
-          LOGGER.debug("Transaction synchronization already active for " + entity);
-        }
-      }
-    }
-    else {
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("Transaction synchronization is not active for " + entity);
-      }
-    }
-  }
-
-  // -------------------------------------------------------------------------
-  // ChangeSet-related mixins
-  // -------------------------------------------------------------------------
-  // Introduced field
-  @Transient private ChangeSet DocumentBacked.changeSet;
-
-  @Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
-
-  @Transient private DocumentBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
-
-  public void DocumentBacked.setChangeSet(ChangeSet cs) {
-    this.changeSet = cs;
-  }
-
-  public ChangeSet DocumentBacked.getChangeSet() {
-    return changeSet;
-  }
-
-  // Flush the entity state to the persistent store
-  public void DocumentBacked.flush() {
-    Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
-    itdChangeSetPersister.persistState(this, this.changeSet);
-  }
-
-  public Object DocumentBacked.get_persistent_id() {
-    return itdChangeSetPersister.getPersistentId(this, this.changeSet);
-  }
-
-  // lifecycle methods
-  @javax.persistence.PostPersist public void DocumentBacked.itdPostPersist() {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
-    }
-    registerTransactionSynchronization(this);
-  }
-  @javax.persistence.PreUpdate public void DocumentBacked.itdPreUpdate() {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
-    }
-    registerTransactionSynchronization(this);
-  }
-  @javax.persistence.PostUpdate public void DocumentBacked.itdPostUpdate() {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
-    }
-    registerTransactionSynchronization(this);
-  }
-  @javax.persistence.PostRemove public void DocumentBacked.itdPostRemove() {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
-    }
-    registerTransactionSynchronization(this);
-    removeChangeSetValues(this);
-  }
-  @javax.persistence.PostLoad public void DocumentBacked.itdPostLoad() {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
-    }
-    registerTransactionSynchronization(this);
-  }
-  
-  /**
-   * delegates field reads to the state accessors instance
-   */
-  Object around(DocumentBacked entity): entityFieldGet(entity) {
-    Field f = field(thisJoinPoint);
-    String propName = f.getName();
-    LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName
-        + "] using: " + entity.getChangeSet());
-    if (entity.getChangeSet().getValues().get(propName) == null) {
-      try {
-        this.changeSetPersister.getPersistentState(entity.getClass(),
-            entity.get_persistent_id(), entity.getChangeSet());
-      } catch (NotFoundException e) {
-      }
-    }
-    Object fValue = entity.getChangeSet().getValues().get(propName);
-    if (fValue != null) {
-      return fValue;
-    }
-    return proceed(entity);
-  }
-
-  /**
-   * delegates field writes to the state accessors instance
-   */
-  Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
-    Field f = field(thisJoinPoint);
-    String propName = f.getName();
-    LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName
-        + "] with value=[" + newVal + "]");
-    entity.getChangeSet().set(propName, newVal);
-    return proceed(entity, newVal);
-  }
-
-  Field field(JoinPoint joinPoint) {
-    FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
-    return fieldSignature.getField();
-  }
-}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java

@@ -1,154 +0,0 @@
-package org.springframework.data.document.persistence;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.document.persistence.test.Address;
-import org.springframework.data.document.persistence.test.Person;
-import org.springframework.data.document.persistence.test.Resume;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-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;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
-public class CrossStoreMongoTests {
-
-  @Autowired
-  private MongoTemplate mongoTemplate;
-
-  private EntityManager entityManager;
-
-  @Autowired
-  private PlatformTransactionManager transactionManager;
-  
-  @PersistenceContext
-  public void setEntityManager(EntityManager entityManager) {
-    this.entityManager = entityManager;
-  }
-
-  private void clearData(String collectionName) {
-    DBCollection col = this.mongoTemplate.getCollection(collectionName);
-    if (col != null) {
-      this.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());
-    Assert.assertNotNull(found);
-    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);
-    Assert.assertNotNull(found);
-    Assert.assertEquals(Long.valueOf(1), found.getId());
-    Assert.assertNotNull(found);
-    Assert.assertEquals(Long.valueOf(1), found.getId());
-    Assert.assertNotNull(found.getResume());
-    Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
-        + "VMware, Developer, 2007-" + "; "
-        + "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
-  }
-  
-  @Test
-  public void testMergeJpaEntityWithMongoDocument() {
-    TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
-    final Person detached = entityManager.find(Person.class, 1L);
-    detached.getResume().addJob("TargetRx, Developer, 2000-2005");
-    Person merged = txTemplate.execute(new TransactionCallback<Person>() {
-      public Person doInTransaction(TransactionStatus status) {
-        return entityManager.merge(detached);
-      }
-    });
-    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);
-    Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
-  }
-
-  @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);
-        Resume r2 = new Resume();
-        r2.addEducation("Skanstulls High School, 1975");
-        r2.addJob("DiMark, DBA, 1990-2000");
-        p2.setResume(r2);
-        p2.setId(2L);
-        entityManager.persist(p2);
-        Person p3 = new Person("Thomas", 20);
-        Resume r3 = new Resume();
-        r3.addEducation("Univ. of Stockholm, 1980");
-        r3.addJob("VMware, Developer, 2007-");
-        p3.setResume(r3);
-        p3.setId(3L);
-        entityManager.persist(p3);
-        return null;
-      }
-    });
-    txTemplate.execute(new TransactionCallback<Person>() {
-      public Person doInTransaction(TransactionStatus status) {
-        final Person found2 = entityManager.find(Person.class, 2L);
-        entityManager.remove(found2);
-        return null;
-      }
-    });
-    boolean weFound3 = false;
-    for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) {
-      Assert.assertTrue(!dbo.get("_entity_id").equals(2L));
-      if (dbo.get("_entity_id").equals(3L)) {
-        weFound3 = true;
-      }
-    }
-    Assert.assertTrue(weFound3);
-  }
-  
-}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java

@@ -1,87 +0,0 @@
-package org.springframework.data.document.persistence.test;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-import org.springframework.data.persistence.document.RelatedDocument;
-
-@Entity
-public class Person {
-
-  @Id
-  Long id;
-
-  private String name;
-
-  private int age;
-
-  private java.util.Date birthDate;
-
-  @RelatedDocument
-  private Address address;
-
-  @RelatedDocument
-  private Resume resume;
-
-  public Person() {
-  }
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-    this.birthDate = new java.util.Date();
-  }
-
-  public void birthday() {
-    ++age;
-  }
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public int getAge() {
-    return age;
-  }
-
-  public void setAge(int age) {
-    this.age = age;
-  }
-
-  public java.util.Date getBirthDate() {
-    return birthDate;
-  }
-
-  public void setBirthDate(java.util.Date birthDate) {
-    this.birthDate = birthDate;
-  }
-
-  public Resume getResume() {
-    return resume;
-  }
-
-  public void setResume(Resume resume) {
-    this.resume = resume;
-  }
-
-  public Address getAddress() {
-	return address;
-  }
-
-  public void setAddress(Address address) {
-	this.address = address;
-  }
-
-}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java

@@ -1,48 +0,0 @@
-package org.springframework.data.document.persistence.test;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.bson.types.ObjectId;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-@Document
-public class Resume {
-
-  private static final Log LOGGER = LogFactory.getLog(Resume.class);
-
-  @Id
-  private ObjectId id;
-
-  private String education = "";
-
-  private String jobs = "";
-
-  public String getId() {
-	  return id.toString();
-  }
-  
-  public String getEducation() {
-    return education;
-  }
-
-  public void addEducation(String education) {
-    LOGGER.debug("Adding education " + education);
-    this.education = this.education + (this.education.length() > 0 ? "; " : "") + education;
-  }
-
-  public String getJobs() {
-    return jobs;
-  }
-
-  public void addJob(String job) {
-    LOGGER.debug("Adding job " + job);
-    this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job;
-  }
-
-  @Override
-  public String toString() {
-    return "Resume [education=" + education + ", jobs=" + jobs + "]";
-  }
-
-}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java

@@ -0,0 +1,199 @@
+/*
+ * 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.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;
+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.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import com.mongodb.DBObject;
+
+/**
+ * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
+ * 
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
+public class CrossStoreMongoTests {
+
+	@Autowired
+	MongoTemplate mongoTemplate;
+
+	@PersistenceContext
+	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;
+			}
+		});
+	}
+
+	@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
+	public void testReadJpaToMongoEntityRelationship() {
+
+		Person found = entityManager.find(Person.class, 1L);
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found.getResume());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
+	}
+
+	@Test
+	@Transactional
+	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);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found.getResume());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-" + "; "
+				+ "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
+	}
+
+	@Test
+	public void testMergeJpaEntityWithMongoDocument() {
+
+		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) {
+				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);
+		Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+	}
+
+	@Test
+	public void testRemoveJpaEntityWithMongoDocument() {
+
+		txTemplate.execute(new TransactionCallback<Person>() {
+			public Person doInTransaction(TransactionStatus status) {
+				Person p2 = new Person("Thomas", 20);
+				Resume r2 = new Resume();
+				r2.addEducation("Skanstulls High School, 1975");
+				r2.addJob("DiMark, DBA, 1990-2000");
+				p2.setResume(r2);
+				p2.setId(2L);
+				entityManager.persist(p2);
+				Person p3 = new Person("Thomas", 20);
+				Resume r3 = new Resume();
+				r3.addEducation("Univ. of Stockholm, 1980");
+				r3.addJob("VMware, Developer, 2007-");
+				p3.setResume(r3);
+				p3.setId(3L);
+				entityManager.persist(p3);
+				return null;
+			}
+		});
+		txTemplate.execute(new TransactionCallback<Person>() {
+			public Person doInTransaction(TransactionStatus status) {
+				final Person found2 = entityManager.find(Person.class, 2L);
+				entityManager.remove(found2);
+				return null;
+			}
+		});
+
+		boolean weFound3 = false;
+
+		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;
+			}
+		}
+		Assert.assertTrue(weFound3);
+	}
+
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java

@@ -1,15 +1,29 @@
-package org.springframework.data.document.persistence.test;
+/*
+ * 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.crossstore.test;
 
 public class Address {
-	
+
 	private Integer streetNumber;
 	private String streetName;
 	private String city;
 	private String state;
 	private String zip;
-	
-	public Address(Integer streetNumber, String streetName, String city,
-			String state, String zip) {
+
+	public Address(Integer streetNumber, String streetName, String city, String state, String zip) {
 		super();
 		this.streetNumber = streetNumber;
 		this.streetName = streetName;
@@ -17,38 +31,45 @@ public class Address {
 		this.state = state;
 		this.zip = zip;
 	}
-	
+
 	public Integer getStreetNumber() {
 		return streetNumber;
 	}
+
 	public void setStreetNumber(Integer streetNumber) {
 		this.streetNumber = streetNumber;
 	}
+
 	public String getStreetName() {
 		return streetName;
 	}
+
 	public void setStreetName(String streetName) {
 		this.streetName = streetName;
 	}
+
 	public String getCity() {
 		return city;
 	}
+
 	public void setCity(String city) {
 		this.city = city;
 	}
+
 	public String getState() {
 		return state;
 	}
+
 	public void setState(String state) {
 		this.state = state;
 	}
+
 	public String getZip() {
 		return zip;
 	}
+
 	public void setZip(String zip) {
 		this.zip = zip;
 	}
-	
-	
-	
+
 }

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java

@@ -0,0 +1,102 @@
+/*
+ * 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.crossstore.test;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.springframework.data.mongodb.crossstore.RelatedDocument;
+
+@Entity
+public class Person {
+
+	@Id
+	Long id;
+
+	private String name;
+
+	private int age;
+
+	private java.util.Date birthDate;
+
+	@RelatedDocument
+	private Address address;
+
+	@RelatedDocument
+	private Resume resume;
+
+	public Person() {
+	}
+
+	public Person(String name, int age) {
+		this.name = name;
+		this.age = age;
+		this.birthDate = new java.util.Date();
+	}
+
+	public void birthday() {
+		++age;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public java.util.Date getBirthDate() {
+		return birthDate;
+	}
+
+	public void setBirthDate(java.util.Date birthDate) {
+		this.birthDate = birthDate;
+	}
+
+	public Resume getResume() {
+		return resume;
+	}
+
+	public void setResume(Resume resume) {
+		this.resume = resume;
+	}
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java

@@ -0,0 +1,63 @@
+/*
+ * 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.crossstore.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document
+public class Resume {
+
+	private static final Log LOGGER = LogFactory.getLog(Resume.class);
+
+	@Id
+	private ObjectId id;
+
+	private String education = "";
+
+	private String jobs = "";
+
+	public String getId() {
+		return id.toString();
+	}
+
+	public String getEducation() {
+		return education;
+	}
+
+	public void addEducation(String education) {
+		LOGGER.debug("Adding education " + education);
+		this.education = this.education + (this.education.length() > 0 ? "; " : "") + education;
+	}
+
+	public String getJobs() {
+		return jobs;
+	}
+
+	public void addJob(String job) {
+		LOGGER.debug("Adding job " + job);
+		this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job;
+	}
+
+	@Override
+	public String toString() {
+		return "Resume [education=" + education + ", jobs=" + jobs + "]";
+	}
+
+}

spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml

@@ -4,7 +4,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
   <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <class>org.springframework.data.document.persistence.test.Person</class>
+    <class>org.springframework.data.mongodb.crossstore.test.Person</class>
     <properties>
       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
       <!--value='create' to build a new database on each run; value='update' to modify an existing database; value='create-drop' means the same as 'create' but also drops tables when Hibernate closes; value='validate' makes no changes to the database-->

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -13,7 +13,7 @@
 
   <context:spring-configured/>
 
-  <context:component-scan base-package="org.springframework.persistence.test">
+  <context:component-scan base-package="org.springframework.persistence.mongodb.test">
     <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
   </context:component-scan>
 
@@ -38,12 +38,12 @@
   <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
 
   <!--  Mongo aspect config -->
-  <bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"
+  <bean class="org.springframework.data.mongodb.crossstore.MongoDocumentBacking"
         factory-method="aspectOf">
     <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
   </bean>
   <bean id="mongoChangeSetPersister" 
-      class="org.springframework.data.persistence.document.mongodb.MongoChangeSetPersister">
+      class="org.springframework.data.mongodb.crossstore.MongoChangeSetPersister">
     <property name="mongoTemplate" ref="mongoTemplate"/>
     <property name="entityManagerFactory" ref="entityManagerFactory"/>
   </bean>

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 %p [%c] - <%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

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>

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"

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.3.6.BUILD-SNAPSHOT</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>

spring-data-mongodb-log4j/README.md

@@ -5,7 +5,7 @@ and connects directly to the MongoDB server using the driver. It has no dependen
 
 To use it, configure a host, port, (optionally) applicationId, and database property in your Log4J configuration:
 
-    log4j.appender.stdout=org.springframework.data.document.mongodb.log4j.MongoLog4jAppender
+    log4j.appender.stdout=org.springframework.data.mongodb.log4j.MongoLog4jAppender
     log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
     log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
     log4j.appender.stdout.host = localhost
@@ -32,7 +32,7 @@ An example log entry might look like:
     {
       "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
       "applicationId" : "my.application",
-      "name" : "org.springframework.data.document.mongodb.log4j.AppenderTest",
+      "name" : "org.springframework.data.mongodb.log4j.MongoLog4jAppenderIntegrationTests",
       "level" : "DEBUG",
       "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
       "properties" : {

spring-data-mongodb-log4j/pom.xml

@@ -1,84 +1,30 @@
-<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-document-parent</artifactId>
-    <version>1.0.0.M4</version>
-    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-log4j</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Data MongoDB Log4J Appender</name>
+<?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.3.6.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 
-  <properties>
-    <mongo.version>2.3</mongo.version>
-  </properties>
+	<artifactId>spring-data-mongodb-log4j</artifactId>
+	<name>Spring Data MongoDB - Log4J Appender</name>
 
-  <dependencies>
+	<properties>
+		<log4j>1.2.16</log4j>
+	</properties>
 
-    <!-- MongoDB -->
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>${mongo.version}</version>
-    </dependency>
+	<dependencies>
 
-    <!-- Logging -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>compile</scope>
-    </dependency>
+		<!-- Logging -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j}</version>
+		</dependency>
 
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+	</dependencies>
 
 </project>

spring-data-mongodb-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java

@@ -1,208 +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.document.mongodb.log4j;
-
-import java.net.UnknownHostException;
-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;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-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";
-
-  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(boolean isActive) {
-    super(isActive);
-  }
-
-  public String getHost() {
-    return host;
-  }
-
-  public void setHost(String host) {
-    this.host = host;
-  }
-
-  public int getPort() {
-    return port;
-  }
-
-  public void setPort(int port) {
-    this.port = port;
-  }
-
-  public String getDatabase() {
-    return database;
-  }
-
-  public void setDatabase(String database) {
-    this.database = database;
-  }
-
-  public String getCollectionPattern() {
-    return collectionPattern;
-  }
-
-  public void setCollectionPattern(String collectionPattern) {
-    this.collectionPattern = collectionPattern;
-    this.collectionLayout = new PatternLayout(collectionPattern);
-  }
-
-  public String getApplicationId() {
-    return applicationId;
-  }
-
-  public void setApplicationId(String applicationId) {
-    this.applicationId = applicationId;
-  }
-
-  public void setWarnOrHigherWriteConcern(String wc) {
-    this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
-  }
-
-  public String getWarnOrHigherWriteConcern() {
-    return warnOrHigherWriteConcern.toString();
-  }
-
-  public String getInfoOrLowerWriteConcern() {
-    return infoOrLowerWriteConcern.toString();
-  }
-
-  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);
-  }
-
-  @SuppressWarnings({"unchecked"})
-  @Override
-  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());
-
-    // 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);
-    }
-
-    // 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)));
-
-    String coll = collectionLayout.format(event);
-
-    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);
-  }
-
-  public void close() {
-    mongo.close();
-  }
-
-  public boolean requiresLayout() {
-    return true;
-  }
-}

spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java

@@ -0,0 +1,226 @@
+/*
+ * 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 java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Map;
+
+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;
+
+/**
+ * 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";
+
+	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(boolean isActive) {
+		super(isActive);
+	}
+
+	public String getHost() {
+		return host;
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
+	public int getPort() {
+		return port;
+	}
+
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	public String getDatabase() {
+		return database;
+	}
+
+	public void setDatabase(String database) {
+		this.database = database;
+	}
+
+	public String getCollectionPattern() {
+		return collectionPattern;
+	}
+
+	public void setCollectionPattern(String collectionPattern) {
+		this.collectionPattern = collectionPattern;
+		this.collectionLayout = new PatternLayout(collectionPattern);
+	}
+
+	public String getApplicationId() {
+		return applicationId;
+	}
+
+	public void setApplicationId(String applicationId) {
+		this.applicationId = applicationId;
+	}
+
+	public void setWarnOrHigherWriteConcern(String wc) {
+		this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
+	}
+
+	public String getWarnOrHigherWriteConcern() {
+		return warnOrHigherWriteConcern.toString();
+	}
+
+	public String getInfoOrLowerWriteConcern() {
+		return infoOrLowerWriteConcern.toString();
+	}
+
+	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);
+	}
+
+	/*
+	 * (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());
+
+		// 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);
+		}
+
+		// 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)));
+
+		String coll = collectionLayout.format(event);
+
+		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);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.apache.log4j.AppenderSkeleton#close()
+	 */
+	public void close() {
+
+		if (mongo != null) {
+			mongo.close();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.apache.log4j.AppenderSkeleton#requiresLayout()
+	 */
+	public boolean requiresLayout() {
+		return true;
+	}
+}

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;
+

spring-data-mongodb-log4j/src/test/java/org/springframework/data/document/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.document.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");
-  }
-
-}

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");
+	}
+}

spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.core.convert;
+package org.springframework.data.mongodb.log4j;
+
+import org.junit.Test;
 
 /**
- * Interfaces for components being able to provide a {@link TypeMapper}.
+ * Unit tests for {@link MongoLog4jAppender}.
  * 
  * @author Oliver Gierke
  */
-public interface TypeMapperProvider {
+public class MongoLog4jAppenderUnitTests {
 
 	/**
-	 * Returns the {@link TypeMapper}.
-	 * 
-	 * @return the {@link TypeMapper} or {@literal null} if none available.
+	 * @see DATAMONGO-641
 	 */
-	TypeMapper getTypeMapper();
+	@Test
+	public void closesWithoutMongoInstancePresent() {
+		new MongoLog4jAppender().close();
+	}
 }

spring-data-mongodb-log4j/src/test/resources/log4j.properties

@@ -1,6 +1,6 @@
 log4j.rootCategory=INFO, stdout
 
-log4j.appender.stdout=org.springframework.data.document.mongodb.log4j.MongoLog4jAppender
+log4j.appender.stdout=org.springframework.data.mongodb.log4j.MongoLog4jAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 log4j.appender.stdout.host = localhost
@@ -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

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)}"

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.0.3.1152">
+<context version="7.1.7.187">
     <scope name="spring-data-mongodb" type="Project">
         <element name="Filter" type="TypeFilterReferenceOverridden">
             <element name="org.springframework.data.mongodb.**" type="IncludeTypePattern"/>
@@ -7,9 +7,10 @@
         <architecture>
             <element name="Config" type="Layer">
                 <element name="Assignment" type="TypeFilter">
-                    <element name="**.config.**" type="IncludeTypePattern"/>
+                    <element name="**.config.**" type="WeakTypePattern"/>
                 </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|GridFS"/>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Monitoring"/>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories"/>
             </element>
@@ -17,6 +18,30 @@
                 <element name="Assignment" type="TypeFilter">
                     <element name="**.repository.**" type="IncludeTypePattern"/>
                 </element>
+                <element name="API" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.repository.*" type="IncludeTypePattern"/>
+                    </element>
+                </element>
+                <element name="Query" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.query.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                </element>
+                <element name="Implementation" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.support.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query"/>
+                </element>
+                <element name="Config" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.config.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation"/>
+                </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
             </element>
             <element name="Monitoring" type="Layer">
@@ -25,6 +50,12 @@
                 </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
             </element>
+            <element name="GridFS" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
             <element name="Core" type="Layer">
                 <element name="Assignment" type="TypeFilter">
                     <element name="**.core.**" type="IncludeTypePattern"/>
@@ -63,6 +94,12 @@
                     <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
                 </element>
             </element>
+            <element name="API" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.springframework.data.mongodb.*" type="IncludeTypePattern"/>
+                </element>
+                <stereotype name="Public"/>
+            </element>
         </architecture>
         <workspace>
             <element name="src/main/java" type="JavaRootDirectory">

spring-data-mongodb/pom.xml

@@ -1,145 +1,162 @@
-<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">
+<?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</artifactId>
+
+	<name>Spring Data MongoDB - Core</name>
+	<description>MongoDB support for Spring Data</description>
+
 	<parent>
 		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-document-parent</artifactId>
-		<version>1.0.0.M4</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.3.6.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-data-mongodb</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data MongoDB Support</name>
 
 	<properties>
-		<mongo.version>2.6.5</mongo.version>
-		<querydsl.version>2.2.0</querydsl.version>
+		<validation>1.0.0.GA</validation>
 	</properties>
 
 	<dependencies>
-
+		
 		<!--  Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${spring}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
+			<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>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.code.morphia</groupId>
-					<artifactId>morphia</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		
+		<!-- CDI -->
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>${cdi}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>${cdi}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>${webbeans}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- JSR 303 Validation -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Test dependencies -->
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-
+		
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
+			<version>${jodatime}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>${slf4j}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-
+		
 	</dependencies>
+	
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
 
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
-				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0.2</version>
+				<artifactId>apt-maven-plugin</artifactId>
+				<version>1.0.8</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.mysema.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>
@@ -148,22 +165,30 @@
 						</goals>
 						<configuration>
 							<outputDirectory>target/generated-test-sources</outputDirectory>
-							<processor>org.springframework.data.mongodb.repository.MongoAnnotationProcessor</processor>
+							<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
 						</configuration>
 					</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>
 
-	<repositories>
-		<repository>
-			<id>querydsl</id>
-			<name>Mysema QueryDsl</name>
-			<url>http://source.mysema.com/maven2/releases</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 </project>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.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,42 +16,51 @@
 package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.data.authentication.UserCredentials;
 
+/**
+ * Exception being thrown in case we cannot connect to a MongoDB instance.
+ * 
+ * @author Oliver Gierke
+ */
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
 
-	private String username;
-
-	private char[] password;
-
-	private String database;
+	private final UserCredentials credentials;
+	private final String database;
 
 	private static final long serialVersionUID = 1172099106475265589L;
 
 	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
 		super(msg, cause);
+		this.database = null;
+		this.credentials = UserCredentials.NO_CREDENTIALS;
 	}
 
 	public CannotGetMongoDbConnectionException(String msg) {
-		super(msg);
+		this(msg, null, UserCredentials.NO_CREDENTIALS);
 	}
 
-	public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password2) {
+	public CannotGetMongoDbConnectionException(String msg, String database, UserCredentials credentials) {
 		super(msg);
-		this.username = username;
-		this.password = password2;
 		this.database = database;
+		this.credentials = credentials;
 	}
 
-	public String getUsername() {
-		return username;
-	}
-
-	public char[] getPassword() {
-		return password;
+	/**
+	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
+	 * 
+	 * @return
+	 */
+	public UserCredentials getCredentials() {
+		return this.credentials;
 	}
 
+	/**
+	 * Returns the name of the database trying to be accessed.
+	 * 
+	 * @return
+	 */
 	public String getDatabase() {
 		return database;
 	}
-
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-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,97 +15,211 @@
  */
 package org.springframework.data.mongodb.config;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.mongodb.Mongo;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
+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.MappingContextAwareBeanPostProcessor;
-import org.springframework.data.mongodb.MongoDbFactory;
+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.CamelCaseAbbreviatingFieldNamingStrategy;
 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;
 
+import com.mongodb.Mongo;
+
+/**
+ * Base class for Spring Data MongoDB configuration using JavaConfig.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
 @Configuration
 public abstract class AbstractMongoConfiguration {
 
-	public abstract String getDatabaseName();
+	/**
+	 * Return the name of the database to connect to.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	protected abstract String getDatabaseName();
 
-	@Bean
+	/**
+	 * Return the {@link Mongo} instance to connect to. Annotate with {@link Bean} in case you want to expose a
+	 * {@link Mongo} instance to the {@link org.springframework.context.ApplicationContext}.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
 	public abstract Mongo mongo() throws Exception;
 
+	/**
+	 * Creates a {@link MongoTemplate}.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
 	@Bean
 	public MongoTemplate mongoTemplate() throws Exception {
 		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
 	}
 
+	/**
+	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
+	 * configured in {@link #mongo()}.
+	 * 
+	 * @see #mongo()
+	 * @see #mongoTemplate()
+	 * @return
+	 * @throws Exception
+	 */
 	@Bean
-	public MongoDbFactory mongoDbFactory() throws Exception {
-		if (getUserCredentials() == null) {
+	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
+
+		UserCredentials credentials = getUserCredentials();
+
+		if (credentials == null) {
 			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
 		} else {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
 		}
 	}
 
-	public String getMappingBasePackage() {
-		return "";
+	/**
+	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
+	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
+	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
+	 * overriden to implement alternate behaviour.
+	 * 
+	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
+	 *         entities.
+	 */
+	protected String getMappingBasePackage() {
+
+		Package mappingBasePackage = getClass().getPackage();
+		return mappingBasePackage == null ? null : mappingBasePackage.getName();
 	}
 
-	public UserCredentials getUserCredentials() {
+	/**
+	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
+	 * be used.
+	 * 
+	 * @return
+	 */
+	protected UserCredentials getUserCredentials() {
 		return null;
 	}
 
+	/**
+	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
 	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+
 		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setInitialEntitySet(getInitialEntitySet());
+		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+
+		if (abbreviateFieldNames()) {
+			mappingContext.setFieldNamingStrategy(new CamelCaseAbbreviatingFieldNamingStrategy());
+		}
+
+		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
+	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	@Bean
+	public CustomConversions customConversions() {
+		return new CustomConversions(Collections.emptyList());
+	}
+
+	/**
+	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
+	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * 
+	 * @see #customConversions()
+	 * @see #mongoMappingContext()
+	 * @see #mongoDbFactory()
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
+		converter.setCustomConversions(customConversions());
+		return converter;
+	}
+
+	/**
+	 * Scans the mapping base package for classes annotated with {@link Document}.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+
 		String basePackage = getMappingBasePackage();
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+
 		if (StringUtils.hasText(basePackage)) {
 			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 					false);
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
 
-			Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
 			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass()
-						.getClassLoader()));
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
+						AbstractMongoConfiguration.class.getClassLoader()));
 			}
-			mappingContext.setInitialEntitySet(initialEntitySet);
 		}
-		return mappingContext;
-	}
 
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
-		afterMappingMongoConverterCreation(converter);
-		return converter;
+		return initialEntitySet;
 	}
 
 	/**
-	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
+	 * Configures whether to abbreviate field names for domain objects by configuring a
+	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
+	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
 	 * 
-	 * @param converter
+	 * @return
 	 */
-	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
+	protected boolean abbreviateFieldNames() {
+		return false;
 	}
-
-	@Bean
-	public MappingContextAwareBeanPostProcessor mappingContextAwareBeanPostProcessor() {
-		MappingContextAwareBeanPostProcessor bpp = new MappingContextAwareBeanPostProcessor();
-		bpp.setMappingContextBeanName("mongoMappingContext");
-		return bpp;
-	}
-
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.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,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.config;
 
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Constants to declare bean names used by the namespace configuration.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ * @author Martin Baumgartner
  */
 public abstract class BeanNames {
 
@@ -25,6 +28,9 @@ public abstract class BeanNames {
 	static final String INDEX_HELPER = "indexCreationHelper";
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
-	static final String POST_PROCESSOR = "mappingContextAwareBeanPostProcessor";
-
+	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
+	static final String IS_NEW_STRATEGY_FACTORY = "isNewStrategyFactory";
+	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
+	static final String MONGO_TEMPLATE = "mongoTemplate";
+	static final String GRID_FS_TEMPLATE = "gridFsTemplate";
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java

@@ -0,0 +1,78 @@
+/*
+ * 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.config;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mongodb.gridfs.GridFsTemplate;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to parse {@code gridFsTemplate} elements into {@link BeanDefinition}s.
+ * 
+ * @author Martin Baumgartner
+ */
+class GridFsTemplateParser extends AbstractBeanDefinitionParser {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String converterRef = element.getAttribute("converter-ref");
+		String dbFactoryRef = element.getAttribute("db-factory-ref");
+
+		BeanDefinitionBuilder gridFsTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(GridFsTemplate.class);
+
+		if (StringUtils.hasText(dbFactoryRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(dbFactoryRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
+		}
+
+		if (StringUtils.hasText(converterRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(converterRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
+		}
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(gridFsTemplateBuilder, BeanNames.GRID_FS_TEMPLATE)
+				.getBeanDefinition();
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.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,71 +13,87 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.config;
 
 import static org.springframework.data.mongodb.config.BeanNames.*;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
 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;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 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;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.core.type.filter.AssignableTypeFilter;
+import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
+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;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Bean definition parser for the {@code mapping-converter} element.
+ * 
+ * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Maciej Walkowiak
+ * @author Thomas Darimont
  */
-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();
 
-		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
+		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		id = StringUtils.hasText(id) ? id : "mappingConverter";
 
-		try {
-			registry.getBeanDefinition(POST_PROCESSOR);
-		} catch (NoSuchBeanDefinitionException ignored) {
-			BeanDefinitionBuilder postProcBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MappingContextAwareBeanPostProcessor.class);
-			postProcBuilder.addPropertyValue("mappingContextBeanName", ctxRef);
-			registry.registerBeanDefinition(POST_PROCESSOR, postProcBuilder.getBeanDefinition());
-		}
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
+
+		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
+		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");
@@ -90,6 +106,11 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		converterBuilder.addConstructorArgReference(dbFactoryRef);
 		converterBuilder.addConstructorArgReference(ctxRef);
 
+		String typeMapperRef = element.getAttribute("type-mapper-ref");
+		if (StringUtils.hasText(typeMapperRef)) {
+			converterBuilder.addPropertyReference("typeMapper", typeMapperRef);
+		}
+
 		if (conversionsDefinition != null) {
 			converterBuilder.addPropertyValue("customConversions", conversionsDefinition);
 		}
@@ -102,39 +123,100 @@ 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));
 		}
 
-		return converterBuilder.getBeanDefinition();
+		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
+
+		if (validatingMongoEventListener != null) {
+			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
+					VALIDATING_EVENT_LISTENER));
+		}
+
+		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
+		parserContext.popAndRegisterContainingComponent();
+		return null;
 	}
 
-	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
-			BeanDefinition conversionsDefinition) {
+	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
 
-		String ctxRef = element.getAttribute("mapping-context-ref");
-		if (!StringUtils.hasText(ctxRef)) {
-			BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MongoMappingContext.class);
+		String disableValidation = element.getAttribute("disable-validation");
+		boolean validationDisabled = StringUtils.hasText(disableValidation) && Boolean.valueOf(disableValidation);
 
-			Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
-			if (classesToAdd != null) {
-				mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
+		if (!validationDisabled) {
+
+			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition();
+			RuntimeBeanReference validator = getValidator(builder, parserContext);
+
+			if (validator != null) {
+				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
+				builder.addConstructorArgValue(validator);
+
+				return builder.getBeanDefinition();
 			}
-
-			if (conversionsDefinition != null) {
-				AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
-				simpleTypesDefinition.setFactoryBeanName("customConversions");
-				simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
-
-				mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
-			}
-
-			parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
-			ctxRef = MAPPING_CONTEXT;
 		}
 
+		return null;
+	}
+
+	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
+
+		if (!jsr303Present) {
+			return null;
+		}
+
+		RootBeanDefinition validatorDef = new RootBeanDefinition(
+				"org.springframework.validation.beanvalidation.LocalValidatorFactoryBean");
+		validatorDef.setSource(source);
+		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
+		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));
+
+		return new RuntimeBeanReference(validatorName);
+	}
+
+	static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+			BeanDefinition conversionsDefinition, String converterId) {
+
+		String ctxRef = element.getAttribute("mapping-context-ref");
+
+		if (StringUtils.hasText(ctxRef)) {
+			return ctxRef;
+		}
+
+		BeanComponentDefinitionBuilder componentDefinitionBuilder = new BeanComponentDefinitionBuilder(element,
+				parserContext);
+
+		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoMappingContext.class);
+
+		Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
+		if (classesToAdd != null) {
+			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
+		}
+
+		if (conversionsDefinition != null) {
+			AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
+			simpleTypesDefinition.setFactoryBeanName("customConversions");
+			simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
+
+			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
+		}
+
+		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
+		if ("true".equals(abbreviateFieldNames)) {
+			mappingContextBuilder.addPropertyValue("fieldNamingStrategy", new RootBeanDefinition(
+					CamelCaseAbbreviatingFieldNamingStrategy.class));
+		}
+
+		ctxRef = converterId + "." + MAPPING_CONTEXT;
+
+		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
@@ -143,22 +225,36 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
 
 		if (customConvertersElements.size() == 1) {
+
 			Element customerConvertersElement = customConvertersElements.get(0);
 			ManagedList<BeanMetadataElement> converterBeans = new ManagedList<BeanMetadataElement>();
 			List<Element> converterElements = DomUtils.getChildElementsByTagName(customerConvertersElement, "converter");
+
 			if (converterElements != null) {
 				for (Element listenerElement : converterElements) {
 					converterBeans.add(parseConverter(listenerElement, parserContext));
 				}
 			}
 
+			// Scan for Converter and GenericConverter beans in the given base-package
+			String packageToScan = customerConvertersElement.getAttribute(BASE_PACKAGE);
+			if (StringUtils.hasText(packageToScan)) {
+				ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true);
+				provider.addExcludeFilter(new NegatingFilter(new AssignableTypeFilter(Converter.class),
+						new AssignableTypeFilter(GenericConverter.class)));
+
+				for (BeanDefinition candidate : provider.findCandidateComponents(packageToScan)) {
+					converterBeans.add(candidate);
+				}
+			}
+
 			BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(CustomConversions.class);
 			conversionsBuilder.addConstructorArgValue(converterBeans);
 
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
 			conversionsBean.setSource(parserContext.extractSource(element));
 
-			parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(conversionsBean, "customConversions"));
 
 			return conversionsBean;
 		}
@@ -166,7 +262,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);
 
@@ -204,4 +300,52 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 				"Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
 		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.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class NegatingFilter implements TypeFilter {
+
+		private final Set<TypeFilter> delegates;
+
+		/**
+		 * Creates a new {@link NegatingFilter} with the given delegates.
+		 * 
+		 * @param filters
+		 */
+		public NegatingFilter(TypeFilter... filters) {
+			Assert.notNull(filters);
+			this.delegates = new HashSet<TypeFilter>(Arrays.asList(filters));
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
+		 */
+		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
+
+			for (TypeFilter delegate : delegates) {
+				if (delegate.match(metadataReader, metadataReaderFactory)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
 }

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);
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 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.
@@ -15,24 +15,26 @@
  */
 package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.mongodb.config.BeanNames.*;
+import static org.springframework.data.config.ParsingUtils.*;
+import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 import com.mongodb.Mongo;
+import com.mongodb.MongoURI;
 
 /**
  * {@link BeanDefinitionParser} to parse {@code db-factory} elements into {@link BeanDefinition}s.
@@ -42,43 +44,68 @@ import com.mongodb.Mongo;
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
-		String id = element.getAttribute("id");
-		if (!StringUtils.hasText(id)) {
-			id = DB_FACTORY;
-		}
-		return id;
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY;
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
+		Object source = parserContext.extractSource(element);
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String uri = element.getAttribute("uri");
 		String mongoRef = element.getAttribute("mongo-ref");
-		if (!StringUtils.hasText(mongoRef)) {
-			mongoRef = registerMongoBeanDefinition(element, parserContext);
-		}
-
-		// Database name
 		String dbname = element.getAttribute("dbname");
-		if (!StringUtils.hasText(dbname)) {
-			dbname = "db";
+		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
+
+		// Common setup
+		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
+		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");
+
+		if (StringUtils.hasText(uri)) {
+			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
+				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!", source);
+			}
+
+			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
+			return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
 		}
 
-		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
-		dbFactoryBuilder.addConstructorArgValue(new RuntimeBeanReference(mongoRef));
+		// Defaulting
+		if (StringUtils.hasText(mongoRef)) {
+			dbFactoryBuilder.addConstructorArgReference(mongoRef);
+		} else {
+			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
+		}
+
+		dbname = StringUtils.hasText(dbname) ? dbname : "db";
 		dbFactoryBuilder.addConstructorArgValue(dbname);
 
-		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element);
 		if (userCredentials != null) {
 			dbFactoryBuilder.addConstructorArgValue(userCredentials);
 		}
 
-		ParsingUtils.setPropertyValue(element, dbFactoryBuilder, "write-concern", "writeConcern");
+		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 
-		return dbFactoryBuilder.getBeanDefinition();
+		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
+		parserContext.registerBeanComponent(component);
 
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY)
+				.getBeanDefinition();
 	}
 
 	/**
@@ -89,14 +116,13 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 * @param parserContext must not be {@literal null}.
 	 * @return
 	 */
-	private String registerMongoBeanDefinition(Element element, ParserContext parserContext) {
+	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {
 
 		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
-		ParsingUtils.setPropertyValue(element, mongoBuilder, "host");
-		ParsingUtils.setPropertyValue(element, mongoBuilder, "port");
+		setPropertyValue(mongoBuilder, element, "host");
+		setPropertyValue(mongoBuilder, element, "port");
 
-		return BeanDefinitionReaderUtils.registerWithGeneratedName(mongoBuilder.getBeanDefinition(),
-				parserContext.getRegistry());
+		return getSourceBeanDefinition(mongoBuilder, parserContext, element);
 	}
 
 	/**
@@ -105,7 +131,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 * @param element
 	 * @return the {@link BeanDefinition} or {@literal null} if neither username nor password given.
 	 */
-	private BeanDefinition getUserCredentialsBeanDefinition(Element element) {
+	private BeanDefinition getUserCredentialsBeanDefinition(Element element, ParserContext context) {
 
 		String username = element.getAttribute("username");
 		String password = element.getAttribute("password");
@@ -118,6 +144,20 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(username) ? username : null);
 		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(password) ? password : null);
 
-		return userCredentialsBuilder.getBeanDefinition();
+		return getSourceBeanDefinition(userCredentialsBuilder, context, element);
+	}
+
+	/**
+	 * Creates a {@link BeanDefinition} for a {@link MongoURI}.
+	 * 
+	 * @param uri
+	 * @return
+	 */
+	private BeanDefinition getMongoUri(String uri) {
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoURI.class);
+		builder.addConstructorArgValue(uri);
+
+		return builder.getBeanDefinition();
 	}
 }

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-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.
@@ -16,25 +16,34 @@
 package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension;
+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
+ * @author Martin Baumgartner
  */
-public class MongoRepositoryNamespaceHandler extends NamespaceHandlerSupport {
+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() {
 
-		registerBeanDefinitionParser("repositories", new MongoRepositoryConfigParser());
+		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
+		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
+
+		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());
+		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());
+		registerBeanDefinitionParser("template", new MongoTemplateParser());
+		registerBeanDefinitionParser("gridFsTemplate", new GridFsTemplateParser());
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.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,50 +13,81 @@
  * 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.BeanDefinitionStoreException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import java.util.Map;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.CustomEditorConfigurer;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
- * Parser for <mongo;gt; definitions. If no name
+ * Parser for <mongo;gt; definitions.
  * 
  * @author Mark Pollack
+ * @author Oliver Gierke
  */
-public class MongoParser extends AbstractSingleBeanDefinitionParser {
+public class MongoParser implements BeanDefinitionParser {
 
-	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return MongoFactoryBean.class;
+	/* 
+	 * (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) {
+
+		Object source = parserContext.extractSource(element);
+		String id = element.getAttribute("id");
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
+		ParsingUtils.setPropertyValue(builder, element, "port", "port");
+		ParsingUtils.setPropertyValue(builder, element, "host", "host");
+		ParsingUtils.setPropertyValue(builder, element, "write-concern", "writeConcern");
+
+		MongoParsingUtils.parseMongoOptions(element, builder);
+		MongoParsingUtils.parseReplicaSet(element, builder);
+
+		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO;
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
+
+		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
+		parserContext.registerBeanComponent(mongoComponent);
+		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(registerServerAddressPropertyEditor());
+		parserContext.registerBeanComponent(serverAddressPropertyEditor);
+		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
+				.getWriteConcernPropertyEditorBuilder());
+		parserContext.registerBeanComponent(writeConcernPropertyEditor);
+
+		parserContext.popAndRegisterContainingComponent();
+
+		return mongoComponent.getBeanDefinition();
 	}
 
-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		super.doParse(element, builder);
+	/**
+	 * One should only register one bean definition but want to have the convenience of using
+	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
+	 * container.
+	 */
+	private BeanDefinitionBuilder registerServerAddressPropertyEditor() {
 
-		ParsingUtils.setPropertyValue(element, builder, "port", "port");
-		ParsingUtils.setPropertyValue(element, builder, "host", "host");
-		ParsingUtils.setPropertyValue(element, builder, "write-concern", "writeConcern");
-
-		ParsingUtils.parseMongoOptions(parserContext, element, builder);
-		ParsingUtils.parseReplicaSet(parserContext, element, builder);
+		Map<String, String> customEditors = new ManagedMap<String, String>();
+		customEditors.put("com.mongodb.ServerAddress[]",
+				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
 
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+		return builder;
 	}
-
-	@Override
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
-			throws BeanDefinitionStoreException {
-		String name = super.resolveId(element, definition, parserContext);
-		if (!StringUtils.hasText(name)) {
-			name = "mongo";
-		}
-		return name;
-	}
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java

@@ -0,0 +1,103 @@
+/*
+ * 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
+ *
+ * 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.springframework.data.config.ParsingUtils.*;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.CustomEditorConfigurer;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Utility methods for {@link BeanDefinitionParser} implementations for MongoDB.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+abstract class MongoParsingUtils {
+
+	private MongoParsingUtils() {
+
+	}
+
+	/**
+	 * Parses the mongo replica-set element.
+	 * 
+	 * @param parserContext the parser context
+	 * @param element the mongo element
+	 * @param mongoBuilder the bean definition builder to populate
+	 * @return
+	 */
+	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
+		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
+	}
+
+	/**
+	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
+	 * 
+	 * @return true if parsing actually occured, false otherwise
+	 */
+	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
+		if (optionsElement == null) {
+			return false;
+		}
+
+		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoOptionsFactoryBean.class);
+
+		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(optionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
+				"threadsAllowedToBlockForConnectionMultiplier");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
+		setPropertyValue(optionsDefBuilder, optionsElement, "auto-connect-retry", "autoConnectRetry");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-number", "writeNumber");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
+		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
+
+		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
+		return true;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link WriteConcernPropertyEditor}.
+	 * 
+	 * @return
+	 */
+	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryConfigParser.java

@@ -1,54 +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.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
-import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} to create Mongo DB repositories from classpath
- * scanning or manual definition.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryConfigParser extends
-		AbstractRepositoryConfigDefinitionParser<SimpleMongoRepositoryConfiguration, MongoRepositoryConfiguration> {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#getGlobalRepositoryConfigInformation(org.w3c.dom.Element)
-	 */
-	@Override
-	protected SimpleMongoRepositoryConfiguration getGlobalRepositoryConfigInformation(Element element) {
-
-		return new SimpleMongoRepositoryConfiguration(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#postProcessBeanDefinition(org.springframework.data.repository.config.SingleRepositoryConfigInformation, org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.beans.factory.support.BeanDefinitionRegistry, java.lang.Object)
-	 */
-	@Override
-	protected void postProcessBeanDefinition(MongoRepositoryConfiguration context, BeanDefinitionBuilder builder,
-			BeanDefinitionRegistry registry, Object beanSource) {
-
-		builder.addPropertyReference("template", context.getMongoTemplateRef());
-		builder.addPropertyValue("createIndexesForQueryMethods", context.getCreateQueryIndexes());
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java

@@ -0,0 +1,86 @@
+/*
+ * 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.config;
+
+import static org.springframework.data.config.ParsingUtils.*;
+import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to parse {@code template} elements into {@link BeanDefinition}s.
+ * 
+ * @author Martin Baumgartner
+ */
+class MongoTemplateParser extends AbstractBeanDefinitionParser {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String converterRef = element.getAttribute("converter-ref");
+		String dbFactoryRef = element.getAttribute("db-factory-ref");
+
+		BeanDefinitionBuilder mongoTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoTemplate.class);
+		setPropertyValue(mongoTemplateBuilder, element, "write-concern", "writeConcern");
+
+		if (StringUtils.hasText(dbFactoryRef)) {
+			mongoTemplateBuilder.addConstructorArgReference(dbFactoryRef);
+		} else {
+			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
+		}
+
+		if (StringUtils.hasText(converterRef)) {
+			mongoTemplateBuilder.addConstructorArgReference(converterRef);
+		}
+
+		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
+
+		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
+		parserContext.registerBeanComponent(component);
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder, BeanNames.MONGO_TEMPLATE)
+				.getBeanDefinition();
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java

@@ -1,112 +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.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-import com.mongodb.ServerAddress;
-
-abstract class ParsingUtils {
-
-	/**
-	 * Parses the mongo replica-set element.
-	 * 
-	 * @param parserContext the parser context
-	 * @param element the mongo element
-	 * @param mongoBuilder the bean definition builder to populate
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseReplicaSet(ParserContext parserContext, Element element, BeanDefinitionBuilder mongoBuilder) {
-
-		String replicaSetString = element.getAttribute("replica-set");
-		if (StringUtils.hasText(replicaSetString)) {
-			ManagedList<Object> serverAddresses = new ManagedList<Object>();
-			String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
-			for (String element2 : replicaSetStringArray) {
-				String[] hostAndPort = StringUtils.delimitedListToStringArray(element2, ":");
-				BeanDefinitionBuilder defBuilder = BeanDefinitionBuilder.genericBeanDefinition(ServerAddress.class);
-				defBuilder.addConstructorArgValue(hostAndPort[0]);
-				defBuilder.addConstructorArgValue(hostAndPort[1]);
-				serverAddresses.add(defBuilder.getBeanDefinition());
-			}
-			if (!serverAddresses.isEmpty()) {
-				mongoBuilder.addPropertyValue("replicaSetSeeds", serverAddresses);
-			}
-		}
-		return true;
-
-	}
-
-	/**
-	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
-	 * 
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseMongoOptions(ParserContext parserContext, Element element, BeanDefinitionBuilder mongoBuilder) {
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
-		if (optionsElement == null) {
-			return false;
-		}
-
-		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoOptionsFactoryBean.class);
-
-		setPropertyValue(optionsElement, optionsDefBuilder, "connections-per-host", "connectionsPerHost");
-		setPropertyValue(optionsElement, optionsDefBuilder, "threads-allowed-to-block-for-connection-multiplier",
-				"threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(optionsElement, optionsDefBuilder, "max-wait-time", "maxWaitTime");
-		setPropertyValue(optionsElement, optionsDefBuilder, "connect-timeout", "connectTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "socket-timeout", "socketTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "socket-keep-alive", "socketKeepAlive");
-		setPropertyValue(optionsElement, optionsDefBuilder, "auto-connect-retry", "autoConnectRetry");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-number", "writeNumber");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-timeout", "writeTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-fsync", "writeFsync");
-		setPropertyValue(optionsElement, optionsDefBuilder, "slave-ok", "slaveOk");
-
-		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-		return true;
-	}
-
-	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName, String propertyName) {
-		String attr = element.getAttribute(attrName);
-		if (StringUtils.hasText(attr)) {
-			builder.addPropertyValue(propertyName, attr);
-		}
-	}
-
-	/**
-	 * Sets the property with the given attribute name on the given {@link BeanDefinitionBuilder} to the value of the
-	 * attribute with the given name.
-	 * 
-	 * @param element must not be {@literal null}.
-	 * @param builder must not be {@literal null}.
-	 * @param attrName must not be {@literal null} or empty.
-	 */
-	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName) {
-		String attr = element.getAttribute(attrName);
-		if (StringUtils.hasText(attr)) {
-			builder.addPropertyValue(attrName, attr);
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java

@@ -0,0 +1,136 @@
+/*
+ * 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.config;
+
+import java.beans.PropertyEditorSupport;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.ServerAddress;
+
+/**
+ * Parse a {@link String} to a {@link ServerAddress} array. The format is host1:port1,host2:port2,host3:port3.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+public class ServerAddressPropertyEditor extends PropertyEditorSupport {
+
+	/**
+	 * A port is a number without a leading 0 at the end of the address that is proceeded by just a single :.
+	 */
+	private static final String HOST_PORT_SPLIT_PATTERN = "(?<!:):(?=[123456789]\\d*$)";
+	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address {} '{}'. Check your replica set configuration!";
+	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
+	@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);
+
+		for (String element : replicaSetStringArray) {
+
+			ServerAddress address = parseServerAddress(element);
+
+			if (address != null) {
+				serverAddresses.add(address);
+			}
+		}
+
+		if (serverAddresses.isEmpty()) {
+			throw new IllegalArgumentException(
+					"Could not resolve at least one server of the replica set configuration! Validate your config!");
+		}
+
+		setValue(serverAddresses.toArray(new ServerAddress[serverAddresses.size()]));
+	}
+
+	/**
+	 * Parses the given source into a {@link ServerAddress}.
+	 * 
+	 * @param source
+	 * @return the
+	 */
+	private ServerAddress parseServerAddress(String source) {
+
+		if (!StringUtils.hasText(source)) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			return null;
+		}
+
+		String[] hostAndPort = extractHostAddressAndPort(source.trim());
+
+		if (hostAndPort.length > 2) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			return null;
+		}
+
+		try {
+			InetAddress hostAddress = InetAddress.getByName(hostAndPort[0]);
+			Integer port = hostAndPort.length == 1 ? null : Integer.parseInt(hostAndPort[1]);
+
+			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
+		} catch (UnknownHostException e) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
+		} catch (NumberFormatException e) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Extract the host and port from the given {@link String}.
+	 * 
+	 * @param addressAndPortSource must not be {@literal null}.
+	 * @return
+	 */
+	private String[] extractHostAddressAndPort(String addressAndPortSource) {
+
+		Assert.notNull(addressAndPortSource, "Address and port source must not be null!");
+
+		String[] hostAndPort = addressAndPortSource.split(HOST_PORT_SPLIT_PATTERN);
+		String hostAddress = hostAndPort[0];
+
+		if (isHostAddressInIPv6BracketNotation(hostAddress)) {
+			hostAndPort[0] = hostAddress.substring(1, hostAddress.length() - 1);
+		}
+
+		return hostAndPort;
+	}
+
+	private boolean isHostAddressInIPv6BracketNotation(String hostAddress) {
+		return hostAddress.startsWith("[") && hostAddress.endsWith("]");
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/SimpleMongoRepositoryConfiguration.java

@@ -1,196 +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.config;
-
-import org.springframework.data.mongodb.repository.MongoRepositoryFactoryBean;
-import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
-import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
-import org.springframework.data.repository.config.RepositoryConfig;
-import org.springframework.data.repository.config.SingleRepositoryConfigInformation;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * {@link RepositoryConfig} implementation to create {@link MongoRepositoryConfiguration} instances for both automatic
- * and manual configuration.
- * 
- * @author Oliver Gierke
- */
-public class SimpleMongoRepositoryConfiguration
-		extends
-		RepositoryConfig<SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration, SimpleMongoRepositoryConfiguration> {
-
-	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
-	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
-	private static final String DEFAULT_MONGO_TEMPLATE_REF = "mongoTemplate";
-
-	/**
-	 * Creates a new {@link SimpleMongoRepositoryConfiguration} for the given {@link Element}.
-	 * 
-	 * @param repositoriesElement
-	 */
-	protected SimpleMongoRepositoryConfiguration(Element repositoriesElement) {
-
-		super(repositoriesElement, MongoRepositoryFactoryBean.class.getName());
-	}
-
-	/**
-	 * Returns the bean name of the {@link org.springframework.data.mongodb.core.core.MongoTemplate} to be referenced.
-	 * 
-	 * @return
-	 */
-	public String getMongoTemplateRef() {
-
-		String templateRef = getSource().getAttribute(MONGO_TEMPLATE_REF);
-		return StringUtils.hasText(templateRef) ? templateRef : DEFAULT_MONGO_TEMPLATE_REF;
-	}
-
-	/**
-	 * Returns whether to create indexes for query methods.
-	 * 
-	 * @return
-	 */
-	public boolean getCreateQueryIndexes() {
-
-		String createQueryIndexes = getSource().getAttribute(CREATE_QUERY_INDEXES);
-		return StringUtils.hasText(createQueryIndexes) ? Boolean.parseBoolean(createQueryIndexes) : false;
-	}
-
-	/*
-	* (non-Javadoc)
-	*
-	* @see
-	* org.springframework.data.repository.config.GlobalRepositoryConfigInformation
-	* #getAutoconfigRepositoryInformation(java.lang.String)
-	*/
-	public MongoRepositoryConfiguration getAutoconfigRepositoryInformation(String interfaceName) {
-
-		return new AutomaticMongoRepositoryConfiguration(interfaceName, this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfig#getNamedQueriesLocation()
-	 */
-	public String getNamedQueriesLocation() {
-		return "classpath*:META-INF/mongo-named-queries.properties";
-	}
-
-	/*
-	* (non-Javadoc)
-	*
-	* @see org.springframework.data.repository.config.RepositoryConfig#
-	* createSingleRepositoryConfigInformationFor(org.w3c.dom.Element)
-	*/
-	@Override
-	protected MongoRepositoryConfiguration createSingleRepositoryConfigInformationFor(Element element) {
-
-		return new ManualMongoRepositoryConfiguration(element, this);
-	}
-
-	/**
-	 * Simple interface for configuration values specific to Mongo repositories.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public interface MongoRepositoryConfiguration extends
-			SingleRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> {
-
-		String getMongoTemplateRef();
-
-		boolean getCreateQueryIndexes();
-	}
-
-	/**
-	 * Implements manual lookup of the additional attributes.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class ManualMongoRepositoryConfiguration extends
-			ManualRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
-
-		/**
-		 * Creates a new {@link ManualMongoRepositoryConfiguration} for the given {@link Element} and parent.
-		 * 
-		 * @param element
-		 * @param parent
-		 */
-		public ManualMongoRepositoryConfiguration(Element element, SimpleMongoRepositoryConfiguration parent) {
-
-			super(element, parent);
-		}
-
-		/*
-		* (non-Javadoc)
-		*
-		* @see org.springframework.data.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getAttribute(MONGO_TEMPLATE_REF);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
-		 */
-		public boolean getCreateQueryIndexes() {
-
-			String attribute = getAttribute(CREATE_QUERY_INDEXES);
-			return attribute == null ? false : Boolean.parseBoolean(attribute);
-		}
-	}
-
-	/**
-	 * Implements the lookup of the additional attributes during automatic configuration.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class AutomaticMongoRepositoryConfiguration extends
-			AutomaticRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
-
-		/**
-		 * Creates a new {@link AutomaticMongoRepositoryConfiguration} for the given interface and parent.
-		 * 
-		 * @param interfaceName
-		 * @param parent
-		 */
-		public AutomaticMongoRepositoryConfiguration(String interfaceName, SimpleMongoRepositoryConfiguration parent) {
-
-			super(interfaceName, parent);
-		}
-
-		/*
-		* (non-Javadoc)
-		*
-		* @see org.springframework.data.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getParent().getMongoTemplateRef();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
-		 */
-		public boolean getCreateQueryIndexes() {
-			return getParent().getCreateQueryIndexes();
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java

@@ -0,0 +1,38 @@
+/*
+ * 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.core.convert.converter.Converter;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Converter to create {@link WriteConcern} instances from String representations.
+ * 
+ * @author Oliver Gierke
+ */
+public class StringToWriteConcernConverter implements Converter<String, WriteConcern> {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+	 */
+	public WriteConcern convert(String source) {
+
+		WriteConcern writeConcern = WriteConcern.valueOf(source);
+		return writeConcern != null ? writeConcern : new WriteConcern(source);
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java

@@ -0,0 +1,48 @@
+/*
+ * 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.config;
+
+import java.beans.PropertyEditorSupport;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Parse a string to a {@link WriteConcern}. If it is a well know {@link String} as identified by the
+ * {@link WriteConcern#valueOf(String)}, use the well known {@link WriteConcern} value, otherwise pass the string as is
+ * to the constructor of the write concern. There is no support for other constructor signatures when parsing from a
+ * string value.
+ * 
+ * @author Mark Pollack
+ */
+public class WriteConcernPropertyEditor extends PropertyEditorSupport {
+
+	/**
+	 * Parse a string to a List<ServerAddress>
+	 */
+	@Override
+	public void setAsText(String writeConcernString) {
+
+		WriteConcern writeConcern = WriteConcern.valueOf(writeConcernString);
+		if (writeConcern != null) {
+			// have a well known string
+			setValue(writeConcern);
+		} else {
+			// pass on the string to the constructor
+			setValue(new WriteConcern(writeConcernString));
+		}
+
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CursorPreparer.java

@@ -22,7 +22,7 @@ import com.mongodb.DBCursor;
  * 
  * @author Oliver Gierke
  */
-public interface CursorPreparer {
+interface CursorPreparer {
 
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns th eprepared cursor.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java

@@ -0,0 +1,170 @@
+/*
+ * 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.core;
+
+import static org.springframework.data.domain.Sort.Direction.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexField;
+import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoException;
+
+/**
+ * Default implementation of {@link IndexOperations}.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ * @author Komi Innocent
+ */
+public class DefaultIndexOperations implements IndexOperations {
+
+	private static final Double ONE = Double.valueOf(1);
+	private static final Double MINUS_ONE = Double.valueOf(-1);
+
+	private final MongoOperations mongoOperations;
+	private final String collectionName;
+
+	/**
+	 * Creates a new {@link DefaultIndexOperations}.
+	 * 
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 */
+	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
+
+		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+		Assert.notNull(collectionName, "Collection name can not be null!");
+
+		this.mongoOperations = mongoOperations;
+		this.collectionName = collectionName;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
+	 */
+	public void ensureIndex(final IndexDefinition indexDefinition) {
+		mongoOperations.execute(collectionName, new CollectionCallback<Object>() {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				DBObject indexOptions = indexDefinition.getIndexOptions();
+				if (indexOptions != null) {
+					collection.ensureIndex(indexDefinition.getIndexKeys(), indexOptions);
+				} else {
+					collection.ensureIndex(indexDefinition.getIndexKeys());
+				}
+				return null;
+			}
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#dropIndex(java.lang.String)
+	 */
+	public void dropIndex(final String name) {
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				collection.dropIndex(name);
+				return null;
+			}
+		});
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#dropAllIndexes()
+	 */
+	public void dropAllIndexes() {
+		dropIndex("*");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#resetIndexCache()
+	 */
+	public void resetIndexCache() {
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				collection.resetIndexCache();
+				return null;
+			}
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#getIndexInfo()
+	 */
+	public List<IndexInfo> getIndexInfo() {
+
+		return mongoOperations.execute(collectionName, new CollectionCallback<List<IndexInfo>>() {
+			public List<IndexInfo> doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				List<DBObject> dbObjectList = collection.getIndexInfo();
+				return getIndexData(dbObjectList);
+			}
+
+			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
+
+				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
+
+				for (DBObject ix : dbObjectList) {
+
+					DBObject keyDbObject = (DBObject) ix.get("key");
+					int numberOfElements = keyDbObject.keySet().size();
+
+					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
+
+					for (String key : keyDbObject.keySet()) {
+
+						Object value = keyDbObject.get(key);
+
+						if ("2d".equals(value)) {
+							indexFields.add(IndexField.geo(key));
+						} else {
+
+							Double keyValue = new Double(value.toString());
+
+							if (ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, ASC));
+							} else if (MINUS_ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, DESC));
+							}
+						}
+					}
+
+					String name = ix.get("name").toString();
+
+					boolean unique = ix.containsField("unique") ? (Boolean) ix.get("unique") : false;
+					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
+					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
+
+					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
+				}
+
+				return indexInfoList;
+			}
+		});
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DocumentCallbackHandler.java

@@ -21,15 +21,16 @@ import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
 /**
- * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document basis.  
- * Implementations of this interface perform the actual work of prcoessing each document but don't need to worry about 
- * exception handling.  {@MongoException}s will be caught and translated by the calling MongoTemplate
+ * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document
+ * basis. Implementations of this interface perform the actual work of prcoessing each document but don't need to worry
+ * about exception handling. {@MongoException}s will be caught and translated by the calling
+ * MongoTemplate
  * 
- * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later for later
- * inspection.
+ * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later
+ * for later inspection.
  * 
  * @author Mark Pollack
- *
+ * 
  */
 public interface DocumentCallbackHandler {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndModifyOptions.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-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.core;
+
+public class FindAndModifyOptions {
+
+	boolean returnNew;
+
+	boolean upsert;
+
+	boolean remove;
+
+	/**
+	 * Static factory method to create a FindAndModifyOptions instance
+	 * 
+	 * @return a new instance
+	 */
+	public static FindAndModifyOptions options() {
+		return new FindAndModifyOptions();
+	}
+
+	public FindAndModifyOptions returnNew(boolean returnNew) {
+		this.returnNew = returnNew;
+		return this;
+	}
+
+	public FindAndModifyOptions upsert(boolean upsert) {
+		this.upsert = upsert;
+		return this;
+	}
+
+	public FindAndModifyOptions remove(boolean remove) {
+		this.remove = remove;
+		return this;
+	}
+
+	public boolean isReturnNew() {
+		return returnNew;
+	}
+
+	public boolean isUpsert() {
+		return upsert;
+	}
+
+	public boolean isRemove() {
+		return remove;
+	}
+
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java

@@ -0,0 +1,63 @@
+/*
+ * 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.core;
+
+import java.util.List;
+
+import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexInfo;
+
+
+/**
+ * Index operations on a collection.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public interface IndexOperations {
+
+	/**
+	 * Ensure that an index for the provided {@link IndexDefinition} exists for the collection indicated by the entity
+	 * class. If not it will be created.
+	 * 
+	 * @param indexDefinition must not be {@literal null}.
+	 */
+	void ensureIndex(IndexDefinition indexDefinition);
+
+	/**
+	 * Drops an index from this collection.
+	 * 
+	 * @param name name of index to drop
+	 */
+	void dropIndex(String name);
+
+	/**
+	 * Drops all indices from this collection.
+	 */
+	void dropAllIndexes();
+
+	/**
+	 * Clears all indices that have not yet been applied to this collection.
+	 */
+	void resetIndexCache();
+
+	/**
+	 * Returns the index information on the collection.
+	 * 
+	 * @return index information on the collection
+	 */
+	List<IndexInfo> getIndexInfo();
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java

@@ -0,0 +1,99 @@
+/*
+ * 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
+ *
+ * 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 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
+ * {@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 entityType, document, and query</li>
+ * </ul>
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public class MongoAction {
+
+	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 {@link MongoAction}.
+	 * 
+	 * @param defaultWriteConcern the default write concern.
+	 * @param mongoActionOperation action being taken against the collection
+	 * @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<?> 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.entityType = entityType;
+		this.query = query;
+		this.document = document;
+	}
+
+	public String getCollectionName() {
+		return collectionName;
+	}
+
+	public WriteConcern getDefaultWriteConcern() {
+		return defaultWriteConcern;
+	}
+
+	/**
+	 * @deprecated use {@link #getEntityType()} instead.
+	 */
+	@Deprecated
+	public Class<?> getEntityClass() {
+		return entityType;
+	}
+
+	public Class<?> getEntityType() {
+		return entityType;
+	}
+
+	public MongoActionOperation getMongoActionOperation() {
+		return mongoActionOperation;
+	}
+
+	public DBObject getQuery() {
+		return query;
+	}
+
+	public DBObject getDocument() {
+		return document;
+	}
+
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 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,24 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.document.couchdb.monitor;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+package org.springframework.data.mongodb.core;
 
 /**
- * Server application to test JMX functionality.
- *
+ * Enumeration for operations on a collection. Used with {@link MongoAction} to help determine the WriteConcern to use
+ * for a given mutating operation
+ * 
  * @author Mark Pollack
+ * @author Oliver Gierke
+ * @see MongoAction
  */
-public class JmxServer {
-
-  public static void main(String[] args) {
-    new JmxServer().run();
-  }
-
-  public void run() {
-    new ClassPathXmlApplicationContext(new String[]{"server-jmx.xml"});
-  }
+public enum MongoActionOperation {
 
+	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-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.
@@ -15,32 +15,28 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
+import org.springframework.util.Assert;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
 
 /**
  * Mongo server administration exposed via JMX annotations
  * 
  * @author Mark Pollack
  */
-
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
 
-	/**
-	 * Logger available to subclasses
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private Mongo mongo;
+	private final Mongo mongo;
 	private String username;
 	private String password;
 
 	public MongoAdmin(Mongo mongo) {
+		Assert.notNull(mongo);
 		this.mongo = mongo;
 	}
 
@@ -83,11 +79,10 @@ public class MongoAdmin implements MongoAdminOperations {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
-
 		this.password = password;
 	}
 
 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDataIntegrityViolationException.java

@@ -0,0 +1,71 @@
+/*
+ * 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 org.springframework.dao.DataIntegrityViolationException;
+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;
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.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,28 +15,29 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+
 /**
- * Helper class featuring helper methods for internal MongoDb classes.
- * <p/>
- * <p>
- * Mainly intended for internal use within the framework.
+ * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
+ * framework.
  * 
  * @author Thomas Risberg
  * @author Graeme Rocher
  * @author Oliver Gierke
+ * @author Randy Watler
  * @since 1.0
  */
 public abstract class MongoDbUtils {
 
-	private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbUtils.class);
 
 	/**
 	 * Private constructor to prevent instantiation.
@@ -48,74 +49,93 @@ public abstract class MongoDbUtils {
 	/**
 	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
 	 * 
-	 * @param mongo The {@link Mongo} instance
-	 * @param databaseName The database name
-	 * @return The {@link DB} connection
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, null, null, true);
+		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true);
 	}
 
 	/**
 	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
 	 * 
-	 * @param mongo The {@link Mongo} instance
-	 * @param databaseName The database name
-	 * @param username The username to authenticate with
-	 * @param password The password to authenticate with
-	 * @return The {@link DB} connection
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @param credentials the credentials to use, must not be {@literal null}.
+	 * @return the {@link DB} connection
 	 */
-	public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
-		return doGetDB(mongo, databaseName, username, password, true);
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
+
+		Assert.notNull(mongo, "No Mongo instance specified!");
+		Assert.hasText(databaseName, "Database name must be given!");
+		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
+
+		return doGetDB(mongo, databaseName, credentials, true);
 	}
 
-	public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
-		Assert.notNull(mongo, "No Mongo instance specified");
+	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate) {
 
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-		if (dbHolder != null && !dbHolder.isEmpty()) {
-			// pre-bound Mongo DB
-			DB db = null;
-			if (TransactionSynchronizationManager.isSynchronizationActive() && dbHolder.doesNotHoldNonDefaultDB()) {
-				// Spring transaction management is active ->
-				db = dbHolder.getDB();
-				if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
-					LOGGER.debug("Registering Spring transaction synchronization for existing Mongo DB");
-					TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
-					dbHolder.setSynchronizedWithTransaction(true);
-				}
+
+		// Do we have a populated holder and TX sync active?
+		if (dbHolder != null && !dbHolder.isEmpty() && TransactionSynchronizationManager.isSynchronizationActive()) {
+
+			DB db = dbHolder.getDB(databaseName);
+
+			// DB found but not yet synchronized
+			if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
+
+				LOGGER.debug("Registering Spring transaction synchronization for existing MongoDB {}.", databaseName);
+
+				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
+				dbHolder.setSynchronizedWithTransaction(true);
 			}
+
 			if (db != null) {
 				return db;
 			}
 		}
 
-		LOGGER.trace("Getting Mongo Database name=[" + databaseName + "]");
-		DB db = mongo.getDB(databaseName);
+		// Lookup fresh database instance
+		LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
 
-		boolean credentialsGiven = username != null && password != null;
-		if (credentialsGiven && !db.isAuthenticated()) {
-			// Note, can only authenticate once against the same com.mongodb.DB object.
-			if (!db.authenticate(username, password)) {
-				throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
-						+ "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username,
-						password);
+		DB db = mongo.getDB(databaseName);
+		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
+
+		synchronized (db) {
+
+			if (credentialsGiven && !db.isAuthenticated()) {
+
+				String username = credentials.getUsername();
+				String password = credentials.hasPassword() ? credentials.getPassword() : null;
+
+				if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
+							+ credentials.toString(), databaseName, credentials);
+				}
 			}
 		}
 
-		// Use same Session for further Mongo actions within the transaction.
-		// Thread object will get removed by synchronization at transaction completion.
+		// TX sync active, bind new database to thread
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			// We're within a Spring-managed transaction, possibly from JtaTransactionManager.
-			LOGGER.debug("Registering Spring transaction synchronization for new Hibernate Session");
+
+			LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
+
 			DbHolder holderToUse = dbHolder;
+
 			if (holderToUse == null) {
-				holderToUse = new DbHolder(db);
+				holderToUse = new DbHolder(databaseName, db);
 			} else {
-				holderToUse.addDB(db);
+				holderToUse.addDB(databaseName, db);
 			}
-			TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
-			holderToUse.setSynchronizedWithTransaction(true);
+
+			// synchronize holder only if not yet synchronized
+			if (!holderToUse.isSynchronizedWithTransaction()) {
+				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
+				holderToUse.setSynchronizedWithTransaction(true);
+			}
+
 			if (holderToUse != dbHolder) {
 				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
 			}
@@ -139,11 +159,12 @@ public abstract class MongoDbUtils {
 	 * @return whether the DB is transactional
 	 */
 	public static boolean isDBTransactional(DB db, Mongo mongo) {
+
 		if (mongo == null) {
 			return false;
 		}
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-		return (dbHolder != null && dbHolder.containsDB(db));
+		return dbHolder != null && dbHolder.containsDB(db);
 	}
 
 	/**
@@ -152,6 +173,7 @@ public abstract class MongoDbUtils {
 	 * @param db the DB to close (may be <code>null</code>)
 	 */
 	public static void closeDB(DB db) {
+
 		if (db != null) {
 			LOGGER.debug("Closing Mongo DB object");
 			try {

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.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.
@@ -13,17 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
+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;
 import com.mongodb.ServerAddress;
@@ -35,14 +39,13 @@ 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>, PersistenceExceptionTranslator {
+public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
+		PersistenceExceptionTranslator {
 
-	/**
-	 * Logger, available to subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
+	private Mongo mongo;
 
 	private MongoOptions mongoOptions;
 	private String host;
@@ -57,12 +60,39 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptio
 		this.mongoOptions = mongoOptions;
 	}
 
-	public void setReplicaSetSeeds(List<ServerAddress> replicaSetSeeds) {
-		this.replicaSetSeeds = replicaSetSeeds;
+	public void setReplicaSetSeeds(ServerAddress[] replicaSetSeeds) {
+		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
 	}
 
-	public void setReplicaPair(List<ServerAddress> replicaPair) {
-		this.replicaPair = replicaPair;
+	/**
+	 * @deprecated use {@link #setReplicaSetSeeds(ServerAddress[])} instead
+	 * 
+	 * @param replicaPair
+	 */
+	@Deprecated
+	public void setReplicaPair(ServerAddress[] 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) {
@@ -87,42 +117,7 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptio
 	}
 
 	public Mongo getObject() throws Exception {
-
-		Mongo mongo;
-
-		if (host == null) {
-
-			logger.debug("Property host not specified. Using default configuration");
-			mongo = new Mongo();
-
-		} else {
-
-			ServerAddress defaultOptions = new ServerAddress();
-
-			if (mongoOptions == null) {
-				mongoOptions = new MongoOptions();
-			}
-
-			if (replicaPair != null) {
-				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) {
-				mongo = new Mongo(replicaSetSeeds, mongoOptions);
-			} else {
-				String mongoHost = host != null ? host : defaultOptions.getHost();
-				mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
-						mongoOptions);
-			}
-		}
-
-		if (writeConcern != null) {
-			mongo.setWriteConcern(writeConcern);
-		}
-
 		return mongo;
-
 	}
 
 	/*
@@ -148,4 +143,50 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptio
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	@SuppressWarnings("deprecation")
+	public void afterPropertiesSet() throws Exception {
+
+		Mongo mongo;
+		ServerAddress defaultOptions = new ServerAddress();
+
+		if (mongoOptions == null) {
+			mongoOptions = new MongoOptions();
+		}
+
+		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 (!isNullOrEmpty(replicaSetSeeds)) {
+			mongo = new Mongo(replicaSetSeeds, mongoOptions);
+		} else {
+			String mongoHost = StringUtils.hasText(host) ? host : defaultOptions.getHost();
+			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
+					mongoOptions);
+		}
+
+		if (writeConcern != null) {
+			mongo.setWriteConcern(writeConcern);
+		}
+
+		this.mongo = mongo;
+	}
+
+	private boolean isNullOrEmpty(Collection<?> elements) {
+		return elements == null || elements.isEmpty();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
+	 */
+	public void destroy() throws Exception {
+		this.mongo.close();
+	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.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.
@@ -19,21 +19,27 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.geo.GeoResult;
+import org.springframework.data.mongodb.core.geo.GeoResults;
+import org.springframework.data.mongodb.core.mapreduce.GroupBy;
+import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
+import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
+import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
 import com.mongodb.CommandResult;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.WriteResult;
 
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.geo.GeoResult;
-import org.springframework.data.mongodb.core.geo.GeoResults;
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
-import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-
 /**
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but
  * a useful option for extensibility and testability (as it can be easily mocked, stubbed, or be the target of a JDK
@@ -42,12 +48,15 @@ import org.springframework.data.mongodb.core.query.Update;
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Tobias Trelle
+ * @author Chuong Ngo
  */
 public interface MongoOperations {
 
 	/**
 	 * The collection name used for the specified class by this template.
 	 * 
+	 * @param entityClass must not be {@literal null}.
 	 * @return
 	 */
 	String getCollectionName(Class<?> entityClass);
@@ -68,7 +77,7 @@ public interface MongoOperations {
 	 * @param command a MongoDB command
 	 */
 	CommandResult executeCommand(DBObject command);
-	
+
 	/**
 	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
 	 * exception hierarchy.
@@ -77,28 +86,16 @@ public interface MongoOperations {
 	 * @param options query options to use
 	 */
 	CommandResult executeCommand(DBObject command, int options);
-	
+
 	/**
-	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler. 
+	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler.
 	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
-	 * @param collectionName name of the collection to retrieve the objects from         
-	 * @param dch the handler that will extract results, one document at a time 
+	 * @param collectionName name of the collection to retrieve the objects from
+	 * @param dch the handler that will extract results, one document at a time
 	 */
 	void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch);
-	
-	/**
-	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler using the 
-	 * provided CursorPreparer.
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param collectionName name of the collection to retrieve the objects from         
-	 * @param dch the handler that will extract results, one document at a time 
-	 * @param preparer allows for customization of the DBCursor used when iterating over the result set, (apply limits,
-	 *          skips and so on).
-	 */
-	void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch, CursorPreparer preparer);
 
 	/**
 	 * Executes a {@link DbCallback} translating any exceptions as necessary.
@@ -237,11 +234,25 @@ public interface MongoOperations {
 	 */
 	void dropCollection(String collectionName);
 
+	/**
+	 * Returns the operations that can be performed on indexes
+	 * 
+	 * @return index operations on the named collection
+	 */
+	IndexOperations indexOps(String collectionName);
+
+	/**
+	 * Returns the operations that can be performed on indexes
+	 * 
+	 * @return index operations on the named collection associated with the given entity class
+	 */
+	IndexOperations indexOps(Class<?> entityClass);
+
 	/**
 	 * 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.
@@ -255,7 +266,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.
@@ -265,11 +276,90 @@ public interface MongoOperations {
 	 * @return the converted collection
 	 */
 	<T> List<T> findAll(Class<T> entityClass, String collectionName);
-	
-	
-	
+
 	/**
-	 * Execute a map-reduce operation.  The map-reduce operation will be formed with an output type of INLINE
+	 * Execute a group operation over the entire collection. The group operation entity class should match the 'shape' of
+	 * the returned object that takes int account the initial document structure as well as any finalize functions.
+	 * 
+	 * @param criteria The criteria that restricts the row that are considered for grouping. If not specified all rows are
+	 *          considered.
+	 * @param inputCollectionName the collection where the group operation will read from
+	 * @param groupBy the conditions under which the group operation will be performed, e.g. keys, initial document,
+	 *          reduce function.
+	 * @param entityClass The parameterized type of the returned list
+	 * @return The results of the group operation
+	 */
+	<T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass);
+
+	/**
+	 * Execute a group operation restricting the rows to those which match the provided Criteria. The group operation
+	 * entity class should match the 'shape' of the returned object that takes int account the initial document structure
+	 * as well as any finalize functions.
+	 * 
+	 * @param criteria The criteria that restricts the row that are considered for grouping. If not specified all rows are
+	 *          considered.
+	 * @param inputCollectionName the collection where the group operation will read from
+	 * @param groupBy the conditions under which the group operation will be performed, e.g. keys, initial document,
+	 *          reduce function.
+	 * @param entityClass The parameterized type of the returned list
+	 * @return The results of the group operation
+	 */
+	<T> GroupByResults<T> group(Criteria criteria, String inputCollectionName, GroupBy groupBy, Class<T> entityClass);
+
+	/**
+	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
+	 * inputCollection is derived from the inputType of the aggregation.
+	 * 
+	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
+	 *          {@literal null}.
+	 * @param collectionName The name of the input collection to use for the aggreation.
+	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
+	 * @return The results of the aggregation operation.
+	 * @since 1.3
+	 */
+	<O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
+
+	/**
+	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
+	 * inputCollection is derived from the inputType of the aggregation.
+	 * 
+	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
+	 *          {@literal null}.
+	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
+	 * @return The results of the aggregation operation.
+	 * @since 1.3
+	 */
+	<O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType);
+
+	/**
+	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
+	 * 
+	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
+	 *          {@literal null}.
+	 * @param inputType the inputType where the aggregation operation will read from, must not be {@literal null} or
+	 *          empty.
+	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
+	 * @return The results of the aggregation operation.
+	 * @since 1.3
+	 */
+	<O> AggregationResults<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
+
+	/**
+	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
+	 * 
+	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
+	 *          {@literal null}.
+	 * @param collectionName the collection where the aggregation operation will read from, must not be {@literal null} or
+	 *          empty.
+	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
+	 * @return The results of the aggregation operation.
+	 * @since 1.3
+	 */
+	<O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType);
+
+	/**
+	 * Execute a map-reduce operation. The map-reduce operation will be formed with an output type of INLINE
+	 * 
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
 	 * @param reduceFunction The JavaScript reduce function
@@ -277,11 +367,12 @@ public interface MongoOperations {
 	 * @param entityClass The parameterized type of the returned list
 	 * @return The results of the map reduce operation
 	 */
-	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction, Class<T> entityClass );
+	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction,
+			Class<T> entityClass);
 
-	
 	/**
 	 * Execute a map-reduce operation that takes additional map-reduce options.
+	 * 
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
 	 * @param reduceFunction The JavaScript reduce function
@@ -289,12 +380,13 @@ public interface MongoOperations {
 	 * @param entityClass The parameterized type of the returned list
 	 * @return The results of the map reduce operation
 	 */
-	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction, MapReduceOptions mapReduceOptions, Class<T> entityClass );
-	
-	
-	
+	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction,
+			MapReduceOptions mapReduceOptions, Class<T> entityClass);
+
 	/**
-	 * Execute a map-reduce operation that takes a query.  The map-reduce operation will be formed with an output type of INLINE
+	 * Execute a map-reduce operation that takes a query. The map-reduce operation will be formed with an output type of
+	 * INLINE
+	 * 
 	 * @param query The query to use to select the data for the map phase
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
@@ -303,10 +395,12 @@ public interface MongoOperations {
 	 * @param entityClass The parameterized type of the returned list
 	 * @return The results of the map reduce operation
 	 */
-	<T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction, String reduceFunction, Class<T> entityClass );
-	
+	<T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction, String reduceFunction,
+			Class<T> entityClass);
+
 	/**
 	 * Execute a map-reduce operation that takes a query and additional map-reduce options
+	 * 
 	 * @param query The query to use to select the data for the map phase
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
@@ -315,7 +409,8 @@ public interface MongoOperations {
 	 * @param entityClass The parameterized type of the returned list
 	 * @return The results of the map reduce operation
 	 */
-	<T> MapReduceResults<T> mapReduce(Query query,  String inputCollectionName, String mapFunction, String reduceFunction, MapReduceOptions mapReduceOptions, Class<T> entityClass );
+	<T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction, String reduceFunction,
+			MapReduceOptions mapReduceOptions, Class<T> entityClass);
 
 	/**
 	 * Returns {@link GeoResult} for all entities matching the given {@link NearQuery}. Will consider entity mapping
@@ -338,29 +433,12 @@ public interface MongoOperations {
 	 */
 	<T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
 
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists for the collection indicated by the entity
-	 * class. If not it will be created.
-	 * 
-	 * @param indexDefinition
-	 * @param entityClass class that determines the collection to use
-	 */
-	void ensureIndex(IndexDefinition indexDefinition, Class<?> entityClass);
-
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists. If not it will be created.
-	 * 
-	 * @param index
-	 * @param collectionName
-	 */
-	void ensureIndex(IndexDefinition indexDefinition, String collectionName);
-
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a single instance of an object 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}.
@@ -377,7 +455,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}.
@@ -386,16 +464,21 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
-	 * 
 	 * @return the converted object
 	 */
 	<T> T findOne(Query query, Class<T> entityClass, String collectionName);
 
+	boolean exists(Query query, String collectionName);
+
+	boolean exists(Query query, Class<?> entityClass);
+
+	boolean exists(Query query, Class<?> entityClass, String collectionName);
+
 	/**
 	 * 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}.
@@ -411,7 +494,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}.
@@ -420,31 +503,10 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
-	 * 
 	 * @return the List of converted objects
 	 */
 	<T> List<T> find(Query query, Class<T> entityClass, String collectionName);
 
-	/**
-	 * 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.
-	 * <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}.
-	 * 
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parameterized type of the returned list.
-	 * @param preparer allows for customization of the DBCursor used when iterating over the result set, (apply limits,
-	 *          skips and so on).
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * 
-	 * @return the List of converted objects.
-	 */
-	<T> List<T> find(Query query, Class<T> entityClass, CursorPreparer preparer, String collectionName);
-
 	/**
 	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
 	 * derived from the given target class as well.
@@ -462,12 +524,20 @@ public interface MongoOperations {
 	 * @param id the id of the document to return
 	 * @param entityClass the type to convert the document to
 	 * @param collectionName the collection to query for the document
-	 * 
 	 * @param <T>
 	 * @return
 	 */
 	<T> T findById(Object id, Class<T> entityClass, String collectionName);
 
+	<T> T findAndModify(Query query, Update update, Class<T> entityClass);
+
+	<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
+
+	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
+
+	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
+			String collectionName);
+
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity type to a single instance of an object of the
 	 * specified type. The first document that matches the query is returned and also removed from the collection in the
@@ -490,7 +560,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}.
@@ -499,11 +569,28 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
-	 * 
 	 * @return the converted object
 	 */
 	<T> T findAndRemove(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
+	 * 
+	 * @param query
+	 * @param entityClass must not be {@literal null}.
+	 * @return
+	 */
+	long count(Query query, Class<?> entityClass);
+
+	/**
+	 * Returns the number of documents for the given {@link Query} querying the given collection.
+	 * 
+	 * @param query
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @return
+	 */
+	long count(Query query, String collectionName);
+
 	/**
 	 * Insert the object into the collection for the entity type of the object to save.
 	 * <p/>
@@ -526,7 +613,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.
 	 * 
@@ -564,7 +651,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
@@ -581,7 +668,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
@@ -594,6 +681,41 @@ public interface MongoOperations {
 	 */
 	void save(Object objectToSave, String collectionName);
 
+	/**
+	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
+	 * combining the query document and the update document.
+	 * 
+	 * @param query the query document that specifies the criteria used to select a record to be upserted
+	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
+	 * @param entityClass class that determines the collection to use
+	 * @return the WriteResult which lets you access the results of the previous write.
+	 */
+	WriteResult upsert(Query query, Update update, Class<?> entityClass);
+
+	/**
+	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
+	 * combining the query document and the update document.
+	 * 
+	 * @param query the query document that specifies the criteria used to select a record to be updated
+	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
+	 *          object.
+	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
+	 */
+	WriteResult upsert(Query query, Update update, String collectionName);
+
+	/**
+	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
+	 * combining the query document and the update document.
+	 * 
+	 * @param query the query document that specifies the criteria used to select a record to be upserted
+	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
+	 * @param entityClass class of the pojo to be operated on
+	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
+	 */
+	WriteResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
+
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
 	 * the provided update document.
@@ -602,6 +724,7 @@ public interface MongoOperations {
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param entityClass class that determines the collection to use
+	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
 	WriteResult updateFirst(Query query, Update update, Class<?> entityClass);
 
@@ -613,9 +736,23 @@ public interface MongoOperations {
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
 	WriteResult updateFirst(Query query, Update update, String collectionName);
 
+	/**
+	 * Updates the first object that is found in the specified collection that matches the query document criteria with
+	 * the provided updated document.
+	 * 
+	 * @param query the query document that specifies the criteria used to select a record to be updated
+	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
+	 *          object.
+	 * @param entityClass class of the pojo to be operated on
+	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
+	 */
+	WriteResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
+
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
@@ -624,6 +761,7 @@ public interface MongoOperations {
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param entityClass class that determines the collection to use
+	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
 	WriteResult updateMulti(Query query, Update update, Class<?> entityClass);
 
@@ -635,25 +773,48 @@ public interface MongoOperations {
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
 	WriteResult updateMulti(Query query, Update update, String collectionName);
 
 	/**
-	 * Remove the given object from the collection by Id
+	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
+	 * with the provided updated document.
+	 * 
+	 * @param query the query document that specifies the criteria used to select a record to be updated
+	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
+	 *          object.
+	 * @param entityClass class of the pojo to be operated on
+	 * @param collectionName name of the collection to update the object in
+	 * @return the WriteResult which lets you access the results of the previous write.
+	 */
+	WriteResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
+
+	/**
+	 * Remove the given object from the collection by id.
 	 * 
 	 * @param object
 	 */
 	void remove(Object object);
 
+	/**
+	 * Removes the given object from the given collection.
+	 * 
+	 * @param object
+	 * @param collection must not be {@literal null} or empty.
+	 */
+	void remove(Object object, String collection);
+
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 * 
-	 * @param <T>
 	 * @param query
 	 * @param entityClass
 	 */
-	<T> void remove(Query query, Class<T> entityClass);
+	void remove(Query query, Class<?> entityClass);
+
+	void remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
@@ -670,4 +831,4 @@ public interface MongoOperations {
 	 * @return
 	 */
 	MongoConverter getConverter();
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java

@@ -68,6 +68,8 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 */
 	private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
 
+	private long maxAutoConnectRetryTime = MONGO_OPTIONS.maxAutoConnectRetryTime;
+
 	/**
 	 * This specifies the number of servers to wait for on the write operation, and exception raising behavior.
 	 * 
@@ -94,6 +96,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 * 
 	 * Defaults to false
 	 */
+	@SuppressWarnings("deprecation")
 	private boolean slaveOk = MONGO_OPTIONS.slaveOk;
 
 	/**
@@ -183,6 +186,16 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		this.autoConnectRetry = autoConnectRetry;
 	}
 
+	/**
+	 * 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.
+	 * 
+	 * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
+	 */
+	public void setMaxAutoConnectRetryTime(long maxAutoConnectRetryTime) {
+		this.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
+	}
+
 	/**
 	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to false.
 	 * 
@@ -192,6 +205,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		this.slaveOk = slaveOk;
 	}
 
+	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() {
 		MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
 		MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
@@ -200,6 +214,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		MONGO_OPTIONS.socketTimeout = socketTimeout;
 		MONGO_OPTIONS.socketKeepAlive = socketKeepAlive;
 		MONGO_OPTIONS.autoConnectRetry = autoConnectRetry;
+		MONGO_OPTIONS.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
 		MONGO_OPTIONS.slaveOk = slaveOk;
 		MONGO_OPTIONS.w = writeNumber;
 		MONGO_OPTIONS.wtimeout = writeTimeout;