DATAMONGO-981 - Release version 1.6.0.M1.

Added currentDate and currentTimestamp to Update.

Original pull request: #200.

.gitignore

@@ -1,13 +1,17 @@
-.DS_Store
-*.iml
-*.ipr
-*.iws
-target
-.springBeans
-.ant-targets-build.xml
-.settings/
-.project
-.classpath
-src/ant/.ant-targets-upload-dist.xml
-atlassian-ide-plugin.xml
-/.gradle/
+.DS_Store
+*.iml
+*.ipr
+*.iws
+*.orig
+target
+.springBeans
+.sonar4clipse
+*.sonar4clipseExternals
+.ant-targets-build.xml
+.settings/
+.project
+.classpath
+src/ant/.ant-targets-upload-dist.xml
+atlassian-ide-plugin.xml
+/.gradle/
+/.idea/

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,155 +1,147 @@
-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/).
+The primary goal of the [Spring Data](http://projects.spring.io/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.
 
-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://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
+* the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
+* for more detailed questions, use [Spring Data Mongodb on Stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-mongodb).
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
 
 
+## 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.5.0.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.6.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.spring.io/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
-* 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).
+* 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://docs.spring.io/spring/docs/current/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 MongoClient();
+  }
 
-          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.mongodb.core.MongoTemplate">
+  <constructor-arg>
+    <bean class="com.mongodb.MongoClient">
+       <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:
 
-* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
+* Get involved with the Spring community on Stackoverflow and help out on the [spring-data-mongodb](http://stackoverflow.com/questions/tagged/spring-data-mongodb) tag by responding to questions and joining the debate.
 * Create [JIRA](https://jira.springframework.org/browse/DATADOC) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
+* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
 
 Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.

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,163 @@
 <?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.M3</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>
 
-  <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.
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-mongodb-parent</artifactId>
+	<version>1.6.0.M1</version>
+	<packaging>pom</packaging>
 
-        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
+	<name>Spring Data MongoDB</name>
+	<description>MongoDB support for Spring Data</description>
+	<url>http://projects.spring.io/spring-data-mongodb</url>
 
-        http://www.apache.org/licenses/LICENSE-2.0
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.5.0.M1</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+	</parent>
 
-        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>
+	<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>
 
-  <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>
+	<properties>
+		<project.type>multi</project.type>
+		<dist.id>spring-data-mongodb</dist.id>
+		<springdata.commons>1.9.0.M1</springdata.commons>
+		<mongo>2.12.1</mongo>
+		<mongo.osgi>2.12.1</mongo.osgi>
+	</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>
+	<developers>
+		<developer>
+			<id>ogierke</id>
+			<name>Oliver Gierke</name>
+			<email>ogierke at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Project Lead</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>trisberg</id>
+			<name>Thomas Risberg</name>
+			<email>trisberg at vmware.com</email>
+			<organization>Pivotal</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</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</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</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</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
 
-    <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>
+	<profiles>
+		<profile>
 
-      <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>
+			<id>mongo-next</id>
+			<properties>
+				<mongo>2.12.3-SNAPSHOT</mongo>
+			</properties>
 
-  <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>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
 
-  <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>
+		</profile>
+
+		<profile>
+
+			<id>mongo-3-next</id>
+			<properties>
+				<mongo>3.0.0-SNAPSHOT</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<!-- MongoDB -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo}</version>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>spring-libs-milestone</id>
+			<url>http://repo.spring.io/libs-milestone</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/DocumentRetrievalFailureException.java

@@ -1,35 +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.DataRetrievalFailureException;
-
-public class DocumentRetrievalFailureException extends
-    DataRetrievalFailureException {
-
-  private String documentPath;
-
-  public DocumentRetrievalFailureException(String documentPath) {
-    super("Could not find document at path = " + documentPath);
-    this.documentPath = documentPath;
-  }
-
-  public String getDocumentPath() {
-    return documentPath;
-  }
-
-
-}

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/CouchAdminOperations.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.admin;
-
-import java.util.List;
-
-public interface CouchAdminOperations {
-
-
-  // functionality for /_special - replication, logs, UUIDs
-
-  List<String> listDatabases();
-
-  void createDatabase(String name);
-
-  void deleteDatabase(String name);
-
-  DbInfo getDatabaseInfo(String name);
-
-
-}

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.M3</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.5.RELEASE</org.springframework.version>
-    <data.commons.version>1.1.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,138 @@
-<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.M3</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.6.0.M1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>spring-data-mongodb-cross-store</artifactId>
+	<name>Spring Data MongoDB - Cross-Store 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>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
 
+		<!-- Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>1.6.0.M1</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>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>
+			<optional>true</optional>
+		</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.6</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> 
+					<complianceLevel>${source.level}</complianceLevel>
+					<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,195 @@
+/*
+ * Copyright 2011-2014 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");
+		}
+
+		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+	}
+
+	/*
+	 * (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.document.mongodb.CollectionCallback;
-import org.springframework.data.document.mongodb.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.mongodb.MongoTemplate;
-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.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.document.mongodb.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,37 +13,37 @@
 
   <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>
 
   <mongo:mapping-converter/>
   
   <!--  Mongo config -->
-  <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
+  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>
 
-  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.SimpleMongoDbFactory">
+  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
   	<constructor-arg name="mongo" ref="mongo"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>
 
-  <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
     <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
-  <bean class="org.springframework.data.document.mongodb.MongoExceptionTranslator"/>
+  <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: Pivotal Software, Inc.
+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="${mongo.osgi:[=.=.=,+1.0.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="${spring:[=.=.=.=,+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.6.0.M1</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.M3</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.6.0.M1</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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.log4j;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link MongoLog4jAppender}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoLog4jAppenderUnitTests {
+
+	/**
+	 * @see DATAMONGO-641
+	 */
+	@Test
+	public void closesWithoutMongoInstancePresent() {
+		new MongoLog4jAppender().close();
+	}
+}

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

@@ -1,10 +1,9 @@
 Bundle-SymbolicName: org.springframework.data.mongodb.log4j
 Bundle-Name: Spring Data Mongo DB Log4J Appender
-Bundle-Vendor: SpringSource
+Bundle-Vendor: Pivotal Software, Inc.
 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.osgi:[=.=.=,+1.0.0)}",
+ org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"

spring-data-mongodb/.classpath.orig

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-sources/test-annotations"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<context version="7.1.9.205">
+    <scope type="Project" name="spring-data-mongodb">
+        <element type="TypeFilterReferenceOverridden" name="Filter">
+            <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
+        </element>
+        <architecture>
+            <element type="Layer" name="Repositories">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.repository.**"/>
+                </element>
+                <element type="Subsystem" name="API">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.repository.*"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Query">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.query.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Implementation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.support.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Config">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.config.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation" type="AllowedDependency"/>
+                </element>
+                <dependency toName="Project|spring-data-mongodb::Layer|Config" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Config">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="WeakTypePattern" name="**.config.**"/>
+                </element>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|GridFS" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Monitoring" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Monitoring">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.monitor.**"/>
+                </element>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="GridFS">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.gridfs.**"/>
+                </element>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Core">
+                <element type="TypeFilter" name="Assignment"/>
+                <element type="Subsystem" name="Mapping">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.mapping.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Geospatial">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.geo.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Query">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.query.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Conversion">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.convert.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="SpEL">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.spel.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Aggregation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.aggregation.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Conversion" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|SpEL" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Index">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.index.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Core">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.core.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Aggregation" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Conversion" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Util">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.util.**"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                    <stereotype name="Public"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="API">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.data.mongodb.*"/>
+                </element>
+                <stereotype name="Public"/>
+            </element>
+        </architecture>
+        <workspace>
+            <element type="JavaRootDirectory" name="src/main/java">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+            <element type="JavaRootDirectory" name="target/classes">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+        </workspace>
+        <physical>
+            <element type="BuildUnit" name="spring-data-mongodb"/>
+        </physical>
+    </scope>
+    <scope type="External" name="External">
+        <element type="TypeFilter" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
+            <element type="ExcludeTypePattern" name="java.**"/>
+            <element type="ExcludeTypePattern" name="javax.**"/>
+        </element>
+        <architecture>
+            <element type="Subsystem" name="Spring">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.**"/>
+                    <element type="ExcludeTypePattern" name="org.springframework.data.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Spring Data Core">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.data.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Mongo Java Driver">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.mongodb.**"/>
+                    <element type="IncludeTypePattern" name="org.bson.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Querydsl">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.mysema.query.**"/>
+                </element>
+            </element>
+        </architecture>
+    </scope>
+    <scope type="Global" name="Global">
+        <element type="Configuration" name="Configuration"/>
+        <element type="TypeFilter" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
+        </element>
+    </scope>
+</context>

spring-data-mongodb/etc/eclipse-formatter.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="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="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="false"/>
+<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="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<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="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.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="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_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="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="0"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.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>

spring-data-mongodb/pom.xml

@@ -1,145 +1,165 @@
-<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.M3</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.6.0.M1</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-data-mongodb</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data MongoDB Support</name>
 
 	<properties>
-		<mongo.version>2.5.3</mongo.version>
-		<querydsl.version>2.2.0-beta4</querydsl.version>
+		<validation>1.0.0.GA</validation>
+		<objenesis>1.3</objenesis>
 	</properties>
 
 	<dependencies>
-
+		
 		<!--  Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
+			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-expression</artifactId>
 		</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>
+			<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>
+		
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+			<version>${objenesis}</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.1</version>
+				<artifactId>apt-maven-plugin</artifactId>
+				<version>${apt}</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 +168,30 @@
 						</goals>
 						<configuration>
 							<outputDirectory>target/generated-test-sources</outputDirectory>
-							<processor>org.springframework.data.document.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/document/mongodb/MongoAdminOperations.java

@@ -1,16 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import org.springframework.jmx.export.annotation.ManagedOperation;
-
-public interface MongoAdminOperations {
-
-	@ManagedOperation
-	public abstract void dropDatabase(String databaseName);
-
-	@ManagedOperation
-	public abstract void createDatabase(String databaseName);
-
-	@ManagedOperation
-	public abstract String getDatabaseStats(String databaseName);
-
-}

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

@@ -1,13 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import org.springframework.dao.DataAccessException;
-
-import com.mongodb.DB;
-
-public interface MongoDbFactory {
-
-	DB getDb() throws DataAccessException;
-	
-	DB getDb(String dbName) throws DataAccessException;
-	
-}

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

@@ -1,173 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes.
- * <p/>
- * <p>
- * Mainly intended for internal use within the framework.
- * 
- * @author Thomas Risberg
- * @author Graeme Rocher
- * @author Oliver Gierke
- * @since 1.0
- */
-public abstract class MongoDbUtils {
-
-	private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
-
-	/**
-	 * Private constructor to prevent instantiation.
-	 */
-	private 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
-	 */
-	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, null, null, 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
-	 */
-	public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
-		return doGetDB(mongo, databaseName, username, password, true);
-	}
-
-	public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
-		Assert.notNull(mongo, "No Mongo instance specified");
-
-		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);
-				}
-			}
-			if (db != null) {
-				return db;
-			}
-		}
-
-		LOGGER.trace("Getting Mongo Database name=[" + databaseName + "]");
-		DB db = mongo.getDB(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);
-			}
-		}
-
-		// Use same Session for further Mongo actions within the transaction.
-		// Thread object will get removed by synchronization at transaction completion.
-		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			// We're within a Spring-managed transaction, possibly from JtaTransactionManager.
-			LOGGER.debug("Registering Spring transaction synchronization for new Hibernate Session");
-			DbHolder holderToUse = dbHolder;
-			if (holderToUse == null) {
-				holderToUse = new DbHolder(db);
-			} else {
-				holderToUse.addDB(db);
-			}
-			TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
-			holderToUse.setSynchronizedWithTransaction(true);
-			if (holderToUse != dbHolder) {
-				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
-			}
-		}
-
-		// Check whether we are allowed to return the DB.
-		if (!allowCreate && !isDBTransactional(db, mongo)) {
-			throw new IllegalStateException("No Mongo DB bound to thread, "
-					+ "and configuration does not allow creation of non-transactional one here");
-		}
-
-		return db;
-	}
-
-	/**
-	 * Return whether the given DB instance is transactional, that is, bound to the current thread by Spring's transaction
-	 * facilities.
-	 * 
-	 * @param db
-	 *          the DB to check
-	 * @param mongo
-	 *          the Mongo instance that the DB was created with (may be <code>null</code>)
-	 * @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));
-	}
-
-	/**
-	 * Perform actual closing of the Mongo DB object, catching and logging any cleanup exceptions thrown.
-	 * 
-	 * @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 {
-				db.requestDone();
-			} catch (Throwable ex) {
-				LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
-			}
-		}
-	}
-}

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

@@ -1,130 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import java.util.List;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoOptions;
-import com.mongodb.ServerAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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.util.Assert;
-
-/**
- * Convenient factory for configuring MongoDB.
- * 
- * @author Thomas Risberg
- * @author Graeme Rocher
- * @since 1.0
- */
-public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, PersistenceExceptionTranslator {
-
-	/**
-	 * Logger, available to subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private Mongo mongo;
-	private MongoOptions mongoOptions;
-	private String host;
-	private Integer port;
-	private List<ServerAddress> replicaSetSeeds;
-	private List<ServerAddress> replicaPair;
-
-	private PersistenceExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-
-	public void setMongoOptions(MongoOptions mongoOptions) {
-		this.mongoOptions = mongoOptions;
-	}
-
-	public void setReplicaSetSeeds(List<ServerAddress> replicaSetSeeds) {
-		this.replicaSetSeeds = replicaSetSeeds;
-	}
-
-	public void setReplicaPair(List<ServerAddress> replicaPair) {
-		this.replicaPair = replicaPair;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return exceptionTranslator;
-	}
-
-	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator;
-	}
-
-	public Mongo getObject() throws Exception {
-		Assert.notNull(mongo, "Mongo must not be null");
-		return mongo;
-	}
-
-	public Class<? extends Mongo> getObjectType() {
-		return Mongo.class;
-	}
-
-	public boolean isSingleton() {
-		return false;
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		// apply defaults - convenient when used to configure for tests
-		// in an application context
-		if (mongo == null) {
-
-			if (host == null) {
-				logger.warn("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();
-					if (port != null) {
-						mongo = new Mongo(new ServerAddress(mongoHost, port), mongoOptions);
-					} else {
-						mongo = new Mongo(mongoHost, mongoOptions);
-					}
-				}
-			}
-		}
-	}
-
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		return exceptionTranslator.translateExceptionIfPossible(ex);
-	}
-}

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

@@ -1,614 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import com.mongodb.CommandResult;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.WriteResult;
-
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.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
- * proxy).
- * 
- * @author Thomas Risberg
- * @author Mark Pollack
- * @author Oliver Gierke
- */
-public interface MongoOperations {
-
-	/**
-	 * The collection name used for the specified class by this template.
-	 * 
-	 * @return
-	 */
-	String getCollectionName(Class<?> entityClass);
-
-	/**
-	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
-	 * MongoDB driver to convert the JSON string to a DBObject. Any errors that result from executing this command will be
-	 * converted into Spring's DAO exception hierarchy.
-	 * 
-	 * @param jsonCommand
-	 *          a MongoDB command expressed as a JSON string.
-	 */
-	CommandResult executeCommand(String jsonCommand);
-
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
-	 * exception hierarchy.
-	 * 
-	 * @param command
-	 *          a MongoDB command
-	 */
-	CommandResult executeCommand(DBObject command);
-
-	/**
-	 * Executes a {@link DbCallback} translating any exceptions as necessary.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 * 
-	 * @param <T>
-	 *          return type
-	 * @param action
-	 *          callback object that specifies the MongoDB actions to perform on the passed in DB instance.
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> T execute(DbCallback<T> action);
-
-	/**
-	 * Executes the given {@link CollectionCallback} on the entity collection of the specified class.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 * 
-	 * @param entityClass
-	 *          class that determines the collection to use
-	 * @param <T>
-	 *          return type
-	 * @param action
-	 *          callback object that specifies the MongoDB action
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> T execute(Class<?> entityClass, CollectionCallback<T> action);
-
-	/**
-	 * Executes the given {@link CollectionCallback} on the collection of the given name.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 * 
-	 * @param <T>
-	 *          return type
-	 * @param collectionName
-	 *          the name of the collection that specifies which DBCollection instance will be passed into
-	 * @param action
-	 *          callback object that specifies the MongoDB action the callback action.
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> T execute(String collectionName, CollectionCallback<T> action);
-
-	/**
-	 * Executes the given {@link DbCallback} within the same connection to the database so as to ensure consistency in a
-	 * write heavy environment where you may read the data that you wrote. See the comments on {@see <a
-	 * href=http://www.mongodb.org/display/DOCS/Java+Driver+Concurrency>Java Driver Concurrency</a>}
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 * 
-	 * @param <T>
-	 *          return type
-	 * @param action
-	 *          callback that specified the MongoDB actions to perform on the DB instance
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> T executeInSession(DbCallback<T> action);
-
-	/**
-	 * Create an uncapped collection with a name based on the provided entity class.
-	 * 
-	 * @param entityClass
-	 *          class that determines the collection to create
-	 * @return the created collection
-	 */
-	<T> DBCollection createCollection(Class<T> entityClass);
-
-	/**
-	 * Create a collect with a name based on the provided entity class using the options.
-	 * 
-	 * @param entityClass
-	 *          class that determines the collection to create
-	 * @param collectionOptions
-	 *          options to use when creating the collection.
-	 * @return the created collection
-	 */
-	<T> DBCollection createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
-
-	/**
-	 * Create an uncapped collection with the provided name.
-	 * 
-	 * @param collectionName
-	 *          name of the collection
-	 * @return the created collection
-	 */
-	DBCollection createCollection(String collectionName);
-
-	/**
-	 * Create a collect with the provided name and options.
-	 * 
-	 * @param collectionName
-	 *          name of the collection
-	 * @param collectionOptions
-	 *          options to use when creating the collection.
-	 * @return the created collection
-	 */
-	DBCollection createCollection(String collectionName, CollectionOptions collectionOptions);
-
-	/**
-	 * A set of collection names.
-	 * 
-	 * @return list of collection names
-	 */
-	Set<String> getCollectionNames();
-
-	/**
-	 * Get a collection by name, creating it if it doesn't exist.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 * 
-	 * @param collectionName
-	 *          name of the collection
-	 * @return an existing collection or a newly created one.
-	 */
-	DBCollection getCollection(String collectionName);
-
-	/**
-	 * Check to see if a collection with a name indicated by the entity class exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 * 
-	 * @param entityClass
-	 *            class that determines the name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	<T> boolean collectionExists(Class<T> entityClass);
-
-	/**
-	 * Check to see if a collection with a given name exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 * 
-	 * @param collectionName
-	 *          name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	boolean collectionExists(String collectionName);
-
-	/**
-	 * Drop the collection with the name indicated by the entity class.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 * 
-	 * @param entityClass
-	 *            class that determines the collection to drop/delete.
-	 */
-	<T> void dropCollection(Class<T> entityClass);
-
-	/**
-	 * Drop the collection with the given name.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 * 
-	 * @param collectionName
-	 *          name of the collection to drop/delete.
-	 */
-	void dropCollection(String collectionName);
-
-	/**
-	 * 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.
-	 * <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.
-	 * 
-	 * @param entityClass
-	 *          the parameterized type of the returned list
-	 * @return the converted collection
-	 */
-	<T> List<T> findAll(Class<T> entityClass);
-
-	/**
-	 * 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.
-	 * <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.
-	 * 
-	 * @param entityClass
-	 *          the parameterized type of the returned list.
-	 * @param collectionName
-	 *          name of the collection to retrieve the objects from
-	 * @return the converted collection
-	 */
-	<T> List<T> findAll(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.
-	 * <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.
-	 * @return the converted object
-	 */
-	<T> T findOne(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection 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.
-	 * <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 collectionName
-	 *          name of the collection to retrieve the objects from
-	 * 
-	 * @return the converted object
-	 */
-	<T> T findOne(Query query, Class<T> 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.
-	 * <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.
-	 * @return the List of converted objects
-	 */
-	<T> List<T> find(Query query, Class<T> entityClass);
-
-	/**
-	 * 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 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.
-	 * 
-	 * @param <T>
-	 * @param id the id of the document to return.
-	 * @param entityClass the type the document shall be converted into.
-	 * @return the document with the given id mapped onto the given target class.
-	 */
-	<T> T findById(Object id, Class<T> entityClass);
-	
-	/**
-	 * Returns the document with the given id from the given collection mapped onto the given target class.
-	 * @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);
-
-	/**
-	 * 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 database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. 
-	 * <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.
-	 * @return the converted object
-	 */
-	<T> T findAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection 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 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.
-	 * <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 collectionName
-	 *          name of the collection to retrieve the objects from
-	 * 
-	 * @return the converted object
-	 */
-	<T> T findAndRemove(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <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
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 * 
-	 * @param objectToSave
-	 *          the object to store in the collection.
-	 */
-	void insert(Object objectToSave);
-
-	/**
-	 * 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.
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 * @param objectToSave
-	 *          the object to store in the collection
-	 * @param collectionName
-	 *          name of the collection to store the object in
-	 */
-	void insert(Object objectToSave, String collectionName);
-
-	/**
-	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 * 
-	 * @param batchToSave
-	 *          the list of objects to save.
-	 * @param entityClass
-	 *          class that determines the collection to use
-	 */
-	void insert(Collection<? extends Object> batchToSave, Class<?> entityClass);
-
-	/**
-	 * Insert a list of objects into the specified collection in a single batch write to the database.
-	 * @param batchToSave
-	 *          the list of objects to save.
-	 * @param collectionName
-	 *          name of the collection to store the object in
-	 */
-	void insert(Collection<? extends Object> batchToSave, String collectionName);
-
-	/**
-	 * Insert a mixed Collection of objects into a database collection determining the 
-	 * collection name to use based on the class.
-	 * 
-	 * @param collectionToSave
-	 *          the list of objects to save.
-	 */
-	void insertAll(Collection<? extends Object> objectsToSave);
-
-	/**
-	 * Save the object to the collection for the entity type of the object to save. This will perform an 
-	 * insert if the 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.
-	 * <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
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
-	 * 
-	 * @param objectToSave
-	 *          the object to store in the collection
-	 */
-	void save(Object objectToSave);
-
-	/**
-	 * Save the object to the specified collection. This will perform an insert if the 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.
-	 * <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
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Cobnversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
-	 * @param objectToSave
-	 *          the object to store in the collection
-	 * @param collectionName
-	 *          name of the collection to store the object in
-	 */
-	void save(Object objectToSave, 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.
-	 * @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 that determines the collection to use
-	 */
-	WriteResult updateFirst(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * 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 collectionName
-	 *          name of the collection to update the object in
-	 */
-	WriteResult updateFirst(Query query, Update update, 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.
-	 * @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 that determines the collection to use
-	 */
-	WriteResult updateMulti(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Updates all objects that are 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 collectionName
-	 *          name of the collection to update the object in
-	 */
-	WriteResult updateMulti(Query query, Update update, String collectionName);
-
-	/**
-	 * Remove the given object from the collection by Id
-	 * 
-	 * @param object
-	 */
-	void remove(Object object);
-
-	/**
-	 * 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);
-
-	/**
-	 * Remove all documents from the specified collection that match the provided query document criteria.
-	 * There is no conversion/mapping done for any criteria using the id field.
-	 * @param query
-	 *          the query document that specifies the criteria used to remove a record
-	 * @param collectionName
-	 *          name of the collection where the objects will removed
-	 */
-	void remove(Query query, String collectionName);
-
-}

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

@@ -1,220 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import com.mongodb.MongoOptions;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * A factory bean for construction of a MongoOptions instance
- * 
- * @author Graeme Rocher
- * @Author Mark Pollack
- */
-public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
-
-	private static final MongoOptions MONGO_OPTIONS = new MongoOptions();
-	/**
-	 * number of connections allowed per host will block if run out
-	 */
-	private int connectionsPerHost = MONGO_OPTIONS.connectionsPerHost;
-
-	/**
-	 * multiplier for connectionsPerHost for # of threads that can block if connectionsPerHost is 10, and
-	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an exception will
-	 * be throw
-	 */
-	private int threadsAllowedToBlockForConnectionMultiplier = MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
-
-	/**
-	 * max wait time of a blocking thread for a connection
-	 */
-	private int maxWaitTime = MONGO_OPTIONS.maxWaitTime;
-
-	/**
-	 * connect timeout in milliseconds. 0 is default and infinite
-	 */
-	private int connectTimeout = MONGO_OPTIONS.connectTimeout;
-
-	/**
-	 * socket timeout. 0 is default and infinite
-	 */
-	private int socketTimeout = MONGO_OPTIONS.socketTimeout;
-	
-
-  /**
-   * This controls whether or not to have socket keep alive
-   * turned on (SO_KEEPALIVE).
-   *
-   * defaults to false
-   */
-  public boolean socketKeepAlive = MONGO_OPTIONS.socketKeepAlive;
-
-	/**
-	 * this controls whether or not on a connect, the system retries automatically
-	 */
-	private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
-
-  /**
-   * This specifies the number of servers to wait for on the write operation, and exception raising behavior.
-   *
-   * Defaults to 0.
-   */
-	private int writeNumber;
-	
-  /**
-   * This controls timeout for write operations in milliseconds. 
-   *
-   *  Defaults to 0 (indefinite).  Greater than zero is number of milliseconds to wait.
-   */
-	private int writeTimeout;
-	
-  /**
-   * This controls whether or not to fsync.
-   *
-   * Defaults to false.
-   */
-	private boolean writeFsync;
-	
-	/**
-   * Specifies if the driver is allowed to read from secondaries
-   * or slaves.
-   *
-   * Defaults to false
-	 */
-	private boolean slaveOk = MONGO_OPTIONS.slaveOk;
-
-	/**
-	 * number of connections allowed per host will block if run out
-	 */
-	public void setConnectionsPerHost(int connectionsPerHost) {
-		this.connectionsPerHost = connectionsPerHost;
-	}
-
-	/**
-	 * multiplier for connectionsPerHost for # of threads that can block if connectionsPerHost is 10, and
-	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an exception will
-	 * be throw
-	 */
-	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
-		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-	}
-
-	/**
-	 * max wait time of a blocking thread for a connection
-	 */
-	public void setMaxWaitTime(int maxWaitTime) {
-		this.maxWaitTime = maxWaitTime;
-	}
-
-	/**
-	 * connect timeout in milliseconds. 0 is default and infinite
-	 */
-	public void setConnectTimeout(int connectTimeout) {
-		this.connectTimeout = connectTimeout;
-	}
-
-	/**
-	 * socket timeout. 0 is default and infinite
-	 */
-	public void setSocketTimeout(int socketTimeout) {
-		this.socketTimeout = socketTimeout;
-	}
-	
-	/**
-	 * This controls whether or not to have socket keep alive
-	 * @param socketKeepAlive
-	 */
-  public void setSocketKeepAlive(boolean socketKeepAlive) {
-    this.socketKeepAlive = socketKeepAlive;
-  }
-  
-  /**
-   * This specifies the number of servers to wait for on the write operation, and exception raising behavior.
-   * The 'w' option to the getlasterror command.  Defaults to 0.
-   * <ul>
-   *  <li>-1 = don't even report network errors </li>
-   *  <li> 0 = default, don't call getLastError by default </li>
-   *  <li> 1 = basic, call getLastError, but don't wait for slaves</li>
-   *  <li> 2+= wait for slaves </li>
-   * </ul>   
-   * @param writeNumber the number of servers to wait for on the write operation, and exception raising behavior.
-   */
-	public void setWriteNumber(int writeNumber) {
-    this.writeNumber = writeNumber;
-  }
-
-	/**
-	 * This controls timeout for write operations in milliseconds.  The 'wtimeout' option to the getlasterror command.
-   *
-	 * @param writeTimeout Defaults to 0 (indefinite).  Greater than zero is number of milliseconds to wait. 
-	 */
-  public void setWriteTimeout(int writeTimeout) {
-    this.writeTimeout = writeTimeout;
-  }
-
-  /**
-   * This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false. 
-   * @param writeFsync to fsync on write (true), otherwise false.
-   */
-  public void setWriteFsync(boolean writeFsync) {
-    this.writeFsync = writeFsync;
-  }
-
-  /**
-	 * this controls whether or not on a connect, the system retries automatically
-	 */
-	public void setAutoConnectRetry(boolean autoConnectRetry) {
-		this.autoConnectRetry = autoConnectRetry;
-	}
-		
-	/**
-	 * Specifies if the driver is allowed to read from secondaries or slaves.  Defaults to false.
-	 * @param slaveOk true if the driver should read from secondaries or slaves.
-	 */
-	public void setSlaveOk(boolean slaveOk) {
-	  this.slaveOk = slaveOk;
-	}
-
-	public void afterPropertiesSet() {
-		MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
-		MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-		MONGO_OPTIONS.maxWaitTime = maxWaitTime;
-		MONGO_OPTIONS.connectTimeout = connectTimeout;
-		MONGO_OPTIONS.socketTimeout = socketTimeout;
-		MONGO_OPTIONS.socketKeepAlive = socketKeepAlive;
-		MONGO_OPTIONS.autoConnectRetry = autoConnectRetry;		
-		MONGO_OPTIONS.slaveOk = slaveOk;		
-		MONGO_OPTIONS.w = writeNumber;
-		MONGO_OPTIONS.wtimeout = writeTimeout;
-		MONGO_OPTIONS.fsync = writeFsync;
-	}
-
-	public MongoOptions getObject() {
-		return MONGO_OPTIONS;
-	}
-
-	public Class<?> getObjectType() {
-		return MongoOptions.class;
-	}
-
-	public boolean isSingleton() {
-		return true;
-	}
-
-}

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

@@ -1,244 +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.mongodb;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.math.BigInteger;
-import java.util.*;
-
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * An iterable of {@link MongoPropertyDescriptor}s that allows dedicated access to the {@link MongoPropertyDescriptor}
- * that captures the id-property.
- * 
- * @author Oliver Gierke
- */
-public class MongoPropertyDescriptors implements Iterable<MongoPropertyDescriptors.MongoPropertyDescriptor> {
-
-	private final Collection<MongoPropertyDescriptors.MongoPropertyDescriptor> descriptors;
-	private final MongoPropertyDescriptors.MongoPropertyDescriptor idDescriptor;
-
-	/**
-	 * Creates the {@link MongoPropertyDescriptors} for the given type.
-	 * 
-	 * @param type
-	 */
-	public MongoPropertyDescriptors(Class<?> type) {
-
-		Assert.notNull(type);
-		Set<MongoPropertyDescriptors.MongoPropertyDescriptor> descriptors = new HashSet<MongoPropertyDescriptors.MongoPropertyDescriptor>();
-		MongoPropertyDescriptors.MongoPropertyDescriptor idDesciptor = null;
-
-		for (PropertyDescriptor candidates : BeanUtils.getPropertyDescriptors(type)) {
-			MongoPropertyDescriptor descriptor = new MongoPropertyDescriptors.MongoPropertyDescriptor(candidates, type);
-			descriptors.add(descriptor);
-			if (descriptor.isIdProperty()) {
-				idDesciptor = descriptor;
-			}
-		}
-
-		this.descriptors = Collections.unmodifiableSet(descriptors);
-		this.idDescriptor = idDesciptor;
-	}
-
-	/**
-	 * Returns the {@link MongoPropertyDescriptor} for the id property.
-	 * 
-	 * @return the idDescriptor
-	 */
-	public MongoPropertyDescriptors.MongoPropertyDescriptor getIdDescriptor() {
-		return idDescriptor;
-	}
-
-	/*
-	  * (non-Javadoc)
-	  *
-	  * @see java.lang.Iterable#iterator()
-	  */
-	public Iterator<MongoPropertyDescriptors.MongoPropertyDescriptor> iterator() {
-		return descriptors.iterator();
-	}
-
-	/**
-	 * Simple value object to have a more suitable abstraction for MongoDB specific property handling.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public static class MongoPropertyDescriptor {
-
-		public static Collection<Class<?>> SUPPORTED_ID_CLASSES;
-
-		static {
-			Set<Class<?>> classes = new HashSet<Class<?>>();
-			classes.add(ObjectId.class);
-			classes.add(String.class);
-			classes.add(BigInteger.class);
-			SUPPORTED_ID_CLASSES = Collections.unmodifiableCollection(classes);
-		}
-
-		private static final String ID_PROPERTY = "id";
-		static final String ID_KEY = "_id";
-
-		private final PropertyDescriptor delegate;
-		private final Class<?> owningType;
-
-		/**
-		 * Creates a new {@link MongoPropertyDescriptor} for the given {@link PropertyDescriptor}.
-		 * 
-		 * @param descriptor
-		 * @param owningType
-		 */
-		public MongoPropertyDescriptor(PropertyDescriptor descriptor, Class<?> owningType) {
-			Assert.notNull(descriptor);
-			this.delegate = descriptor;
-			this.owningType = owningType;
-		}
-
-		/**
-		 * Returns whether the property is the id-property. Will be identified by name for now ({@value #ID_PROPERTY}).
-		 * 
-		 * @return
-		 */
-		public boolean isIdProperty() {
-			return ID_PROPERTY.equals(delegate.getName()) || ID_KEY.equals(delegate.getName());
-		}
-
-		/**
-		 * Returns whether the property is of one of the supported id types. Currently we support {@link String},
-		 * {@link ObjectId} and {@link BigInteger}.
-		 * 
-		 * @return
-		 */
-		public boolean isOfIdType() {
-			return SUPPORTED_ID_CLASSES.contains(delegate.getPropertyType());
-		}
-
-		/**
-		 * Returns the key that shall be used for mapping. Will return {@value #ID_KEY} for the id property and the plain
-		 * name for all other ones.
-		 * 
-		 * @return
-		 */
-		public String getKeyToMap() {
-			return isIdProperty() ? ID_KEY : delegate.getName();
-		}
-
-		/**
-		 * Returns the name of the property.
-		 * 
-		 * @return
-		 */
-		public String getName() {
-			return delegate.getName();
-		}
-
-		/**
-		 * Returns whether the underlying property is actually mappable. By default this will exclude the {@literal class}
-		 * property and only include properties with a getter.
-		 * 
-		 * @return
-		 */
-		public boolean isMappable() {
-
-			boolean isNotClassAttribute = !delegate.getName().equals("class");
-			boolean hasGetter = delegate.getReadMethod() != null;
-			boolean hasField = ReflectionUtils.findField(owningType, delegate.getName()) != null;
-
-			return isNotClassAttribute && hasGetter && hasField;
-		}
-
-		/**
-		 * Returns the plain property type.
-		 * 
-		 * @return
-		 */
-		public Class<?> getPropertyType() {
-			return delegate.getPropertyType();
-		}
-
-		/**
-		 * Returns the type type to be set. Will return the setter method's type and fall back to the getter method's return
-		 * type in case no setter is available. Useful for further (generics) inspection.
-		 * 
-		 * @return
-		 */
-		public Type getTypeToSet() {
-
-			Method method = delegate.getWriteMethod();
-			return method == null ? delegate.getReadMethod().getGenericReturnType() : method.getGenericParameterTypes()[0];
-		}
-
-		/**
-		 * Returns whther we describe a {@link Map}.
-		 * 
-		 * @return
-		 */
-		public boolean isMap() {
-			return Map.class.isAssignableFrom(getPropertyType());
-		}
-
-		/**
-		 * Returns whether the descriptor is for a collection.
-		 * 
-		 * @return
-		 */
-		public boolean isCollection() {
-			return Collection.class.isAssignableFrom(getPropertyType());
-		}
-
-		/**
-		 * Returns whether the descriptor is for an {@link Enum}.
-		 * 
-		 * @return
-		 */
-		public boolean isEnum() {
-			return Enum.class.isAssignableFrom(getPropertyType());
-		}
-
-		/*
-		   * (non-Javadoc)
-		   *
-		   * @see java.lang.Object#equals(java.lang.Object)
-		   */
-		@Override
-		public boolean equals(Object obj) {
-			if (obj == this) {
-				return true;
-			}
-			if (obj == null || !getClass().equals(obj.getClass())) {
-				return false;
-			}
-			MongoPropertyDescriptor that = (MongoPropertyDescriptor) obj;
-			return that.delegate.equals(this.delegate);
-		}
-
-		/*
-		   * (non-Javadoc)
-		   *
-		   * @see java.lang.Object#hashCode()
-		   */
-		@Override
-		public int hashCode() {
-			return delegate.hashCode();
-		}
-	}
-}

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

@@ -1,43 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import com.mongodb.DBObject;
-
-/**
- * A MongoWriter is responsible for converting a native MongoDB DBObject to an object of type T.
- * 
- * @param <T>
- *          the type of the object to convert from a DBObject
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author Oliver Gierke
- */
-public interface MongoReader<T> {
-
-	/**
-	 * Ready from the native MongoDB DBObject representation to an instance of the class T. The given type has to be the
-	 * starting point for marshalling the {@link DBObject} into it. So in case there's no real valid data inside
-	 * {@link DBObject} for the given type, just return an empty instance of the given type.
-	 * 
-	 * @param clazz
-	 *          the type of the return value
-	 * @param dbo
-	 *          theDBObject
-	 * @return the converted object
-	 */
-	<S extends T> S read(Class<S> clazz, DBObject dbo);
-}

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

@@ -1,11 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import org.springframework.transaction.support.ResourceHolder;
-import org.springframework.transaction.support.ResourceHolderSynchronization;
-
-class MongoSynchronization extends ResourceHolderSynchronization<ResourceHolder, Object> {
-
-	public MongoSynchronization(ResourceHolder resourceHolder, Object resourceKey) {
-		super(resourceHolder, resourceKey);
-	}
-}

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

@@ -1,40 +0,0 @@
-/*
- * 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.document.mongodb;
-
-import com.mongodb.DBObject;
-
-/**
- * A MongoWriter is responsible for converting an object of type T to the native MongoDB representation DBObject.
- * 
- * @param <T>
- *          the type of the object to convert to a DBObject
- * @author Mark Pollack
- * @author Thomas Risberg
- */
-public interface MongoWriter<T> {
-
-	/**
-	 * Write the given object of type T to the native MongoDB object representation DBObject.
-	 * 
-	 * @param t
-	 *          The object to convert to a DBObject
-	 * @param dbo
-	 *          The DBObject to use for writing.
-	 */
-	void write(T t, DBObject dbo);
-
-}

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

@@ -1,60 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.util.Assert;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-
-public class SimpleMongoDbFactory implements MongoDbFactory {
-
-  /**
-   * Logger, available to subclasses.
-   */
-  protected final Log logger = LogFactory.getLog(getClass());
-
-  private Mongo mongo;
-  private String databaseName;
-  private String username;
-  private String password;
-
-  /**
-   * Create an instance of SimpleMongoDbFactory given the Mongo instance and database name
-   * @param mongo Mongo instance, not null
-   * @param databaseName Database name, not null
-   */
-  public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-    Assert.notNull(mongo, "Mongo must not be null");
-    Assert.hasText(databaseName, "Database name must not be empty");
-    this.mongo = mongo;
-    this.databaseName = databaseName;
-  }
-  
-  /**
-   * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
-   * @param mongo Mongo instance, not null
-   * @param databaseName Database name, not null
-   * @param userCredentials username and password
-   */
-  public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials userCredentials) {
-    this(mongo, databaseName);
-    this.username = userCredentials.getUsername();
-    this.password = userCredentials.getPassword();
-  }
-
-  public DB getDb() throws DataAccessException {
-    Assert.notNull(mongo, "Mongo must not be null");
-    Assert.hasText(databaseName, "Database name must not be empty");
-    return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
-  }
-  
-  public DB getDb(String dbName) throws DataAccessException {
-    Assert.notNull(mongo, "Mongo must not be null");
-    Assert.hasText(dbName, "Database name must not be empty");
-    return MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
-  }
-
-}

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

@@ -1,5 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-public enum WriteResultChecking {
-	NONE, LOG, EXCEPTION
-}

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

@@ -1,109 +0,0 @@
-/*
- * 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.document.mongodb.config;
-
-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.type.filter.AnnotationTypeFilter;
-import org.springframework.data.annotation.Persistent;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.mapping.Document;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-@Configuration
-public abstract class AbstractMongoConfiguration {
-
-	public abstract String getDatabaseName();
-
-	@Bean
-	public abstract Mongo mongo() throws Exception;
-
-	@Bean
-	public MongoTemplate mongoTemplate() throws Exception {
-	  return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
-	}
-
-	@Bean
-	public MongoDbFactory mongoDbFactory() throws Exception {	 
-	  if (getUserCredentials() == null) {
-	    return new SimpleMongoDbFactory(mongo(), getDatabaseName());
-	  } else {
-	    return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
-	  }
-	}
-
-	public String getMappingBasePackage() {
-		return "";
-	}
-	
-	public UserCredentials getUserCredentials() {
-	  return null;
-	}
-
-	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		String basePackage = getMappingBasePackage();
-		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()));
-			}
-			mappingContext.setInitialEntitySet(initialEntitySet);
-		}
-		return mappingContext;
-	}
-
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
-		afterMappingMongoConverterCreation(converter);
-		return converter;
-	}
-
-	/**
-	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
-	 *
-	 * @param converter
-	 */
-	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
-	}
-
-	@Bean
-	public MappingContextAwareBeanPostProcessor mappingContextAwareBeanPostProcessor() {
-		MappingContextAwareBeanPostProcessor bpp = new MappingContextAwareBeanPostProcessor();
-		bpp.setMappingContextBeanName("mongoMappingContext");
-		return bpp;
-	}
-
-}

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

@@ -1,30 +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.config;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public abstract class BeanNames {
-
-	static final String MAPPING_CONTEXT = "mappingContext";
-	static final String INDEX_HELPER = "indexCreationHelper";
-	static final String MONGO = "mongo";
-	static final String DB_FACTORY = "mongoDbFactory";
-	static final String POST_PROCESSOR = "mappingContextAwareBeanPostProcessor";
-
-}

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

@@ -1,169 +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.config;
-
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
-
-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.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.support.ManagedSet;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.data.annotation.Persistent;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.mapping.Document;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke
- */
-public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
-
-	private static final String BASE_PACKAGE = "base-package";
-
-	@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";
-	}
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionRegistry registry = parserContext.getRegistry();
-
-		String ctxRef = element.getAttribute("mapping-context-ref");
-		if (!StringUtils.hasText(ctxRef)) {
-			BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MongoMappingContext.class);
-
-			Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
-			if (classesToAdd != null) {
-				mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
-			}
-
-			registry.registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
-			ctxRef = MAPPING_CONTEXT;
-		}
-
-		try {
-			registry.getBeanDefinition(POST_PROCESSOR);
-		} catch (NoSuchBeanDefinitionException ignored) {
-			BeanDefinitionBuilder postProcBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MappingContextAwareBeanPostProcessor.class);
-			postProcBuilder.addPropertyValue("mappingContextBeanName", ctxRef);
-			registry.registerBeanDefinition(POST_PROCESSOR, postProcBuilder.getBeanDefinition());
-		}
-
-		// Need a reference to a Mongo instance
-		String dbFactoryRef = element.getAttribute("db-factory-ref");
-		if (!StringUtils.hasText(dbFactoryRef)) {
-			dbFactoryRef = DB_FACTORY;
-		}
-		
-		
-		BeanDefinitionBuilder converterBuilder = BeanDefinitionBuilder.genericBeanDefinition(MappingMongoConverter.class);
-		converterBuilder.addConstructorArgReference(dbFactoryRef);
-		converterBuilder.addConstructorArgReference(ctxRef);
-
-
-		try {
-			registry.getBeanDefinition(INDEX_HELPER);
-		} catch (NoSuchBeanDefinitionException ignored) {
-			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY;
-			}
-			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
-			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
-		}
-
-		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> listenerElements = DomUtils.getChildElementsByTagName(customerConvertersElement, "converter");
-			if (listenerElements != null) {
-				for (Element listenerElement : listenerElements) {
-					converterBeans.add(parseConverter(listenerElement, parserContext));
-				}
-			}
-			converterBuilder.addPropertyValue("customConverters", converterBeans);
-		}
-
-		return converterBuilder.getBeanDefinition();
-	}
-
-	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
-
-		String basePackage = element.getAttribute(BASE_PACKAGE);
-
-		if (!StringUtils.hasText(basePackage)) {
-			return null;
-		}
-
-		ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
-				false);
-		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
-
-		Set<String> classes = new ManagedSet<String>();
-		for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-			classes.add(candidate.getBeanClassName());
-		}
-
-		return classes;
-	}
-
-	public BeanMetadataElement parseConverter(Element element, ParserContext parserContext) {
-
-		String converterRef = element.getAttribute("ref");
-		if (StringUtils.hasText(converterRef)) {
-			return new RuntimeBeanReference(converterRef);
-		}
-		Element beanElement = DomUtils.getChildElementByTagName(element, "bean");
-		if (beanElement != null) {
-			BeanDefinitionHolder beanDef = parserContext.getDelegate().parseBeanDefinitionElement(beanElement);
-			beanDef = parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDef);
-			return beanDef;
-		}
-
-		parserContext.getReaderContext().error(
-				"Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
-		return null;
-	}
-}

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

@@ -1,101 +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.config;
-
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
-
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-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.ParserContext;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
-
-	@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;
-	}
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-    BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
-          
-    // UserCredentials
-    BeanDefinitionBuilder userCredentialsBuilder = BeanDefinitionBuilder.genericBeanDefinition(UserCredentials.class);   
-    String username = element.getAttribute("username");
-    if (StringUtils.hasText(username)) {
-      userCredentialsBuilder.addConstructorArgValue(username);
-    } else {
-      userCredentialsBuilder.addConstructorArgValue(null);
-    }
-    String password = element.getAttribute("password");
-    if (StringUtils.hasText(password)) {
-      userCredentialsBuilder.addConstructorArgValue(password);
-    } else {
-      userCredentialsBuilder.addConstructorArgValue(null);
-    }
-    
-    // host and port    
-    String host = element.getAttribute("host");
-    if (!StringUtils.hasText(host)) {
-      host = "localhost";
-    }
-    String port = element.getAttribute("port");
-    if (!StringUtils.hasText(port)) {
-      port = "27017";
-    }
-    
-    // Database name
-    String dbname = element.getAttribute("dbname");
-    if (!StringUtils.hasText(dbname)) {
-      dbname = "db";
-    }
-    
-    // com.mongodb.Mongo object
-    String mongoRef = element.getAttribute("mongo-ref");
-    
-    if (!StringUtils.hasText(mongoRef)) {
-      //Create implicit com.mongodb.Mongo object and register under generated name
-      BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
-      mongoBuilder.addPropertyValue("host", host);
-      mongoBuilder.addPropertyValue("port", port);
-      mongoRef = BeanDefinitionReaderUtils.registerWithGeneratedName(mongoBuilder.getBeanDefinition(), parserContext.getRegistry());      
-    }
-    dbFactoryBuilder.addConstructorArgValue(new RuntimeBeanReference(mongoRef));
-    dbFactoryBuilder.addConstructorArgValue(dbname);
-    dbFactoryBuilder.addConstructorArgValue(userCredentialsBuilder.getBeanDefinition());
-    
-    return dbFactoryBuilder.getRawBeanDefinition();
-
-  }
-   
-}

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

@@ -1,71 +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.mongodb.config;
-
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.MongoOptionsFactoryBean;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-import com.mongodb.ServerAddress;
-
-/**
- * Parser for <mongo;gt; definitions. If no name
- *
- * @author Mark Pollack
- */
-public class MongoParser extends AbstractSingleBeanDefinitionParser {
-
-	protected Class<?> getBeanClass(Element element) {
-		return MongoFactoryBean.class;
-	}
-
-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		super.doParse(element, builder);
-
-		ParsingUtils.setPropertyValue(element, builder, "port", "port");
-		ParsingUtils.setPropertyValue(element, builder, "host", "host");
-
-		ParsingUtils.parseMongoOptions(parserContext, element, builder);
-		ParsingUtils.parseReplicaSet(parserContext, element, 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/document/mongodb/config/MongoRepositoryConfigParser.java

@@ -1,53 +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.mongodb.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.data.document.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());
-	}
-}

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

@@ -1,97 +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.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.document.mongodb.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 (int i = 0; i < replicaSetStringArray.length; i++) {
-        String[] hostAndPort = StringUtils.delimitedListToStringArray(replicaSetStringArray[i], ":");
-        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);
-    }
-  }
-}

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

@@ -1,158 +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.mongodb.config;
-
-import org.springframework.data.document.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 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.document.mongodb.MongoTemplate} to be referenced.
-	 * 
-	 * @return
-	 */
-	public String getMongoTemplateRef() {
-
-		String templateRef = getSource().getAttribute(MONGO_TEMPLATE_REF);
-		return StringUtils.hasText(templateRef) ? templateRef : DEFAULT_MONGO_TEMPLATE_REF;
-	}
-
-	/*
-	* (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#
-	* 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();
-	}
-
-	/**
-	 * 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.document.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getAttribute(MONGO_TEMPLATE_REF);
-		}
-	}
-
-	/**
-	 * 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.document.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getParent().getMongoTemplateRef();
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/AbstractMongoConverter.java

@@ -1,258 +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.convert;
-
-import static org.springframework.data.mapping.MappingBeanHelper.isSimpleType;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.bson.types.ObjectId;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.converter.ConverterFactory;
-import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
-import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.convert.ObjectIdConverters.BigIntegerToObjectIdConverter;
-import org.springframework.data.document.mongodb.convert.ObjectIdConverters.ObjectIdToBigIntegerConverter;
-import org.springframework.data.document.mongodb.convert.ObjectIdConverters.ObjectIdToStringConverter;
-import org.springframework.data.document.mongodb.convert.ObjectIdConverters.StringToObjectIdConverter;
-import org.springframework.data.mapping.MappingBeanHelper;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public abstract class AbstractMongoConverter implements MongoConverter, InitializingBean {
-
-	@SuppressWarnings({ "unchecked" })
-	private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, String.class,
-			DBObject.class);
-
-	protected final GenericConversionService conversionService;
-	private final Set<ConvertiblePair> customTypeMapping = new HashSet<ConvertiblePair>();
-
-	public AbstractMongoConverter(GenericConversionService conversionService) {
-		this.conversionService = conversionService == null ? ConversionServiceFactory.createDefaultConversionService()
-				: conversionService;
-		this.conversionService.removeConvertible(Object.class, String.class);
-		registerConverter(CustomToStringConverter.INSTANCE);
-	}
-
-	/**
-	 * Add custom {@link Converter} or {@link ConverterFactory} instances to be used that will take presidence over
-	 * metadata driven conversion between of objects to/from DBObject
-	 * 
-	 * @param converters
-	 */
-	public void setCustomConverters(Set<?> converters) {
-		if (null != converters) {
-			for (Object c : converters) {
-				registerConverter(c);
-			}
-		}
-	}
-
-	/**
-	 * Registers converters for {@link ObjectId} handling, removes plain {@link #toString()} converter and promotes the
-	 * configured {@link ConversionService} to {@link MappingBeanHelper}.
-	 */
-	private void initializeConverters() {
-
-		if (!conversionService.canConvert(ObjectId.class, String.class)) {
-			conversionService.addConverter(ObjectIdToStringConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(String.class, ObjectId.class)) {
-			conversionService.addConverter(StringToObjectIdConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(ObjectId.class, BigInteger.class)) {
-			conversionService.addConverter(ObjectIdToBigIntegerConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(BigInteger.class, ObjectId.class)) {
-			conversionService.addConverter(BigIntegerToObjectIdConverter.INSTANCE);
-		}
-	}
-
-	/**
-	 * Inspects the given {@link Converter} for the types it can convert and registers the pair for custom type conversion
-	 * in case the target type is a Mongo basic type.
-	 * 
-	 * @param converter
-	 */
-	private void registerConverter(Object converter) {
-		
-		if (converter instanceof GenericConverter) {
-			customTypeMapping.addAll(((GenericConverter) converter).getConvertibleTypes());
-		} else {
-			Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(converter.getClass(), Converter.class);
-			if (MONGO_TYPES.contains(arguments[1]) || MONGO_TYPES.contains(arguments[0])) {
-				customTypeMapping.add(new ConvertiblePair(arguments[0], arguments[1]));
-			}
-		}
-		
-		boolean added = false;
-		
-		if (converter instanceof Converter) {
-			this.conversionService.addConverter((Converter<?, ?>) converter);
-			added = true;
-		}
-		
-		if (converter instanceof ConverterFactory) {
-			this.conversionService.addConverterFactory((ConverterFactory<?, ?>) converter);
-			added = true;
-		}
-		
-		if (converter instanceof GenericConverter) {
-			this.conversionService.addConverter((GenericConverter) converter);
-			added = true;
-		}
-		
-		if (!added) {
-			throw new IllegalArgumentException("Given set contains element that is neither Converter nor ConverterFactory!");
-		}
-	}
-
-	protected Class<?> getCustomTarget(Class<?> source, Class<?> expectedTargetType) {
-		for (ConvertiblePair typePair : customTypeMapping) {
-			if (typePair.getSourceType().isAssignableFrom(source)) {
-
-				Class<?> targetType = typePair.getTargetType();
-
-				if (targetType.equals(expectedTargetType) || expectedTargetType == null) {
-					return targetType;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.convert.MongoConverter#getConversionService()
-	 */
-	public ConversionService getConversionService() {
-		return conversionService;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
-	public void afterPropertiesSet() {
-		initializeConverters();
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object maybeConvertObject(Object obj) {
-		if (obj instanceof Enum<?>) {
-			return ((Enum<?>) obj).name();
-		}
-
-		if (null != obj && isSimpleType(obj.getClass())) {
-			// Doesn't need conversion
-			return obj;
-		}
-
-		if (obj instanceof BasicDBList) {
-			return maybeConvertList((BasicDBList) obj);
-		}
-
-		if (obj instanceof DBObject) {
-			DBObject newValueDbo = new BasicDBObject();
-			for (String vk : ((DBObject) obj).keySet()) {
-				Object o = ((DBObject) obj).get(vk);
-				newValueDbo.put(vk, maybeConvertObject(o));
-			}
-			return newValueDbo;
-		}
-
-		if (obj instanceof Map) {
-			Map<Object, Object> m = new HashMap<Object, Object>();
-			for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) obj).entrySet()) {
-				m.put(entry.getKey(), maybeConvertObject(entry.getValue()));
-			}
-			return m;
-		}
-
-		if (obj instanceof List) {
-			List<?> l = (List<?>) obj;
-			List<Object> newList = new ArrayList<Object>();
-			for (Object o : l) {
-				newList.add(maybeConvertObject(o));
-			}
-			return newList;
-		}
-
-		if (obj.getClass().isArray()) {
-			return maybeConvertArray((Object[]) obj);
-		}
-
-		DBObject newDbo = new BasicDBObject();
-		this.write(obj, newDbo);
-		return newDbo;
-	}
-
-	public Object[] maybeConvertArray(Object[] src) {
-		Object[] newArr = new Object[src.length];
-		for (int i = 0; i < src.length; i++) {
-			newArr[i] = maybeConvertObject(src[i]);
-		}
-		return newArr;
-	}
-
-	public BasicDBList maybeConvertList(BasicDBList dbl) {
-		BasicDBList newDbl = new BasicDBList();
-		Iterator<?> iter = dbl.iterator();
-		while (iter.hasNext()) {
-			Object o = iter.next();
-			newDbl.add(maybeConvertObject(o));
-		}
-		return newDbl;
-	}
-
-	
-	private enum CustomToStringConverter implements GenericConverter  {
-		INSTANCE;
-
-		public Set<ConvertiblePair> getConvertibleTypes() {
-			ConvertiblePair localeToString = new ConvertiblePair(Locale.class, String.class);
-			ConvertiblePair booleanToString = new ConvertiblePair(Character.class, String.class);
-			return new HashSet<ConvertiblePair>(Arrays.asList(localeToString, booleanToString));
-		}
-
-		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
-			return source.toString();
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java

@@ -1,780 +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.convert;
-
-import static org.springframework.data.mapping.MappingBeanHelper.*;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.convert.ConversionException;
-import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
-import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.BeanWrapper;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mapping.model.PreferredConstructor;
-import org.springframework.data.mapping.model.SpELAwareParameterValueProvider;
-import org.springframework.data.util.ClassTypeInformation;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.Expression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link MongoConverter} that uses a {@link MappingContext} to do sophisticated mapping of domain objects to
- * {@link DBObject}.
- *
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke
- */
-public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
-
-	public static final String CUSTOM_TYPE_KEY = "_class";
-
-	private static final List<Class<?>> VALID_ID_TYPES = Arrays.asList(new Class<?>[]{ObjectId.class, String.class,
-			BigInteger.class, byte[].class});
-	protected static final Log log = LogFactory.getLog(MappingMongoConverter.class);
-
-	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
-	protected ApplicationContext applicationContext;
-	protected boolean useFieldAccessOnly = true;
-	protected MongoDbFactory mongoDbFactory;
-
-	/**
-	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
-	 *
-	 * @param mongoDbFactory
-	 * @param mappingContext
-	 */
-	public MappingMongoConverter(MongoDbFactory mongoDbFactory, MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-		super(ConversionServiceFactory.createDefaultConversionService());
-		Assert.notNull(mappingContext);
-		Assert.notNull(mongoDbFactory);
-		this.mongoDbFactory = mongoDbFactory;
-		this.mappingContext = mappingContext;
-	}
-
-	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
-		return mappingContext;
-	}
-
-	public void setMongoDbFactory(MongoDbFactory mongoDbFactory) {
-		this.mongoDbFactory = mongoDbFactory;
-	}
-
-	public boolean isUseFieldAccessOnly() {
-		return useFieldAccessOnly;
-	}
-
-	public void setUseFieldAccessOnly(boolean useFieldAccessOnly) {
-		this.useFieldAccessOnly = useFieldAccessOnly;
-	}
-
-	public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
-		return conversionService.convert(id, targetType);
-	}
-
-	public ObjectId convertObjectId(Object id) {
-		return conversionService.convert(id, ObjectId.class);
-	}
-
-	public <S extends Object> S read(Class<S> clazz, final DBObject dbo) {
-		return read(ClassTypeInformation.from(clazz), dbo);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo) {
-
-		if (null == dbo) {
-			return null;
-		}
-
-		TypeInformation<? extends S> typeToUse = getMoreConcreteTargetType(dbo, type);
-		Class<? extends S> rawType = typeToUse.getType();
-		Class<?> customTarget = getCustomTarget(rawType, DBObject.class);
-
-		if (customTarget != null) {
-			return conversionService.convert(dbo, rawType);
-		}
-
-		if (typeToUse.isCollectionLike() && dbo instanceof BasicDBList) {
-			List<Object> l = new ArrayList<Object>();
-			BasicDBList dbList = (BasicDBList) dbo;
-			for (Object o : dbList) {
-				if (o instanceof DBObject) {
-
-					Object newObj = read(typeToUse.getComponentType(), (DBObject) o);
-					Class<?> rawComponentType = typeToUse.getComponentType().getType();
-
-					if (newObj.getClass().isAssignableFrom(rawComponentType)) {
-						l.add(newObj);
-					} else {
-						l.add(conversionService.convert(newObj, rawComponentType));
-					}
-				} else {
-					l.add(o);
-				}
-			}
-			return conversionService.convert(l, rawType);
-		}
-
-		// Retrieve persistent entity info
-		MongoPersistentEntity<S> persistentEntity = (MongoPersistentEntity<S>) mappingContext
-				.getPersistentEntity(typeToUse);
-		if (persistentEntity == null) {
-			throw new MappingException("No mapping metadata found for " + rawType.getName());
-		}
-
-		return read(persistentEntity, dbo);
-	}
-
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo) {
-
-		final StandardEvaluationContext spelCtx = new StandardEvaluationContext();
-		if (null != applicationContext) {
-			spelCtx.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		}
-		if (!(dbo instanceof BasicDBList)) {
-			String[] keySet = dbo.keySet().toArray(new String[]{});
-			for (String key : keySet) {
-				spelCtx.setVariable(key, dbo.get(key));
-			}
-		}
-
-		final List<String> ctorParamNames = new ArrayList<String>();
-		final MongoPersistentProperty idProperty = entity.getIdProperty();
-
-		ParameterValueProvider provider = new SpELAwareParameterValueProvider(spelExpressionParser, spelCtx) {
-			@Override
-			@SuppressWarnings("unchecked")
-			public <T> T getParameterValue(PreferredConstructor.Parameter<T> parameter) {
-
-				if (parameter.getKey() != null) {
-					return super.getParameterValue(parameter);
-				}
-
-				String name = parameter.getName();
-				TypeInformation<T> type = parameter.getType();
-				Class<T> rawType = parameter.getRawType();
-				String key = idProperty == null ? name : idProperty.getName().equals(name) ? idProperty.getFieldName() : name;
-				Object obj = dbo.get(key);
-
-				ctorParamNames.add(name);
-				if (obj instanceof DBRef) {
-					return read(type, ((DBRef) obj).fetch());
-				} else if (obj instanceof BasicDBList) {
-					BasicDBList objAsDbList = (BasicDBList) obj;
-					List<?> l = unwrapList(objAsDbList, type);
-					return conversionService.convert(l, rawType);
-				} else if (obj instanceof DBObject) {
-					return read(type, ((DBObject) obj));
-				} else if (null != obj && obj.getClass().isAssignableFrom(rawType)) {
-					return (T) obj;
-				} else if (null != obj) {
-					return conversionService.convert(obj, rawType);
-				}
-
-				return null;
-			}
-		};
-
-		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(entity, provider, conversionService);
-
-		// Set properties not already set in the constructor
-		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-			public void doWithPersistentProperty(MongoPersistentProperty prop) {
-
-				boolean isConstructorProperty = ctorParamNames.contains(prop.getName());
-				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());
-
-				if (!hasValueForProperty || isConstructorProperty) {
-					return;
-				}
-
-				Object obj = getValueInternal(prop, dbo, spelCtx, prop.getSpelExpression());
-				try {
-					wrapper.setProperty(prop, obj, useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-			}
-		});
-
-		// Handle associations
-		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
-			public void doWithAssociation(Association<MongoPersistentProperty> association) {
-				MongoPersistentProperty inverseProp = association.getInverse();
-				Object obj = getValueInternal(inverseProp, dbo, spelCtx, inverseProp.getSpelExpression());
-				try {
-					wrapper.setProperty(inverseProp, obj);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-			}
-		});
-
-		return wrapper.getBean();
-	}
-
-	/**
-	 * Root entry method into write conversion. Adds a type discriminator to the {@link DBObject}. Shouldn't be called for
-	 * nested conversions.
-	 *
-	 * @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
-	 */
-	public void write(final Object obj, final DBObject dbo) {
-
-		if (null == obj) {
-			return;
-		}
-
-		boolean handledByCustomConverter = getCustomTarget(obj.getClass(), DBObject.class) != null;
-
-		if (!handledByCustomConverter) {
-			dbo.put(CUSTOM_TYPE_KEY, obj.getClass().getName());
-		}
-
-		writeInternal(obj, dbo);
-	}
-
-	/**
-	 * Internal write conversion method which should be used for nested invocations.
-	 *
-	 * @param obj
-	 * @param dbo
-	 */
-	@SuppressWarnings("unchecked")
-	protected void writeInternal(final Object obj, final DBObject dbo) {
-
-		if (null == obj) {
-			return;
-		}
-
-		Class<?> customTarget = getCustomTarget(obj.getClass(), DBObject.class);
-
-		if (customTarget != null) {
-			DBObject result = conversionService.convert(obj, DBObject.class);
-			dbo.putAll(result);
-			return;
-		}
-
-		if (Map.class.isAssignableFrom(obj.getClass())) {
-			writeMapInternal((Map<Object, Object>) obj, dbo, null);
-			return;
-		}
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(obj.getClass());
-		writeInternal(obj, dbo, entity);
-	}
-
-	protected void writeInternal(Object obj, final DBObject dbo, MongoPersistentEntity<?> entity) {
-
-		if (obj == null) {
-			return;
-		}
-
-		if (null == entity) {
-			throw new MappingException("No mapping metadata found for entity of type " + obj.getClass().getName());
-		}
-
-		final BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(obj, conversionService);
-
-		// Write the ID
-		final MongoPersistentProperty idProperty = entity.getIdProperty();
-		if (!dbo.containsField("_id") && null != idProperty) {
-			Object idObj = null;
-			Class<?>[] targetClasses = new Class<?>[]{ObjectId.class, Object.class};
-			for (Class<?> targetClasse : targetClasses) {
-				try {
-					idObj = wrapper.getProperty(idProperty, targetClasse, useFieldAccessOnly);
-					if (null != idObj) {
-						break;
-					}
-				} catch (ConversionException ignored) {
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-			}
-
-			if (null != idObj) {
-				dbo.put("_id", idObj);
-			} else {
-				if (!VALID_ID_TYPES.contains(idProperty.getType())) {
-					throw new MappingException("Invalid data type " + idProperty.getType().getName()
-							+ " for Id property. Should be one of " + VALID_ID_TYPES);
-				}
-			}
-		}
-
-		// Write the properties
-		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-			public void doWithPersistentProperty(MongoPersistentProperty prop) {
-				if (prop.equals(idProperty)) {
-					return;
-				}
-				Object propertyObj;
-				try {
-					propertyObj = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-				if (null != propertyObj) {
-					if (!isSimpleType(propertyObj.getClass())) {
-						writePropertyInternal(prop, propertyObj, dbo);
-					} else {
-						writeSimpleInternal(prop.getFieldName(), propertyObj, dbo);
-					}
-				}
-			}
-		});
-
-		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
-			public void doWithAssociation(Association<MongoPersistentProperty> association) {
-				MongoPersistentProperty inverseProp = association.getInverse();
-				Class<?> type = inverseProp.getType();
-				Object propertyObj;
-				try {
-					propertyObj = wrapper.getProperty(inverseProp, type, useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-				if (null != propertyObj) {
-					writePropertyInternal(inverseProp, propertyObj, dbo);
-				}
-			}
-		});
-	}
-
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-	}
-
-	@SuppressWarnings({"unchecked"})
-	protected void writePropertyInternal(MongoPersistentProperty prop, Object obj, DBObject dbo) {
-
-		if (obj == null) {
-			return;
-		}
-
-		String name = prop.getFieldName();
-
-		if (prop.isCollection()) {
-			DBObject collectionInternal = writeCollectionInternal(prop, obj);
-			dbo.put(name, collectionInternal);
-			return;
-		}
-
-		if (prop.isMap()) {
-			BasicDBObject mapDbObj = new BasicDBObject();
-			writeMapInternal((Map<Object, Object>) obj, mapDbObj, prop.getTypeInformation());
-			dbo.put(name, mapDbObj);
-			return;
-		}
-
-		if (prop.isDbReference()) {
-			DBRef dbRefObj = createDBRef(obj, prop.getDBRef());
-			if (null != dbRefObj) {
-				dbo.put(name, dbRefObj);
-				return;
-			}
-		}
-
-		// Lookup potential custom target type
-		Class<?> basicTargetType = getCustomTarget(obj.getClass(), null);
-
-		if (basicTargetType != null) {
-			dbo.put(name, conversionService.convert(obj, basicTargetType));
-			return;
-		}
-
-		BasicDBObject propDbObj = new BasicDBObject();
-		addCustomTypeKeyIfNecessary(prop.getTypeInformation(), obj, propDbObj);
-		writeInternal(obj, propDbObj, mappingContext.getPersistentEntity(prop.getTypeInformation()));
-		dbo.put(name, propDbObj);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected DBObject writeCollectionInternal(MongoPersistentProperty property, Object obj) {
-
-		BasicDBList dbList = new BasicDBList();
-		Class<?> type = property.getType();
-		Collection<Object> coll = type.isArray() ? CollectionUtils.arrayToList(obj) : (Collection<Object>) obj;
-		TypeInformation<?> componentType = property.getTypeInformation().getComponentType();
-
-		for (Object element : coll) {
-
-			if (element == null) {
-				continue;
-			}
-
-			TypeInformation<?> valueType = ClassTypeInformation.from(element.getClass());
-
-			if (property.isDbReference()) {
-				DBRef dbRef = createDBRef(element, property.getDBRef());
-				dbList.add(dbRef);
-			} else if (type.isArray() && isSimpleType(property.getComponentType())) {
-				dbList.add(element);
-			} else if (element instanceof List) {
-				List<?> propObjColl = (List<?>) element;
-				while (valueType.isCollectionLike()) {
-					valueType = valueType.getComponentType();
-				}
-				if (isSimpleType(valueType.getType())) {
-					dbList.add(propObjColl);
-				} else {
-					BasicDBList propNestedDbList = new BasicDBList();
-					for (Object propNestedObjItem : propObjColl) {
-						BasicDBObject propDbObj = new BasicDBObject();
-						writeInternal(propNestedObjItem, propDbObj);
-						propNestedDbList.add(propDbObj);
-					}
-					dbList.add(propNestedDbList);
-				}
-			} else if (isSimpleType(element.getClass())) {
-				dbList.add(element);
-			} else {
-				BasicDBObject propDbObj = new BasicDBObject();
-				writeInternal(element, propDbObj, mappingContext.getPersistentEntity(valueType));
-				addCustomTypeKeyIfNecessary(componentType, element, propDbObj);
-				dbList.add(propDbObj);
-			}
-		}
-
-		return dbList;
-	}
-
-	protected void writeMapInternal(Map<Object, Object> obj, DBObject dbo, TypeInformation<?> propertyType) {
-		for (Map.Entry<Object, Object> entry : obj.entrySet()) {
-			Object key = entry.getKey();
-			Object val = entry.getValue();
-			if (isSimpleType(key.getClass())) {
-				// Don't use conversion service here as removal of ObjectToString converter results in some primitive types not
-				// being convertable
-				String simpleKey = key.toString();
-				if (isSimpleType(val.getClass())) {
-					writeSimpleInternal(simpleKey, val, dbo);
-				} else {
-					DBObject newDbo = new BasicDBObject();
-					writeInternal(val, newDbo);
-					addCustomTypeKeyIfNecessary(propertyType, val, newDbo);
-					dbo.put(simpleKey, newDbo);
-				}
-			} else {
-				throw new MappingException("Cannot use a complex object as a key value.");
-			}
-		}
-	}
-
-	/**
-	 * Adds custom type information to the given {@link DBObject} if necessary. That is if the value is not the same as
-	 * the one given. This is usually the case if you store a subtype of the actual declared type of the property.
-	 *
-	 * @param type
-	 * @param value
-	 * @param dbObject
-	 */
-	public void addCustomTypeKeyIfNecessary(TypeInformation<?> type, Object value, DBObject dbObject) {
-
-		if (type == null) {
-			return;
-		}
-
-		Class<?> reference = getValueType(type).getType();
-
-		boolean notTheSameClass = !value.getClass().equals(reference);
-		if (notTheSameClass) {
-			dbObject.put(CUSTOM_TYPE_KEY, value.getClass().getName());
-		}
-	}
-
-	/**
-	 * Returns the type type information of the actual value to be stored. That is, for maps it will return the map value
-	 * type, for collections it will return the component type as well as the given type if it is a non-collection or
-	 * non-map one.
-	 *
-	 * @param type
-	 * @return
-	 */
-	public TypeInformation<?> getValueType(TypeInformation<?> type) {
-		if (type.isMap()) {
-			return type.getMapValueType();
-		} else if (type.isCollectionLike()) {
-			return type.getComponentType();
-		} else {
-			return type;
-		}
-	}
-
-	/**
-	 * Writes the given simple value to the given {@link DBObject}. Will store enum names for enum values.
-	 *
-	 * @param key
-	 * @param value
-	 * @param dbObject
-	 */
-	private void writeSimpleInternal(String key, Object value, DBObject dbObject) {
-
-		Class<?> customTarget = getCustomTarget(value.getClass(), null);
-
-		Object valueToSet = null;
-		if (customTarget != null) {
-			valueToSet = conversionService.convert(value, customTarget);
-		} else {
-			valueToSet = value.getClass().isEnum() ? ((Enum<?>) value).name() : value;
-		}
-		dbObject.put(key, valueToSet);
-	}
-
-	protected DBRef createDBRef(Object target, org.springframework.data.document.mongodb.mapping.DBRef dbref) {
-		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
-		if (null == targetEntity || null == targetEntity.getIdProperty()) {
-			return null;
-		}
-
-		MongoPersistentProperty idProperty = targetEntity.getIdProperty();
-		ObjectId id = null;
-		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
-		try {
-			id = wrapper.getProperty(idProperty, ObjectId.class, useFieldAccessOnly);
-			if (null == id) {
-				throw new MappingException("Cannot create a reference to an object with a NULL id.");
-			}
-		} catch (IllegalAccessException e) {
-			throw new MappingException(e.getMessage(), e);
-		} catch (InvocationTargetException e) {
-			throw new MappingException(e.getMessage(), e);
-		}
-
-		String collection = dbref.collection();
-		if ("".equals(collection)) {
-			collection = targetEntity.getCollection();
-		}
-
-		String dbname = dbref.db();
-		DB db = StringUtils.hasText(dbname) ? mongoDbFactory.getDb(dbname) : mongoDbFactory.getDb();
-		return new DBRef(db, collection, id);
-	}
-
-
-	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, StandardEvaluationContext ctx, String spelExpr) {
-
-		Object o;
-		if (null != spelExpr) {
-			Expression x = spelExpressionParser.parseExpression(spelExpr);
-			o = x.getValue(ctx);
-		} else {
-
-			Object dbObj = dbo.get(prop.getFieldName());
-
-			if (dbObj == null) {
-				return null;
-			}
-
-			Class<?> propertyType = prop.getType();
-			Class<?> customTarget = getCustomTarget(dbObj.getClass(), propertyType);
-
-			if (customTarget != null) {
-				return conversionService.convert(dbObj, propertyType);
-			}
-
-			if (dbObj instanceof DBRef) {
-				dbObj = ((DBRef) dbObj).fetch();
-			}
-			if (dbObj instanceof DBObject) {
-				if (prop.isMap()) {
-					return readMap(prop.getTypeInformation(), (DBObject) dbObj);
-				} else if (prop.isArray() && dbObj instanceof BasicDBObject && ((DBObject) dbObj).keySet().size() == 0) {
-					// It's empty
-					return Array.newInstance(prop.getComponentType(), 0);
-				} else if (prop.isCollection() && dbObj instanceof BasicDBList) {
-					BasicDBList dbObjList = (BasicDBList) dbObj;
-					List<Object> items = new LinkedList<Object>();
-					for (int i = 0; i < dbObjList.size(); i++) {
-						Object dbObjItem = dbObjList.get(i);
-						if (dbObjItem instanceof DBRef) {
-							items.add(read(prop.getComponentType(), ((DBRef) dbObjItem).fetch()));
-						} else if (dbObjItem instanceof DBObject) {
-							items.add(read(prop.getComponentType(), (DBObject) dbObjItem));
-						} else {
-							items.add(dbObjItem);
-						}
-					}
-					List<Object> itemsToReturn = new LinkedList<Object>();
-					for (Object obj : items) {
-						itemsToReturn.add(obj);
-					}
-					return itemsToReturn;
-				}
-
-				Class<?> toType = findTypeToBeUsed((DBObject) dbObj);
-
-				// It's a complex object, have to read it in
-				if (toType != null) {
-					dbo.removeField(CUSTOM_TYPE_KEY);
-					o = read(toType, (DBObject) dbObj);
-				} else {
-					o = read(mappingContext.getPersistentEntity(prop.getTypeInformation()), (DBObject) dbObj);
-				}
-			} else {
-				o = dbObj;
-			}
-		}
-		return o;
-	}
-
-	/**
-	 * Reads the given {@link DBObject} into a {@link Map}. will recursively resolve nested {@link Map}s as well.
-	 * 
-	 * @param type the {@link Map} {@link TypeInformation} to be used to unmarshall this {@link DBObject}.
-	 * @param dbObject
-	 * 
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	private Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject) {
-		
-		Assert.notNull(type);
-		Assert.isTrue(type.isMap());
-		Assert.notNull(dbObject);
-		
-		Class<?> customMapType = findTypeToBeUsed(dbObject);
-		Class<?> mapType = customMapType == null ? Map.class : customMapType;
-		
-		Map<Object, Object> map = CollectionFactory.createMap(mapType, dbObject.keySet().size());
-		Map<String, Object> sourceMap = dbObject.toMap();
-		
-		for (Entry<String, Object> entry : sourceMap.entrySet()) {
-			if (entry.getKey().equals(CUSTOM_TYPE_KEY)) {
-				continue;
-			}
-
-			Class<?> keyType = type.getComponentType().getType();
-			Object key = conversionService.convert(entry.getKey(), keyType);
-
-			if (null != entry.getValue() && entry.getValue() instanceof DBObject) {
-				
-				DBObject valueSource = (DBObject) entry.getValue();
-				TypeInformation<?> valueType = type.getMapValueType();
-				
-				Object value = valueType.isMap() ? readMap(valueType, valueSource) : read(valueType, valueSource);
-				
-				map.put(key, value);
-			} else {
-				map.put(key, entry.getValue());
-			}
-		}
-		
-		return map;
-	}
-
-	/**
-	 * Returns the type to be used to convert the DBObject given to. Will return {@literal null} if there's not type hint
-	 * found in the {@link DBObject} or the type hint found can't be converted into a {@link Class} as the type might not
-	 * be available.
-	 *
-	 * @param dbObject
-	 * @return the type to be used for converting the given {@link DBObject} into or {@literal null} if there's no type
-	 *         found.
-	 */
-	protected Class<?> findTypeToBeUsed(DBObject dbObject) {
-		Object classToBeUsed = dbObject.get(CUSTOM_TYPE_KEY);
-
-		if (classToBeUsed == null) {
-			return null;
-		}
-
-		try {
-			return Class.forName(classToBeUsed.toString());
-		} catch (ClassNotFoundException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Inspects the a custom class definition stored inside the given {@link DBObject} and returns that in case it's a
-	 * subtype of the given basic one.
-	 *
-	 * @param dbObject
-	 * @param basicType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	private <S> TypeInformation<? extends S> getMoreConcreteTargetType(DBObject dbObject, TypeInformation<S> basicType) {
-		Class<?> documentsTargetType = findTypeToBeUsed(dbObject);
-		Class<S> rawType = basicType.getType();
-		boolean isMoreConcreteCustomType = documentsTargetType != null && rawType.isAssignableFrom(documentsTargetType);
-		return isMoreConcreteCustomType ? (TypeInformation<? extends S>) ClassTypeInformation.from(documentsTargetType)
-				: basicType;
-	}
-
-	protected <T> List<?> unwrapList(BasicDBList dbList, TypeInformation<T> targetType) {
-		List<Object> rootList = new LinkedList<Object>();
-		for (int i = 0; i < dbList.size(); i++) {
-			Object obj = dbList.get(i);
-			if (obj instanceof BasicDBList) {
-				rootList.add(unwrapList((BasicDBList) obj, targetType.getComponentType()));
-			} else if (obj instanceof DBObject) {
-				rootList.add(read(targetType, (DBObject) obj));
-			} else {
-				rootList.add(obj);
-			}
-		}
-		return rootList;
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoBeanWrapper.java

@@ -1,94 +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.mongodb.convert;
-
-import static org.springframework.beans.PropertyAccessorFactory.forBeanPropertyAccess;
-import static org.springframework.beans.PropertyAccessorFactory.forDirectFieldAccess;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.ConfigurablePropertyAccessor;
-import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.util.Assert;
-
-/**
- * Custom Mongo specific {@link BeanWrapper} to allow access to bean properties via {@link MongoPropertyDescriptor}s.
- * 
- * @author Oliver Gierke
- */
-class MongoBeanWrapper {
-
-	private final ConfigurablePropertyAccessor accessor;
-	private final MongoPropertyDescriptors descriptors;
-	private final boolean fieldAccess;
-
-	/**
-	 * Creates a new {@link MongoBeanWrapper} for the given target object and {@link ConversionService}.
-	 * 
-	 * @param target
-	 * @param conversionService
-	 * @param fieldAccess
-	 */
-	public MongoBeanWrapper(Object target, ConversionService conversionService, boolean fieldAccess) {
-
-		Assert.notNull(target);
-		Assert.notNull(conversionService);
-
-		this.fieldAccess = fieldAccess;
-		this.accessor = fieldAccess ? forDirectFieldAccess(target) : forBeanPropertyAccess(target);
-		this.accessor.setConversionService(conversionService);
-		this.descriptors = new MongoPropertyDescriptors(target.getClass());
-	}
-
-	/**
-	 * Returns all {@link MongoPropertyDescriptors.MongoPropertyDescriptor}s for the underlying target object.
-	 * 
-	 * @return
-	 */
-	public MongoPropertyDescriptors getDescriptors() {
-		return this.descriptors;
-	}
-
-	/**
-	 * Returns the value of the underlying object for the given property.
-	 * 
-	 * @param descriptor
-	 * @return
-	 */
-	public Object getValue(MongoPropertyDescriptors.MongoPropertyDescriptor descriptor) {
-		Assert.notNull(descriptor);
-		return accessor.getPropertyValue(descriptor.getName());
-	}
-
-	/**
-	 * Sets the property of the underlying object to the given value.
-	 * 
-	 * @param descriptor
-	 * @param value
-	 */
-	public void setValue(MongoPropertyDescriptors.MongoPropertyDescriptor descriptor, Object value) {
-		Assert.notNull(descriptor);
-		try {
-			accessor.setPropertyValue(descriptor.getName(), value);
-		} catch (NotWritablePropertyException e) {
-			if (!fieldAccess) {
-				throw e;
-			}
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoConverter.java

@@ -1,59 +0,0 @@
-/*
- * 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.document.mongodb.convert;
-
-import com.mongodb.BasicDBList;
-import org.bson.types.ObjectId;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoReader;
-import org.springframework.data.document.mongodb.MongoWriter;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
-import org.springframework.data.mapping.model.MappingContext;
-
-public interface MongoConverter extends MongoWriter<Object>, MongoReader<Object> {
-
-	/**
-	 * Converts the given {@link ObjectId} to the given target type.
-	 * 
-	 * @param <T>
-	 *          the actual type to create
-	 * @param id
-	 *          the source {@link ObjectId}
-	 * @param targetType
-	 *          the target type to convert the {@link ObjectId} to
-	 * @return
-	 */
-	public <T> T convertObjectId(ObjectId id, Class<T> targetType);
-
-	/**
-	 * Returns the {@link ObjectId} instance for the given id.
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public ObjectId convertObjectId(Object id);
-
-	MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext();
-
-	Object maybeConvertObject(Object obj);
-
-	Object[] maybeConvertArray(Object[] src);
-
-	BasicDBList maybeConvertList(BasicDBList dbl);
-	
-	ConversionService getConversionService();
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/ObjectIdConverters.java

@@ -1,88 +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.mongodb.convert;
-
-import java.math.BigInteger;
-
-import org.bson.types.ObjectId;
-import org.springframework.core.convert.converter.Converter;
-
-/**
- * Wrapper class to contain useful {@link ObjectId}-to-something-and-back converters.
- * 
- * @author Oliver Gierke
- */
-abstract class ObjectIdConverters {
-
-	/**
-	 * Private constructor to prevent instantiation.
-	 */
-	private ObjectIdConverters() {
-
-	}
-
-	/**
-	 * Simple singleton to convert {@link ObjectId}s to their {@link String} representation.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public static enum ObjectIdToStringConverter implements Converter<ObjectId, String> {
-		INSTANCE;
-
-		public String convert(ObjectId id) {
-			return id.toString();
-		}
-	}
-
-	/**
-	 * Simple singleton to convert {@link String}s to their {@link ObjectId} representation.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public static enum StringToObjectIdConverter implements Converter<String, ObjectId> {
-		INSTANCE;
-
-		public ObjectId convert(String source) {
-			return new ObjectId(source);
-		}
-	}
-
-	/**
-	 * Simple singleton to convert {@link ObjectId}s to their {@link java.math.BigInteger} representation.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public static enum ObjectIdToBigIntegerConverter implements Converter<ObjectId, BigInteger> {
-		INSTANCE;
-
-		public BigInteger convert(ObjectId source) {
-			return new BigInteger(source.toString(), 16);
-		}
-	}
-
-	/**
-	 * Simple singleton to convert {@link BigInteger}s to their {@link ObjectId} representation.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public static enum BigIntegerToObjectIdConverter implements Converter<BigInteger, ObjectId> {
-		INSTANCE;
-
-		public ObjectId convert(BigInteger source) {
-			return new ObjectId(source.toString(16));
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java

@@ -1,516 +0,0 @@
-/*
- * 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.document.mongodb.convert;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.bson.types.CodeWScope;
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.convert.ConversionFailedException;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
-import org.springframework.data.document.mongodb.mapping.SimpleMongoMappingContext;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.util.Assert;
-import org.springframework.util.comparator.CompoundComparator;
-
-/**
- * Basic {@link MongoConverter} implementation to convert between domain classes and {@link DBObject}s.
- * 
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author Oliver Gierke
- * 
- * @deprecated since Spring 1.0 M3 in favor of {@link org.springframework.data.document.mongodb.convert.MappingMongoConverter}
- * The MappingMongoConverter provides all the functionality of the SimpleMongoConverter and will replace it as the default
- * converter used. The SimpleMongoCOnverter will be removed at some point before the GA release.
- */
-@Deprecated
-public class SimpleMongoConverter extends AbstractMongoConverter implements InitializingBean {
-
-	private static final Log LOG = LogFactory.getLog(SimpleMongoConverter.class);
-	@SuppressWarnings("unchecked")
-	private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, String.class,
-			DBObject.class);
-	private static final Set<String> SIMPLE_TYPES;
-
-	static {
-		Set<String> basics = new HashSet<String>();
-		basics.add(boolean.class.getName());
-		basics.add(long.class.getName());
-		basics.add(short.class.getName());
-		basics.add(int.class.getName());
-		basics.add(byte.class.getName());
-		basics.add(float.class.getName());
-		basics.add(double.class.getName());
-		basics.add(char.class.getName());
-		basics.add(Boolean.class.getName());
-		basics.add(Long.class.getName());
-		basics.add(Short.class.getName());
-		basics.add(Integer.class.getName());
-		basics.add(Byte.class.getName());
-		basics.add(Float.class.getName());
-		basics.add(Double.class.getName());
-		basics.add(Character.class.getName());
-		basics.add(String.class.getName());
-		basics.add(java.util.Date.class.getName());
-		// basics.add(Time.class.getName());
-		// basics.add(Timestamp.class.getName());
-		// basics.add(java.sql.Date.class.getName());
-		// basics.add(BigDecimal.class.getName());
-		// basics.add(BigInteger.class.getName());
-		basics.add(Locale.class.getName());
-		// basics.add(Calendar.class.getName());
-		// basics.add(GregorianCalendar.class.getName());
-		// basics.add(java.util.Currency.class.getName());
-		// basics.add(TimeZone.class.getName());
-		// basics.add(Object.class.getName());
-		basics.add(Class.class.getName());
-		// basics.add(byte[].class.getName());
-		// basics.add(Byte[].class.getName());
-		// basics.add(char[].class.getName());
-		// basics.add(Character[].class.getName());
-		// basics.add(Blob.class.getName());
-		// basics.add(Clob.class.getName());
-		// basics.add(Serializable.class.getName());
-		// basics.add(URI.class.getName());
-		// basics.add(URL.class.getName());
-		basics.add(DBRef.class.getName());
-		basics.add(Pattern.class.getName());
-		basics.add(CodeWScope.class.getName());
-		basics.add(ObjectId.class.getName());
-		basics.add(Enum.class.getName());
-		SIMPLE_TYPES = Collections.unmodifiableSet(basics);
-	}
-
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	/**
-	 * Creates a {@link SimpleMongoConverter}.
-	 */
-	public SimpleMongoConverter() {
-		super(ConversionServiceFactory.createDefaultConversionService());
-		this.mappingContext = new SimpleMongoMappingContext();
-	}
-
-	/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.convert.MongoConverter#getMappingContext()
-		 */
-	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
-		return mappingContext;
-	}
-
-	/*
-			* (non-Javadoc)
-			*
-			* @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
-			*/
-	@SuppressWarnings("rawtypes")
-	public void write(Object obj, DBObject dbo) {
-
-		MongoBeanWrapper beanWrapper = createWrapper(obj, false);
-		for (MongoPropertyDescriptor descriptor : beanWrapper.getDescriptors()) {
-			if (descriptor.isMappable()) {
-				Object value = beanWrapper.getValue(descriptor);
-
-				if (value == null) {
-					continue;
-				}
-
-				String keyToUse = descriptor.getKeyToMap();
-				if (descriptor.isEnum()) {
-					writeValue(dbo, keyToUse, ((Enum) value).name());
-				} else if (descriptor.isIdProperty() && descriptor.isOfIdType()) {
-					if (value instanceof String && ObjectId.isValid((String) value)) {
-						try {
-							writeValue(dbo, keyToUse, conversionService.convert(value, ObjectId.class));
-						} catch (ConversionFailedException iae) {
-							LOG.warn("Unable to convert the String " + value + " to an ObjectId");
-							writeValue(dbo, keyToUse, value);
-						}
-					} else {
-						// we can't convert this id - use as is
-						writeValue(dbo, keyToUse, value);
-					}
-				} else {
-					writeValue(dbo, keyToUse, value);
-				}
-			} else {
-				if (!"class".equals(descriptor.getName())) {
-					LOG.debug("Skipping property " + descriptor.getName() + " as it's not a mappable one.");
-				}
-			}
-		}
-	}
-
-	/**
-	 * Writes the given value to the given {@link DBObject}. Will skip {@literal null} values.
-	 * 
-	 * @param dbo
-	 * @param keyToUse
-	 * @param value
-	 */
-	private void writeValue(DBObject dbo, String keyToUse, Object value) {
-
-		if (!isSimpleType(value.getClass())) {
-			writeCompoundValue(dbo, keyToUse, value);
-		} else {
-			dbo.put(keyToUse, value);
-		}
-	}
-
-	/**
-	 * Writes the given {@link CompoundComparator} value to the given {@link DBObject}.
-	 * 
-	 * @param dbo
-	 * @param keyToUse
-	 * @param value
-	 */
-	@SuppressWarnings("unchecked")
-	private void writeCompoundValue(DBObject dbo, String keyToUse, Object value) {
-		if (value instanceof Map) {
-			writeMap(dbo, keyToUse, (Map<String, Object>) value);
-			return;
-		}
-		if (value instanceof Collection) {
-			// Should write a collection!
-			writeArray(dbo, keyToUse, ((Collection<Object>) value).toArray());
-			return;
-		}
-		if (value instanceof Object[]) {
-			// Should write an array!
-			writeArray(dbo, keyToUse, (Object[]) value);
-			return;
-		}
-
-		Class<?> customTargetType = getCustomTargetType(value);
-		if (customTargetType != null) {
-			dbo.put(keyToUse, conversionService.convert(value, customTargetType));
-			return;
-		}
-
-		DBObject nestedDbo = new BasicDBObject();
-		write(value, nestedDbo);
-		dbo.put(keyToUse, nestedDbo);
-	}
-
-	/**
-	 * Returns whether the {@link ConversionService} has a custom {@link Converter} registered that can convert the given
-	 * object into one of the types supported by MongoDB.
-	 * 
-	 * @param obj
-	 * @return
-	 */
-	private Class<?> getCustomTargetType(Object obj) {
-
-		for (Class<?> mongoType : MONGO_TYPES) {
-			if (conversionService.canConvert(obj.getClass(), mongoType)) {
-				return mongoType;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Writes the given {@link Map} to the given {@link DBObject}.
-	 * 
-	 * @param dbo
-	 * @param mapKey
-	 * @param map
-	 */
-	protected void writeMap(DBObject dbo, String mapKey, Map<String, Object> map) {
-		// TODO support non-string based keys as long as there is a Spring Converter obj->string and (optionally)
-		// string->obj
-		DBObject dboToPopulate = null;
-
-		// TODO - Does that make sense? If we create a new object here it's content will never make it out of this
-		// method
-		if (mapKey != null) {
-			dboToPopulate = new BasicDBObject();
-		} else {
-			dboToPopulate = dbo;
-		}
-		if (map != null) {
-			for (Entry<String, Object> entry : map.entrySet()) {
-
-				Object entryValue = entry.getValue();
-				String entryKey = entry.getKey();
-
-				if (!isSimpleType(entryValue.getClass())) {
-					writeCompoundValue(dboToPopulate, entryKey, entryValue);
-				} else {
-					dboToPopulate.put(entryKey, entryValue);
-				}
-			}
-			dbo.put(mapKey, dboToPopulate);
-		}
-	}
-
-	/**
-	 * Writes the given array to the given {@link DBObject}.
-	 * 
-	 * @param dbo
-	 * @param keyToUse
-	 * @param array
-	 */
-	protected void writeArray(DBObject dbo, String keyToUse, Object[] array) {
-		Object[] dboValues;
-		if (array != null) {
-			dboValues = new Object[array.length];
-			int i = 0;
-			for (Object o : array) {
-				if (!isSimpleType(o.getClass())) {
-					DBObject dboValue = new BasicDBObject();
-					write(o, dboValue);
-					dboValues[i] = dboValue;
-				} else {
-					dboValues[i] = o;
-				}
-				i++;
-			}
-			dbo.put(keyToUse, dboValues);
-		}
-	}
-
-	/*
-			* (non-Javadoc)
-			*
-			* @see org.springframework.data.document.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
-			*/
-	public <S> S read(Class<S> clazz, DBObject source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		Assert.notNull(clazz, "Mapped class was not specified");
-		S target = BeanUtils.instantiateClass(clazz);
-		MongoBeanWrapper bw = new MongoBeanWrapper(target, conversionService, true);
-
-		for (MongoPropertyDescriptor descriptor : bw.getDescriptors()) {
-			String keyToUse = descriptor.getKeyToMap();
-			if (source.containsField(keyToUse)) {
-				if (descriptor.isMappable()) {
-					Object value = source.get(keyToUse);
-					if (!isSimpleType(value.getClass())) {
-						if (value instanceof Object[]) {
-							bw.setValue(descriptor, readCollection(descriptor, Arrays.asList((Object[]) value)).toArray());
-						} else if (value instanceof BasicDBList) {
-							bw.setValue(descriptor, readCollection(descriptor, (BasicDBList) value));
-						} else if (value instanceof DBObject) {
-							bw.setValue(descriptor, readCompoundValue(descriptor, (DBObject) value));
-						} else {
-							LOG.warn("Unable to map compound DBObject field " + keyToUse + " to property " + descriptor.getName()
-									+ ".  The field value should have been a 'DBObject.class' but was " + value.getClass().getName());
-						}
-					} else {
-						bw.setValue(descriptor, value);
-					}
-				} else {
-					LOG.warn("Unable to map DBObject field " + keyToUse + " to property " + descriptor.getName() + ".  Skipping.");
-				}
-			}
-		}
-
-		return target;
-	}
-
-	/**
-	 * Reads the given collection values (that are {@link DBObject}s potentially) into a {@link Collection} of domain
-	 * objects.
-	 * 
-	 * @param descriptor
-	 * @param values
-	 * @return
-	 */
-	private Collection<Object> readCollection(MongoPropertyDescriptor descriptor, Collection<?> values) {
-
-		Class<?> targetCollectionType = descriptor.getPropertyType();
-		boolean targetIsArray = targetCollectionType.isArray();
-
-		@SuppressWarnings("unchecked")
-		Collection<Object> result = targetIsArray ? new ArrayList<Object>(values.size()) : CollectionFactory
-				.createCollection(targetCollectionType, values.size());
-
-		for (Object o : values) {
-			if (o instanceof DBObject) {
-				Class<?> type;
-				if (targetIsArray) {
-					type = targetCollectionType.getComponentType();
-				} else {
-					type = getGenericParameters(descriptor.getTypeToSet()).get(0);
-				}
-				result.add(read(type, (DBObject) o));
-			} else {
-				result.add(o);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Reads a compound value from the given {@link DBObject} for the given property.
-	 * 
-	 * @param pd
-	 * @param dbo
-	 * @return
-	 */
-	private Object readCompoundValue(MongoPropertyDescriptor pd, DBObject dbo) {
-
-		Assert.isTrue(!pd.isCollection(), "Collections not supported!");
-
-		if (pd.isMap()) {
-			return readMap(pd, dbo, getGenericParameters(pd.getTypeToSet()).get(1));
-		} else {
-			return read(pd.getPropertyType(), dbo);
-		}
-	}
-
-	/**
-	 * Create a {@link Map} instance. Will return a {@link HashMap} by default. Subclasses might want to override this
-	 * method to use a custom {@link Map} implementation.
-	 * 
-	 * @return
-	 */
-	protected Map<String, Object> createMap() {
-		return new HashMap<String, Object>();
-	}
-
-	/**
-	 * Reads every key/value pair from the {@link DBObject} into a {@link Map} instance.
-	 * 
-	 * @param pd
-	 * @param dbo
-	 * @param targetType
-	 * @return
-	 */
-	protected Map<?, ?> readMap(MongoPropertyDescriptor pd, DBObject dbo, Class<?> targetType) {
-		Map<String, Object> map = createMap();
-		for (String key : dbo.keySet()) {
-			Object value = dbo.get(key);
-			if (!isSimpleType(value.getClass())) {
-				map.put(key, read(targetType, (DBObject) value));
-				// Can do some reflection tricks here -
-				// throw new RuntimeException("User types not supported yet as values for Maps");
-			} else {
-				map.put(key, conversionService.convert(value, targetType));
-			}
-		}
-		return map;
-	}
-
-	protected static boolean isSimpleType(Class<?> propertyType) {
-		if (propertyType == null) {
-			return false;
-		}
-		if (propertyType.isArray()) {
-			return isSimpleType(propertyType.getComponentType());
-		}
-		return SIMPLE_TYPES.contains(propertyType.getName());
-	}
-
-	/**
-	 * Callback to allow customizing creation of a {@link MongoBeanWrapper}.
-	 * 
-	 * @param target
-	 *          the target object to wrap
-	 * @param fieldAccess
-	 *          whether to use field access or property access
-	 * @return
-	 */
-	protected MongoBeanWrapper createWrapper(Object target, boolean fieldAccess) {
-
-		return new MongoBeanWrapper(target, conversionService, fieldAccess);
-	}
-
-	public List<Class<?>> getGenericParameters(Type genericParameterType) {
-
-		List<Class<?>> actualGenericParameterTypes = new ArrayList<Class<?>>();
-
-		if (genericParameterType instanceof ParameterizedType) {
-			ParameterizedType aType = (ParameterizedType) genericParameterType;
-			Type[] parameterArgTypes = aType.getActualTypeArguments();
-			for (Type parameterArgType : parameterArgTypes) {
-				if (parameterArgType instanceof GenericArrayType) {
-					Class<?> arrayType = (Class<?>) ((GenericArrayType) parameterArgType).getGenericComponentType();
-					actualGenericParameterTypes.add(Array.newInstance(arrayType, 0).getClass());
-				} else {
-					if (parameterArgType instanceof ParameterizedType) {
-						ParameterizedType paramTypeArgs = (ParameterizedType) parameterArgType;
-						actualGenericParameterTypes.add((Class<?>) paramTypeArgs.getRawType());
-					} else {
-						if (parameterArgType instanceof TypeVariable) {
-							throw new RuntimeException("Can not map " + ((TypeVariable<?>) parameterArgType).getName());
-						} else {
-							if (parameterArgType instanceof Class) {
-								actualGenericParameterTypes.add((Class<?>) parameterArgType);
-							} else {
-								throw new RuntimeException("Can not map " + parameterArgType);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return actualGenericParameterTypes;
-	}
-
-	/* (non-Javadoc)
-			* @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
-			*/
-	public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
-		return conversionService.convert(id, targetType);
-	}
-
-	/* (non-Javadoc)
-			* @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
-			*/
-	public ObjectId convertObjectId(Object id) {
-		return conversionService.convert(id, ObjectId.class);
-	}
-}