DATAMONGO-541 - Release 1.1.0.RELEASE.

Updated dependency versions to Spring Data MongoDB and Spring. Removed explicit dependency listing. Removed section on how to migrate between 1.0 milestones. Removed obsolete paragraphs.

.gitignore

@@ -1,4 +1,17 @@
+.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/

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-dist</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Fri Oct 08 14:31:54 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

README.md

@@ -1,16 +1,22 @@
-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 Spring Data MongoDB aims to provide a familiar and consistent Spring-based programming model for 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
 
 Getting Help
 ------------
 
-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). 
+For a comprehensive treatmet of all the Spring Data MongoDB features, please refer to the The [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
 
-The [User Guide](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) (A work in progress). 
+The [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
 
+The home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
+
+For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
 
 Quick Start
@@ -137,11 +143,6 @@ This will register an object in the container named PersonRepository.  You can u
     }
 
 
-## CouchDB
-
-TBD
-
-
 Contributing to Spring Data
 ---------------------------
 

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="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>

pom.xml

@@ -1,256 +1,273 @@
 <?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.M1</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>spring-data-document-parent</module>
-		<module>spring-data-document-core</module>
-		<module>spring-data-mongodb</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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb-dist</artifactId>
+  <name>Spring Data MongoDB Distribution</name>
+  <description>Spring Data project for MongoDB</description>
+  <url>http://www.springsource.org/spring-data/mongodb</url>
+  <version>1.1.0.RELEASE</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>spring-data-mongodb</module>
+    <module>spring-data-mongodb-cross-store</module>
+    <module>spring-data-mongodb-log4j</module>
+    <module>spring-data-mongodb-parent</module>
+  </modules>
 
-	<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>
-	</developers>
+  <developers>
+    <developer>
+      <id>trisberg</id>
+      <name>Thomas Risberg</name>
+      <email>trisberg at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>mpollack</id>
+      <name>Mark Pollack</name>
+      <email>mpollack at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>jbrisbin</id>
+      <name>Jon Brisbin</name>
+      <email>jbrisbin at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+  </developers>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-			<comments>
-			Copyright 2010 the original author or authors.
-			 
-			Licensed under the Apache License, Version 2.0 (the "License");
-			you may not use this file except in compliance with the License.
-			You may obtain a copy of the License at
-			
-			     http://www.apache.org/licenses/LICENSE-2.0
-			
-			Unless required by applicable law or agreed to in writing, software
-			distributed under the License is distributed on an "AS IS" BASIS,
-			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-			implied.
-			See the License for the specific language governing permissions and
-			limitations under the License.
-			</comments>
-		</license>
-	</licenses>
+  <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.
 
-	<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 Document</dist.name>
-		<dist.key>DATADOC</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>
+        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
 
-	<build>
-		<extensions>
-			<extension>
-				<groupId>org.springframework.build.aws</groupId>
-				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
-			</extension>
-		</extensions>
+        http://www.apache.org/licenses/LICENSE-2.0
 
-		<plugins>
-			<plugin>
-			  <artifactId>maven-compiler-plugin</artifactId>
-			  <configuration>
-			    <source>1.6</source>
-			    <target>1.6</target>
-			  </configuration>
-			</plugin>
+        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>
 
-			<plugin>
-				<groupId>com.agilejava.docbkx</groupId>
-				<artifactId>docbkx-maven-plugin</artifactId>
-				<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>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- dist.* properties are used by the antrun tasks below -->
+    <dist.id>spring-data-mongo</dist.id>
+    <dist.name>Spring Data Mongo</dist.name>
+    <dist.key>SDMONGO</dist.key>
+    <dist.version>${project.version}</dist.version>
+    <dist.releaseType>snapshot</dist.releaseType>
+    <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
+    <dist.fileName>${dist.finalName}.zip</dist.fileName>
+    <dist.filePath>target/${dist.fileName}</dist.filePath>
+    <dist.bucketName>dist.springframework.org</dist.bucketName>
+    <!-- these properties should be in ~/.m2/settings.xml
+      <dist.accessKey>s3 access key</dist.accessKey>
+      <dist.secretKey>s3 secret key</dist.secretKey>
+      -->
+  </properties>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.springframework.build.aws</groupId>
+        <artifactId>org.springframework.build.aws.maven</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </extension>
+    </extensions>
+
+    <plugins>
+      <plugin>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+	<!-- yes it really needs to be this (2.0.7) otherwise pdf generation from a clean build doesn't work -->
+        <version>2.0.7</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-html</goal>
+              <goal>generate-pdf</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.docbook</groupId>
+            <artifactId>docbook-xml</artifactId>
+            <version>4.4</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <includes>index.xml</includes>
+          <xincludeSupported>true</xincludeSupported>
+          <foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+          <htmlStylesheet>css/html.css</htmlStylesheet>
+          <chunkedOutput>false</chunkedOutput>
+          <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
+          <useExtensions>1</useExtensions>
+          <highlightSource>1</highlightSource>
+          <highlightDefaultLanguage />
           <!-- callouts -->
-					<entities>
-						<entity>
-							<name>version</name>
-							<value>${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>
-						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-							tofile="${project.basedir}/target/site/reference/pdf/spring-data-document-reference.pdf"
-							failonerror="false" />
-					</postProcess>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<javadoc:aggregate>true</javadoc:aggregate>
-					<breakiterator>true</breakiterator>
-					<header>Spring Data Graph</header>
-					<source>1.6</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://java.sun.com/javase/6/docs/api</link>
-						<link>http://api.mongodb.org/java/2.3</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin><!--
+          <entities>
+            <entity>
+              <name>version</name>
+              <value>${project.version}</value>
+            </entity>
+          </entities>
+          <postProcess>
+            <copy todir="${project.basedir}/target/site/reference">
+              <fileset dir="${project.basedir}/target/docbkx">
+                <include name="**/*.html" />
+                <include name="**/*.pdf" />
+              </fileset>
+            </copy>
+            <copy todir="${project.basedir}/target/site/reference/html">
+              <fileset dir="${project.basedir}/src/docbkx/resources">
+                <include name="**/*.css" />
+                <include name="**/*.png" />
+                <include name="**/*.gif" />
+                <include name="**/*.jpg" />
+              </fileset>
+            </copy>
+            <copy todir="${project.basedir}/target/site/reference/html">
+              <fileset dir="${project.basedir}/src/docbkx/resources/images">
+                <include name="*.png" />
+              </fileset>
+            </copy>
+            <move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf" failonerror="false" />
+          </postProcess>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <aggregate>true</aggregate>
+          <breakiterator>true</breakiterator>
+          <header>Spring Data Document</header>
+          <source>1.5</source>
+          <quiet>true</quiet>
+          <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+          <overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+          <stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+          <!-- copies doc-files subdirectory which contains image resources -->
+          <docfilessubdirs>true</docfilessubdirs>
+          <links>
+            <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+            <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+            <link>http://api.mongodb.org/java/2.3</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin><!--
 				run `mvn package assembly:assembly` to trigger assembly creation.
 				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>distribution</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<id>upload-dist</id>
-						<phase>deploy</phase>
-						<configuration>
-							<tasks>
-								<ant antfile="${basedir}/src/ant/upload-dist.xml">
-									<target name="upload-dist"/>
-								</ant>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.0.5.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.7.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-		<!-- the name of this project is 'spring-data-document-dist';
-			 make sure the zip file is just 'spring-data-document'. -->
-		<finalName>${dist.finalName}</finalName>
-	</build>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>distribution</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>upload-dist</id>
+            <phase>deploy</phase>
+            <configuration>
+              <tasks>
+                <ant antfile="${basedir}/src/ant/upload-dist.xml">
+                  <target name="upload-dist" />
+                </ant>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.springframework.build</groupId>
+            <artifactId>org.springframework.build.aws.ant</artifactId>
+            <version>3.0.5.RELEASE</version>
+          </dependency>
+          <dependency>
+            <groupId>net.java.dev.jets3t</groupId>
+            <artifactId>jets3t</artifactId>
+            <version>0.7.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+    <!-- the name of this project is 'spring-data-mongo-dist';
+         make sure the zip file is just 'spring-data-mongo'. -->
+    <finalName>${dist.finalName}</finalName>
+  </build>
+
+  <pluginRepositories>
+    <!-- Necessary for the build extension -->
+    <pluginRepository>
+      <id>spring-plugins-release</id>
+      <url>http://repo.springsource.org/plugins-release</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <distributionManagement>
     <!-- see 'staging' profile for dry-run deployment settings -->
@@ -258,7 +275,7 @@
     <site>
       <id>static.springframework.org</id>
       <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-document/snapshot-site/
+        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
       </url>
     </site>
     <repository>
@@ -273,4 +290,8 @@
     </snapshotRepository>
   </distributionManagement>
 
+  <scm>
+    <url>https://github.com/SpringSource/spring-data-mongodb</url>
+  </scm>
+
 </project>

spring-data-couchdb/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<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"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-couchdb/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-couchdb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

spring-data-couchdb/.settings/org.eclipse.jdt.core.prefs

@@ -1,6 +0,0 @@
-#Wed Oct 06 14:49:48 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-couchdb/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-couchdb/pom.xml

@@ -1,103 +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>
-	<dependencies>
-
-		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
-
-		<!--  Spring Data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-document-core</artifactId>
-		</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>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</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/CannotGetCouchDbConnectionException.java

@@ -1,11 +0,0 @@
-package org.springframework.data.document.couchdb;
-
-import org.springframework.dao.DataAccessResourceFailureException;
-
-public class CannotGetCouchDbConnectionException extends DataAccessResourceFailureException {
-
-	public CannotGetCouchDbConnectionException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}

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

@@ -1,96 +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;
-
-import org.jcouchdb.db.Database;
-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;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Convenient factory for configuring MongoDB.
- *
- * @author Thomas Risberg
- * @since 1.0
- */
-public class CouchDbFactoryBean implements FactoryBean<Database>, InitializingBean, 
-		PersistenceExceptionTranslator {
-
-	/**
-	 * Logger, available to subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private String host;
-	private Integer port;
-	private String databaseName;
-	
-	public void setDatabaseName(String databaseName) {
-		this.databaseName = databaseName;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public Database getObject() throws Exception {
-		Assert.hasText(host, "Host must not be empty");
-		Assert.hasText(databaseName, "Database name must not be empty");
-		if (port == null) {
-			return new Database(host, databaseName);
-		}
-		else {
-			return new Database(host, port, databaseName);
-		}
-	}
-
-	public Class<? extends Database> getObjectType() {
-		return Database.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 (host == null) {
-			logger.warn("Property host not specified. Using default 'localhost'");
-			databaseName = "localhost";
-		}
-		if (databaseName == null) {
-			logger.warn("Property databaseName not specified. Using default name 'test'");
-			databaseName = "test";
-		}
-	}
-
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		logger.debug("Translating " + ex);
-		return CouchDbUtils.translateCouchExceptionIfPossible(ex);
-	}
-
-}

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

@@ -1,57 +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;
-
-import org.jcouchdb.exception.CouchDBException;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.UncategorizedDocumentStoreException;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes.
- *
- * <p>Mainly intended for internal use within the framework.
- *
- * @author Thomas Risberg
- * @since 1.0
- */
-public class CouchDbUtils {
-
-	/**
-	 * 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) {
-
-		// Check for well-known MongoException subclasses.
-		
-		// All other MongoExceptions
-		if (ex instanceof CouchDBException) {
-			return new UncategorizedDocumentStoreException(ex.getMessage(), ex);
-		}
-		
-		// If we get here, we have an exception that resulted from user code,
-		// rather than the persistence provider, so we return null to indicate
-		// that translation should not occur.
-		return null;				
-	}
-
-}

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

@@ -1,52 +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;
-
-
-import org.jcouchdb.db.Database;
-import org.jcouchdb.document.BaseDocument;
-import org.springframework.data.document.AbstractDocumentStoreTemplate;
-
-	public class CouchTemplate extends AbstractDocumentStoreTemplate<Database> {
-
-	private Database database;
-	
-	public CouchTemplate() {
-		super();
-	}
-	
-	public CouchTemplate(String host, String databaseName) {
-		super();
-		database = new Database(host, databaseName);
-	}
-
-	public CouchTemplate(Database database) {
-		super();
-		this.database = database;
-	}
-	
-	public void save(BaseDocument document) {
-		getConnection().createDocument(document);
-	}
-
-	@Override
-	public Database getConnection() {
-		return database;
-	}
-	
-	
-}

spring-data-couchdb/template.mf

@@ -1,19 +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.util.*;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.jcouchdb.*;version="0",
- 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-core/.classpath

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<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-document-core/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

spring-data-document-core/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +0,0 @@
-#Thu Oct 14 10:28:37 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-document-core/.settings/org.eclipse.wst.common.component

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-datastore-document-core">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>

spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>

spring-data-document-core/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-document-core/pom.xml

@@ -1,132 +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.M1</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>spring-data-document-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data Document Support</name>
-	<dependencies>
-
-		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</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>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</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>
-		<!-- Spring dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>	
-		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>	
-    	<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>

spring-data-document-core/src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java

@@ -1,45 +0,0 @@
-package org.springframework.data.document.analytics;
-
-import java.util.Date;
-import java.util.Map;
-
-public class ControllerCounter {
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public double getCount() {
-		return count;
-	}
-
-	public void setCount(double count) {
-		this.count = count;
-	}
-
-	public Map<String, Double> getMethods() {
-		return methods;
-	}
-	
-	
-
-	public void setMethods(Map<String, Double> methods) {
-		this.methods = methods;
-	}
-
-	private String name;
-	
-	private double count;
-	
-	private Map<String, Double> methods;
-	
-	@Override
-	public String toString() {
-		return "ControllerCounter [name=" + name + ", count=" + count
-				+ ", methods=" + methods + "]";
-	}	
-}

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java

@@ -1,84 +0,0 @@
-package org.springframework.data.document.analytics;
-
-import java.util.Date;
-
-public class MvcEvent {
-
-	private String controller;
-	
-	private String action;
-	
-	private Parameters parameters;
-	
-	private Date date;
-	
-	private String requestUri;
-	
-	private String requestAddress;
-	
-	private String remoteUser;
-	
-	private String view;
-
-	public String getController() {
-		return controller;
-	}
-
-	public void setController(String controller) {
-		this.controller = controller;
-	}
-
-	public String getAction() {
-		return action;
-	}
-
-	public void setAction(String action) {
-		this.action = action;
-	}
-
-	public Parameters getParameters() {
-		return parameters;
-	}
-
-	public void setParameters(Parameters parameters) {
-		this.parameters = parameters;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRequestUri() {
-		return requestUri;
-	}
-
-	public void setRequestUri(String requestUri) {
-		this.requestUri = requestUri;
-	}
-
-	public String getRequestAddress() {
-		return requestAddress;
-	}
-
-	public void setRequestAddress(String requestAddress) {
-		this.requestAddress = requestAddress;
-	}
-
-	public String getRemoteUser() {
-		return remoteUser;
-	}
-
-	public void setRemoteUser(String remoteUser) {
-		this.remoteUser = remoteUser;
-	}
-	
-	//TODO
-	//Map sessionAttributes
-	
-	
-	
-}

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java

@@ -1,35 +0,0 @@
-package org.springframework.data.document.analytics;
-
-public class Parameters {
-
-	private String p1;
-	
-	private String p2;
-	
-	private String p3;
-
-	public String getP1() {
-		return p1;
-	}
-
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public void setP2(String p2) {
-		this.p2 = p2;
-	}
-
-	public String getP3() {
-		return p3;
-	}
-
-	public void setP3(String p3) {
-		this.p3 = p3;
-	}
-	
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java

@@ -1,898 +0,0 @@
-/*
- * Copyright 2002-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.web.bind.annotation.support;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.BridgeMethodResolver;
-import org.springframework.core.Conventions;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.ui.Model;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ValueConstants;
-import org.springframework.web.bind.annotation.support.HandlerMethodInvocationException;
-import org.springframework.web.bind.annotation.support.HandlerMethodResolver;
-import org.springframework.web.bind.support.DefaultSessionAttributeStore;
-import org.springframework.web.bind.support.SessionAttributeStore;
-import org.springframework.web.bind.support.SessionStatus;
-import org.springframework.web.bind.support.SimpleSessionStatus;
-import org.springframework.web.bind.support.WebArgumentResolver;
-import org.springframework.web.bind.support.WebBindingInitializer;
-import org.springframework.web.bind.support.WebRequestDataBinder;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-/**
- * Support class for invoking an annotated handler method. Operates on the introspection results of a {@link
- * HandlerMethodResolver} for a specific handler type.
- *
- * <p>Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter} and {@link
- * org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 2.5.2
- * @see #invokeHandlerMethod
- */
-public class HandlerMethodInvoker {
-
-	private static final String MODEL_KEY_PREFIX_STALE = SessionAttributeStore.class.getName() + ".STALE.";
-
-	/** We'll create a lot of these objects, so we don't want a new logger every time. */
-	private static final Log logger = LogFactory.getLog(HandlerMethodInvoker.class);
-
-	private final HandlerMethodResolver methodResolver;
-
-	private final WebBindingInitializer bindingInitializer;
-
-	private final SessionAttributeStore sessionAttributeStore;
-
-	private final ParameterNameDiscoverer parameterNameDiscoverer;
-
-	private final WebArgumentResolver[] customArgumentResolvers;
-
-	private final HttpMessageConverter[] messageConverters;
-
-	private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus();
-
-
-	public HandlerMethodInvoker(HandlerMethodResolver methodResolver) {
-		this(methodResolver, null);
-	}
-
-	public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer) {
-		this(methodResolver, bindingInitializer, new DefaultSessionAttributeStore(), null, null, null);
-	}
-
-	public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer,
-			SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer,
-			WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters) {
-
-		this.methodResolver = methodResolver;
-		this.bindingInitializer = bindingInitializer;
-		this.sessionAttributeStore = sessionAttributeStore;
-		this.parameterNameDiscoverer = parameterNameDiscoverer;
-		this.customArgumentResolvers = customArgumentResolvers;
-		this.messageConverters = messageConverters;
-	}
-
-
-	public final Object invokeHandlerMethod(Method handlerMethod, Object handler,
-			NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-		Method handlerMethodToInvoke = BridgeMethodResolver.findBridgedMethod(handlerMethod);
-		try {
-			boolean debug = logger.isDebugEnabled();
-			for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-				Object attrValue = this.sessionAttributeStore.retrieveAttribute(webRequest, attrName);
-				if (attrValue != null) {
-					implicitModel.addAttribute(attrName, attrValue);
-				}
-			}
-			for (Method attributeMethod : this.methodResolver.getModelAttributeMethods()) {
-				Method attributeMethodToInvoke = BridgeMethodResolver.findBridgedMethod(attributeMethod);
-				Object[] args = resolveHandlerArguments(attributeMethodToInvoke, handler, webRequest, implicitModel);
-				if (debug) {
-					logger.debug("Invoking model attribute method: " + attributeMethodToInvoke);
-				}
-				String attrName = AnnotationUtils.findAnnotation(attributeMethod, ModelAttribute.class).value();
-				if (!"".equals(attrName) && implicitModel.containsAttribute(attrName)) {
-					continue;
-				}
-				ReflectionUtils.makeAccessible(attributeMethodToInvoke);
-				Object attrValue = attributeMethodToInvoke.invoke(handler, args);
-				if ("".equals(attrName)) {
-					Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass());
-					attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue);
-				}
-				if (!implicitModel.containsAttribute(attrName)) {
-					implicitModel.addAttribute(attrName, attrValue);
-				}
-			}
-			Object[] args = resolveHandlerArguments(handlerMethodToInvoke, handler, webRequest, implicitModel);
-			if (debug) {
-				logger.debug("Invoking request handler method: " + handlerMethodToInvoke);
-			}
-			ReflectionUtils.makeAccessible(handlerMethodToInvoke);
-			return handlerMethodToInvoke.invoke(handler, args);
-		}
-		catch (IllegalStateException ex) {
-			// Internal assertion failed (e.g. invalid signature):
-			// throw exception with full handler method context...
-			throw new HandlerMethodInvocationException(handlerMethodToInvoke, ex);
-		}
-		catch (InvocationTargetException ex) {
-			// User-defined @ModelAttribute/@InitBinder/@RequestMapping method threw an exception...
-			ReflectionUtils.rethrowException(ex.getTargetException());
-			return null;
-		}
-	}
-
-	public final void updateModelAttributes(Object handler, Map<String, Object> mavModel,
-			ExtendedModelMap implicitModel, NativeWebRequest webRequest) throws Exception {
-
-		if (this.methodResolver.hasSessionAttributes() && this.sessionStatus.isComplete()) {
-			for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-				this.sessionAttributeStore.cleanupAttribute(webRequest, attrName);
-			}
-		}
-
-		// Expose model attributes as session attributes, if required.
-		// Expose BindingResults for all attributes, making custom editors available.
-		Map<String, Object> model = (mavModel != null ? mavModel : implicitModel);
-		if (model != null) {
-			try {
-				String[] originalAttrNames = model.keySet().toArray(new String[model.size()]);
-				for (String attrName : originalAttrNames) {
-					Object attrValue = model.get(attrName);
-					boolean isSessionAttr = this.methodResolver.isSessionAttribute(
-							attrName, (attrValue != null ? attrValue.getClass() : null));
-					if (isSessionAttr) {
-						if (this.sessionStatus.isComplete()) {
-							implicitModel.put(MODEL_KEY_PREFIX_STALE + attrName, Boolean.TRUE);
-						}
-						else if (!implicitModel.containsKey(MODEL_KEY_PREFIX_STALE + attrName)) {
-							this.sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
-						}
-					}
-					if (!attrName.startsWith(BindingResult.MODEL_KEY_PREFIX) &&
-							(isSessionAttr || isBindingCandidate(attrValue))) {
-						String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attrName;
-						if (mavModel != null && !model.containsKey(bindingResultKey)) {
-							WebDataBinder binder = createBinder(webRequest, attrValue, attrName);
-							initBinder(handler, attrName, binder, webRequest);
-							mavModel.put(bindingResultKey, binder.getBindingResult());
-						}
-					}
-				}
-			}
-			catch (InvocationTargetException ex) {
-				// User-defined @InitBinder method threw an exception...
-				ReflectionUtils.rethrowException(ex.getTargetException());
-			}
-		}
-	}
-
-
-	private Object[] resolveHandlerArguments(Method handlerMethod, Object handler,
-			NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-		Class[] paramTypes = handlerMethod.getParameterTypes();
-		Object[] args = new Object[paramTypes.length];
-
-		for (int i = 0; i < args.length; i++) {
-			MethodParameter methodParam = new MethodParameter(handlerMethod, i);
-			methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-			GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-			String paramName = null;
-			String headerName = null;
-			boolean requestBodyFound = false;
-			String cookieName = null;
-			String pathVarName = null;
-			String attrName = null;
-			boolean required = false;
-			String defaultValue = null;
-			boolean validate = false;
-			int annotationsFound = 0;
-			Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-			for (Annotation paramAnn : paramAnns) {
-				if (RequestParam.class.isInstance(paramAnn)) {
-					RequestParam requestParam = (RequestParam) paramAnn;
-					paramName = requestParam.value();
-					required = requestParam.required();
-					defaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-					annotationsFound++;
-				}
-				else if (RequestHeader.class.isInstance(paramAnn)) {
-					RequestHeader requestHeader = (RequestHeader) paramAnn;
-					headerName = requestHeader.value();
-					required = requestHeader.required();
-					defaultValue = parseDefaultValueAttribute(requestHeader.defaultValue());
-					annotationsFound++;
-				}
-				else if (RequestBody.class.isInstance(paramAnn)) {
-					requestBodyFound = true;
-					annotationsFound++;
-				}
-				else if (CookieValue.class.isInstance(paramAnn)) {
-					CookieValue cookieValue = (CookieValue) paramAnn;
-					cookieName = cookieValue.value();
-					required = cookieValue.required();
-					defaultValue = parseDefaultValueAttribute(cookieValue.defaultValue());
-					annotationsFound++;
-				}
-				else if (PathVariable.class.isInstance(paramAnn)) {
-					PathVariable pathVar = (PathVariable) paramAnn;
-					pathVarName = pathVar.value();
-					annotationsFound++;
-				}
-				else if (ModelAttribute.class.isInstance(paramAnn)) {
-					ModelAttribute attr = (ModelAttribute) paramAnn;
-					attrName = attr.value();
-					annotationsFound++;
-				}
-				else if (Value.class.isInstance(paramAnn)) {
-					defaultValue = ((Value) paramAnn).value();
-				}
-				else if ("Valid".equals(paramAnn.annotationType().getSimpleName())) {
-					validate = true;
-				}
-			}
-
-			if (annotationsFound > 1) {
-				throw new IllegalStateException("Handler parameter annotations are exclusive choices - " +
-						"do not specify more than one such annotation on the same parameter: " + handlerMethod);
-			}
-
-			if (annotationsFound == 0) {
-				Object argValue = resolveCommonArgument(methodParam, webRequest);
-				if (argValue != WebArgumentResolver.UNRESOLVED) {
-					args[i] = argValue;
-				}
-				else if (defaultValue != null) {
-					args[i] = resolveDefaultValue(defaultValue);
-				}
-				else {
-					Class paramType = methodParam.getParameterType();
-					if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
-						args[i] = implicitModel;
-					}
-					else if (SessionStatus.class.isAssignableFrom(paramType)) {
-						args[i] = this.sessionStatus;
-					}
-					else if (HttpEntity.class.isAssignableFrom(paramType)) {
-						args[i] = resolveHttpEntityRequest(methodParam, webRequest);
-					}
-					else if (Errors.class.isAssignableFrom(paramType)) {
-						throw new IllegalStateException("Errors/BindingResult argument declared " +
-								"without preceding model attribute. Check your handler method signature!");
-					}
-					else if (BeanUtils.isSimpleProperty(paramType)) {
-						paramName = "";
-					}
-					else {
-						attrName = "";
-					}
-				}
-			}
-
-			if (paramName != null) {
-				args[i] = resolveRequestParam(paramName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (headerName != null) {
-				args[i] = resolveRequestHeader(headerName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (requestBodyFound) {
-				args[i] = resolveRequestBody(methodParam, webRequest, handler);
-			}
-			else if (cookieName != null) {
-				args[i] = resolveCookieValue(cookieName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (pathVarName != null) {
-				args[i] = resolvePathVariable(pathVarName, methodParam, webRequest, handler);
-			}
-			else if (attrName != null) {
-				WebDataBinder binder =
-						resolveModelAttribute(attrName, methodParam, implicitModel, webRequest, handler);
-				boolean assignBindingResult = (args.length > i + 1 && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-				if (binder.getTarget() != null) {
-					doBind(binder, webRequest, validate, !assignBindingResult);
-				}
-				args[i] = binder.getTarget();
-				if (assignBindingResult) {
-					args[i + 1] = binder.getBindingResult();
-					i++;
-				}
-				implicitModel.putAll(binder.getBindingResult().getModel());
-			}
-		}
-
-		return args;
-	}
-
-	protected void initBinder(Object handler, String attrName, WebDataBinder binder, NativeWebRequest webRequest)
-			throws Exception {
-
-		if (this.bindingInitializer != null) {
-			this.bindingInitializer.initBinder(binder, webRequest);
-		}
-		if (handler != null) {
-			Set<Method> initBinderMethods = this.methodResolver.getInitBinderMethods();
-			if (!initBinderMethods.isEmpty()) {
-				boolean debug = logger.isDebugEnabled();
-				for (Method initBinderMethod : initBinderMethods) {
-					Method methodToInvoke = BridgeMethodResolver.findBridgedMethod(initBinderMethod);
-					String[] targetNames = AnnotationUtils.findAnnotation(initBinderMethod, InitBinder.class).value();
-					if (targetNames.length == 0 || Arrays.asList(targetNames).contains(attrName)) {
-						Object[] initBinderArgs =
-								resolveInitBinderArguments(handler, methodToInvoke, binder, webRequest);
-						if (debug) {
-							logger.debug("Invoking init-binder method: " + methodToInvoke);
-						}
-						ReflectionUtils.makeAccessible(methodToInvoke);
-						Object returnValue = methodToInvoke.invoke(handler, initBinderArgs);
-						if (returnValue != null) {
-							throw new IllegalStateException(
-									"InitBinder methods must not have a return value: " + methodToInvoke);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod,
-			WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-
-		Class[] initBinderParams = initBinderMethod.getParameterTypes();
-		Object[] initBinderArgs = new Object[initBinderParams.length];
-
-		for (int i = 0; i < initBinderArgs.length; i++) {
-			MethodParameter methodParam = new MethodParameter(initBinderMethod, i);
-			methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-			GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-			String paramName = null;
-			boolean paramRequired = false;
-			String paramDefaultValue = null;
-			String pathVarName = null;
-			Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-			for (Annotation paramAnn : paramAnns) {
-				if (RequestParam.class.isInstance(paramAnn)) {
-					RequestParam requestParam = (RequestParam) paramAnn;
-					paramName = requestParam.value();
-					paramRequired = requestParam.required();
-					paramDefaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-					break;
-				}
-				else if (ModelAttribute.class.isInstance(paramAnn)) {
-					throw new IllegalStateException(
-							"@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
-				}
-				else if (PathVariable.class.isInstance(paramAnn)) {
-					PathVariable pathVar = (PathVariable) paramAnn;
-					pathVarName = pathVar.value();
-				}
-			}
-
-			if (paramName == null && pathVarName == null) {
-				Object argValue = resolveCommonArgument(methodParam, webRequest);
-				if (argValue != WebArgumentResolver.UNRESOLVED) {
-					initBinderArgs[i] = argValue;
-				}
-				else {
-					Class paramType = initBinderParams[i];
-					if (paramType.isInstance(binder)) {
-						initBinderArgs[i] = binder;
-					}
-					else if (BeanUtils.isSimpleProperty(paramType)) {
-						paramName = "";
-					}
-					else {
-						throw new IllegalStateException("Unsupported argument [" + paramType.getName() +
-								"] for @InitBinder method: " + initBinderMethod);
-					}
-				}
-			}
-
-			if (paramName != null) {
-				initBinderArgs[i] =
-						resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
-			}
-			else if (pathVarName != null) {
-				initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
-			}
-		}
-
-		return initBinderArgs;
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object resolveRequestParam(String paramName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) {
-			return resolveRequestParamMap((Class<? extends Map>) paramType, webRequest);
-		}
-		if (paramName.length() == 0) {
-			paramName = getRequiredParameterName(methodParam);
-		}
-		Object paramValue = null;
-		MultipartRequest multipartRequest = webRequest.getNativeRequest(MultipartRequest.class);
-		if (multipartRequest != null) {
-			List<MultipartFile> files = multipartRequest.getFiles(paramName);
-			if (!files.isEmpty()) {
-				if (files.size() == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-					paramValue = files.get(0);
-				}
-				else {
-					paramValue = files;
-				}
-			}
-		}
-		if (paramValue == null) {
-			String[] paramValues = webRequest.getParameterValues(paramName);
-			if (paramValues != null) {
-				if (paramValues.length == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-					paramValue = paramValues[0];
-				}
-				else {
-					paramValue = paramValues;
-				}
-			}
-		}
-		if (paramValue == null) {
-			if (defaultValue != null) {
-				paramValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingParameterException(paramName, paramType);
-			}
-			paramValue = checkValue(paramName, paramValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, paramName);
-		initBinder(handlerForInitBinderCall, paramName, binder, webRequest);
-		return binder.convertIfNecessary(paramValue, paramType, methodParam);
-	}
-
-	private Map resolveRequestParamMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-		Map<String, String[]> parameterMap = webRequest.getParameterMap();
-		if (MultiValueMap.class.isAssignableFrom(mapType)) {
-			MultiValueMap<String, String> result = new LinkedMultiValueMap<String, String>(parameterMap.size());
-			for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-				for (String value : entry.getValue()) {
-					result.add(entry.getKey(), value);
-				}
-			}
-			return result;
-		}
-		else {
-			Map<String, String> result = new LinkedHashMap<String, String>(parameterMap.size());
-			for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-				if (entry.getValue().length > 0) {
-					result.put(entry.getKey(), entry.getValue()[0]);
-				}
-			}
-			return result;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object resolveRequestHeader(String headerName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (Map.class.isAssignableFrom(paramType)) {
-			return resolveRequestHeaderMap((Class<? extends Map>) paramType, webRequest);
-		}
-		if (headerName.length() == 0) {
-			headerName = getRequiredParameterName(methodParam);
-		}
-		Object headerValue = null;
-		String[] headerValues = webRequest.getHeaderValues(headerName);
-		if (headerValues != null) {
-			headerValue = (headerValues.length == 1 ? headerValues[0] : headerValues);
-		}
-		if (headerValue == null) {
-			if (defaultValue != null) {
-				headerValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingHeaderException(headerName, paramType);
-			}
-			headerValue = checkValue(headerName, headerValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, headerName);
-		initBinder(handlerForInitBinderCall, headerName, binder, webRequest);
-		return binder.convertIfNecessary(headerValue, paramType, methodParam);
-	}
-
-	private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-		if (MultiValueMap.class.isAssignableFrom(mapType)) {
-			MultiValueMap<String, String> result;
-			if (HttpHeaders.class.isAssignableFrom(mapType)) {
-				result = new HttpHeaders();
-			}
-			else {
-				result = new LinkedMultiValueMap<String, String>();
-			}
-			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-				String headerName = iterator.next();
-				for (String headerValue : webRequest.getHeaderValues(headerName)) {
-					result.add(headerName, headerValue);
-				}
-			}
-			return result;
-		}
-		else {
-			Map<String, String> result = new LinkedHashMap<String, String>();
-			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-				String headerName = iterator.next();
-				String headerValue = webRequest.getHeader(headerName);
-				result.put(headerName, headerValue);
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * Resolves the given {@link RequestBody @RequestBody} annotation.
-	 */
-	protected Object resolveRequestBody(MethodParameter methodParam, NativeWebRequest webRequest, Object handler)
-			throws Exception {
-
-		return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType());
-	}
-
-	private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest)
-			throws Exception {
-
-		HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
-		Class<?> paramType = getHttpEntityType(methodParam);
-		Object body = readWithMessageConverters(methodParam, inputMessage, paramType);
-		return new HttpEntity<Object>(body, inputMessage.getHeaders());
-	}
-
-	private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType)
-			throws Exception {
-
-		MediaType contentType = inputMessage.getHeaders().getContentType();
-		if (contentType == null) {
-			StringBuilder builder = new StringBuilder(ClassUtils.getShortName(methodParam.getParameterType()));
-			String paramName = methodParam.getParameterName();
-			if (paramName != null) {
-				builder.append(' ');
-				builder.append(paramName);
-			}
-			throw new HttpMediaTypeNotSupportedException(
-					"Cannot extract parameter (" + builder.toString() + "): no Content-Type found");
-		}
-
-		List<MediaType> allSupportedMediaTypes = new ArrayList<MediaType>();
-		if (this.messageConverters != null) {
-			for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
-				allSupportedMediaTypes.addAll(messageConverter.getSupportedMediaTypes());
-				if (messageConverter.canRead(paramType, contentType)) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Reading [" + paramType.getName() + "] as \"" + contentType
-								+"\" using [" + messageConverter + "]");
-					}
-					return messageConverter.read(paramType, inputMessage);
-				}
-			}
-		}
-		throw new HttpMediaTypeNotSupportedException(contentType, allSupportedMediaTypes);
-	}
-
-	private Class<?> getHttpEntityType(MethodParameter methodParam) {
-		Assert.isAssignable(HttpEntity.class, methodParam.getParameterType());
-		ParameterizedType type = (ParameterizedType) methodParam.getGenericParameterType();
-		if (type.getActualTypeArguments().length == 1) {
-			Type typeArgument = type.getActualTypeArguments()[0];
-			if (typeArgument instanceof Class) {
-				return (Class<?>) typeArgument;
-			}
-			else if (typeArgument instanceof GenericArrayType) {
-				Type componentType = ((GenericArrayType) typeArgument).getGenericComponentType();
-				if (componentType instanceof Class) {
-					// Surely, there should be a nicer way to do this
-					Object array = Array.newInstance((Class<?>) componentType, 0);
-					return array.getClass();
-				}
-			}
-		}
-		throw new IllegalArgumentException(
-				"HttpEntity parameter (" + methodParam.getParameterName() + ") is not parameterized");
-		
-	}
-
-	private Object resolveCookieValue(String cookieName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (cookieName.length() == 0) {
-			cookieName = getRequiredParameterName(methodParam);
-		}
-		Object cookieValue = resolveCookieValue(cookieName, paramType, webRequest);
-		if (cookieValue == null) {
-			if (defaultValue != null) {
-				cookieValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingCookieException(cookieName, paramType);
-			}
-			cookieValue = checkValue(cookieName, cookieValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, cookieName);
-		initBinder(handlerForInitBinderCall, cookieName, binder, webRequest);
-		return binder.convertIfNecessary(cookieValue, paramType, methodParam);
-	}
-
-	/**
-	 * Resolves the given {@link CookieValue @CookieValue} annotation.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest)
-			throws Exception {
-
-		throw new UnsupportedOperationException("@CookieValue not supported");
-	}
-
-	private Object resolvePathVariable(String pathVarName, MethodParameter methodParam,
-			NativeWebRequest webRequest, Object handlerForInitBinderCall) throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (pathVarName.length() == 0) {
-			pathVarName = getRequiredParameterName(methodParam);
-		}
-		String pathVarValue = resolvePathVariable(pathVarName, paramType, webRequest);
-		WebDataBinder binder = createBinder(webRequest, null, pathVarName);
-		initBinder(handlerForInitBinderCall, pathVarName, binder, webRequest);
-		return binder.convertIfNecessary(pathVarValue, paramType, methodParam);
-	}
-
-	/**
-	 * Resolves the given {@link PathVariable @PathVariable} annotation.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest)
-			throws Exception {
-
-		throw new UnsupportedOperationException("@PathVariable not supported");
-	}
-
-	private String getRequiredParameterName(MethodParameter methodParam) {
-		String name = methodParam.getParameterName();
-		if (name == null) {
-			throw new IllegalStateException(
-					"No parameter name specified for argument of type [" + methodParam.getParameterType().getName() +
-							"], and no parameter name information found in class file either.");
-		}
-		return name;
-	}
-
-	private Object checkValue(String name, Object value, Class paramType) {
-		if (value == null) {
-			if (boolean.class.equals(paramType)) {
-				return Boolean.FALSE;
-			}
-			else if (paramType.isPrimitive()) {
-				throw new IllegalStateException("Optional " + paramType + " parameter '" + name +
-						"' is not present but cannot be translated into a null value due to being declared as a " +
-						"primitive type. Consider declaring it as object wrapper for the corresponding primitive type.");
-			}
-		}
-		return value;
-	}
-
-	private WebDataBinder resolveModelAttribute(String attrName, MethodParameter methodParam,
-			ExtendedModelMap implicitModel, NativeWebRequest webRequest, Object handler) throws Exception {
-
-		// Bind request parameter onto object...
-		String name = attrName;
-		if ("".equals(name)) {
-			name = Conventions.getVariableNameForParameter(methodParam);
-		}
-		Class<?> paramType = methodParam.getParameterType();
-		Object bindObject;
-		if (implicitModel.containsKey(name)) {
-			bindObject = implicitModel.get(name);
-		}
-		else if (this.methodResolver.isSessionAttribute(name, paramType)) {
-			bindObject = this.sessionAttributeStore.retrieveAttribute(webRequest, name);
-			if (bindObject == null) {
-				raiseSessionRequiredException("Session attribute '" + name + "' required - not found in session");
-			}
-		}
-		else {
-			bindObject = BeanUtils.instantiateClass(paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, bindObject, name);
-		initBinder(handler, name, binder, webRequest);
-		return binder;
-	}
-
-
-	/**
-	 * Determine whether the given value qualifies as a "binding candidate", i.e. might potentially be subject to
-	 * bean-style data binding later on.
-	 */
-	protected boolean isBindingCandidate(Object value) {
-		return (value != null && !value.getClass().isArray() && !(value instanceof Collection) &&
-				!(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass()));
-	}
-
-	protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception {
-		throw new IllegalStateException("Missing parameter '" + paramName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception {
-		throw new IllegalStateException("Missing header '" + headerName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception {
-		throw new IllegalStateException(
-				"Missing cookie value '" + cookieName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseSessionRequiredException(String message) throws Exception {
-		throw new IllegalStateException(message);
-	}
-
-	protected WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
-			throws Exception {
-
-		return new WebRequestDataBinder(target, objectName);
-	}
-
-	private void doBind(WebDataBinder binder, NativeWebRequest webRequest, boolean validate, boolean failOnErrors)
-			throws Exception {
-
-		doBind(binder, webRequest);
-		if (validate) {
-			binder.validate();
-		}
-		if (failOnErrors && binder.getBindingResult().hasErrors()) {
-			throw new BindException(binder.getBindingResult());
-		}
-	}
-
-	protected void doBind(WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-		((WebRequestDataBinder) binder).bind(webRequest);
-	}
-
-	/**
-	 * Return a {@link HttpInputMessage} for the given {@link NativeWebRequest}.
-	 * <p>Throws an UnsupportedOperation1Exception by default.
-	 */
-	protected HttpInputMessage createHttpInputMessage(NativeWebRequest webRequest) throws Exception {
-		throw new UnsupportedOperationException("@RequestBody not supported");
-	}
-
-	/**
-	 * Return a {@link HttpOutputMessage} for the given {@link NativeWebRequest}.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception {
-		throw new UnsupportedOperationException("@ResponseBody not supported");
-	}
-
-	protected String parseDefaultValueAttribute(String value) {
-		return (ValueConstants.DEFAULT_NONE.equals(value) ? null : value);
-	}
-
-	protected Object resolveDefaultValue(String value) {
-		return value;
-	}
-
-	protected Object resolveCommonArgument(MethodParameter methodParameter, NativeWebRequest webRequest)
-			throws Exception {
-
-		// Invoke custom argument resolvers if present...
-		if (this.customArgumentResolvers != null) {
-			for (WebArgumentResolver argumentResolver : this.customArgumentResolvers) {
-				Object value = argumentResolver.resolveArgument(methodParameter, webRequest);
-				if (value != WebArgumentResolver.UNRESOLVED) {
-					return value;
-				}
-			}
-		}
-
-		// Resolution of standard parameter types...
-		Class paramType = methodParameter.getParameterType();
-		Object value = resolveStandardArgument(paramType, webRequest);
-		if (value != WebArgumentResolver.UNRESOLVED && !ClassUtils.isAssignableValue(paramType, value)) {
-			throw new IllegalStateException("Standard argument type [" + paramType.getName() +
-					"] resolved to incompatible value of type [" + (value != null ? value.getClass() : null) +
-					"]. Consider declaring the argument type in a less specific fashion.");
-		}
-		return value;
-	}
-
-	protected Object resolveStandardArgument(Class<?> parameterType, NativeWebRequest webRequest) throws Exception {
-		if (WebRequest.class.isAssignableFrom(parameterType)) {
-			return webRequest;
-		}
-		return WebArgumentResolver.UNRESOLVED;
-	}
-
-	protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType,
-			Object returnValue, ExtendedModelMap implicitModel) {
-
-		ModelAttribute attr = AnnotationUtils.findAnnotation(handlerMethod, ModelAttribute.class);
-		String attrName = (attr != null ? attr.value() : "");
-		if ("".equals(attrName)) {
-			Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType);
-			attrName = Conventions.getVariableNameForReturnType(handlerMethod, resolvedType, returnValue);
-		}
-		implicitModel.addAttribute(attrName, returnValue);
-	}
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-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.web.servlet;
-
-import java.util.Arrays;
-
-import org.springframework.web.servlet.ModelAndView;
-
-public class ActionExecutedContext extends ActionExecutingContext {
-
-
-	private ModelAndView modelAndView;
-	
-	private Exception exception;
-	
-	public ActionExecutedContext(ActionExecutingContext actionExecutingContext, ModelAndView modelAndView, Exception exception) {
-		super(actionExecutingContext.getServletWebRequest(), actionExecutingContext.getHandler(),
-				actionExecutingContext.getHandlerMethod(), actionExecutingContext.getHandlerParameters(), 
-				actionExecutingContext.getImplicitModel());
-		this.modelAndView = modelAndView;
-		this.exception = exception;
-	}
-
-	@Override
-	public String toString() {
-		return "ActionExecutedContext [handler=" + getHandler()
-				+ ", servletWebRequest=" + getServletWebRequest()
-				+ ", implicitModel=" + getImplicitModel() + ", handlerMethod="
-				+ getHandlerMethod() + ", handlerParameters="
-				+ Arrays.toString(getHandlerParameters()) + ",modelAndView=" + modelAndView
-				+ ", exception=" + exception + "]";
-	}
-	
-
-
-	public ModelAndView getModelAndView() {
-		return modelAndView;
-	}
-
-
-	public Exception getException() {
-		return exception;
-	}
-
-
-	
-	
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2002-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.web.servlet;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.web.context.request.ServletWebRequest;
-
-public class ActionExecutingContext {
-
-	
-	private Object handler;
-	
-	private ServletWebRequest servletWebRequest;
-	
-	private ExtendedModelMap implicitModel;
-	
-	private Method handlerMethod;
-	
-	private Object[] handlerParameters;
-	
-
-	public ActionExecutingContext(ServletWebRequest servletWebRequest,
-			Object handler, Method handlerMethod, Object[] handlerParameters,
-			ExtendedModelMap implicitModel) {
-		super();
-		this.servletWebRequest = servletWebRequest;
-		this.handler = handler;
-		this.handlerMethod = handlerMethod;
-		this.handlerParameters = handlerParameters;
-		this.implicitModel = implicitModel;
-	}
-
-	public HttpServletRequest getHttpServletRequest() {
-		return servletWebRequest.getRequest();
-	}
-
-	public HttpServletResponse getHttpServletResponse() {
-		return servletWebRequest.getResponse();
-	}
-
-	public Object getHandler() {
-		return handler;
-	}
-
-	public ServletWebRequest getServletWebRequest() {
-		return servletWebRequest;
-	}
-
-	public ExtendedModelMap getImplicitModel() {
-		return implicitModel;
-	}
-
-	public Method getHandlerMethod() {
-		return handlerMethod;
-	}
-
-	public Object[] getHandlerParameters() {
-		return handlerParameters;
-	}
-	
-	@Override
-	public String toString() {
-		return "ActionExecutingContext [handler=" + handler
-				+ ", servletWebRequest=" + servletWebRequest
-				+ ", implicitModel=" + implicitModel + ", handlerMethod="
-				+ handlerMethod + ", handlerParameters="
-				+ Arrays.toString(handlerParameters) + "]";
-	}
-	
-
-	
-	
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java

@@ -1,143 +0,0 @@
-/*
- * Copyright 2002-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.web.servlet.mvc.annotation;
-
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.MediaType;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Helper class for annotation-based request mapping.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 2.5.2
- */
-abstract class ServletAnnotationMappingUtils {
-
-	/**
-	 * Check whether the given request matches the specified request methods.
-	 * @param methods the HTTP request methods to check against
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkRequestMethod(RequestMethod[] methods, HttpServletRequest request) {
-		if (ObjectUtils.isEmpty(methods)) {
-			return true;
-		}
-		for (RequestMethod method : methods) {
-			if (method.name().equals(request.getMethod())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given request matches the specified parameter conditions.
-	 * @param params  the parameter conditions, following
-	 *                {@link org.springframework.web.bind.annotation.RequestMapping#params() RequestMapping.#params()}
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkParameters(String[] params, HttpServletRequest request) {
-		if (!ObjectUtils.isEmpty(params)) {
-			for (String param : params) {
-				int separator = param.indexOf('=');
-				if (separator == -1) {
-					if (param.startsWith("!")) {
-						if (WebUtils.hasSubmitParameter(request, param.substring(1))) {
-							return false;
-						}
-					}
-					else if (!WebUtils.hasSubmitParameter(request, param)) {
-						return false;
-					}
-				}
-				else {
-					boolean negated = separator > 0 && param.charAt(separator - 1) == '!';
-					String key = !negated ? param.substring(0, separator) : param.substring(0, separator - 1);
-					String value = param.substring(separator + 1);
-					if (!value.equals(request.getParameter(key))) {
-						return negated;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Check whether the given request matches the specified header conditions.
-	 * @param headers the header conditions, following
-	 *                {@link org.springframework.web.bind.annotation.RequestMapping#headers() RequestMapping.headers()}
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkHeaders(String[] headers, HttpServletRequest request) {
-		if (!ObjectUtils.isEmpty(headers)) {
-			for (String header : headers) {
-				int separator = header.indexOf('=');
-				if (separator == -1) {
-					if (header.startsWith("!")) {
-						if (request.getHeader(header.substring(1)) != null) {
-							return false;
-						}
-					}
-					else if (request.getHeader(header) == null) {
-						return false;
-					}
-				}
-				else {
-					boolean negated = separator > 0 && header.charAt(separator - 1) == '!';
-					String key = !negated ? header.substring(0, separator) : header.substring(0, separator - 1);
-					String value = header.substring(separator + 1);
-					if (isMediaTypeHeader(key)) {
-						List<MediaType> requestMediaTypes = MediaType.parseMediaTypes(request.getHeader(key));
-						List<MediaType> valueMediaTypes = MediaType.parseMediaTypes(value);
-						boolean found = false;
-						for (Iterator<MediaType> valIter = valueMediaTypes.iterator(); valIter.hasNext() && !found;) {
-							MediaType valueMediaType = valIter.next();
-							for (Iterator<MediaType> reqIter = requestMediaTypes.iterator();
-									reqIter.hasNext() && !found;) {
-								MediaType requestMediaType = reqIter.next();
-								if (valueMediaType.includes(requestMediaType)) {
-									found = true;
-								}
-							}
-
-						}
-						if (!found) {
-							return negated;
-						}
-					}
-					else if (!value.equals(request.getHeader(key))) {
-						return negated;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	private static boolean isMediaTypeHeader(String headerName) {
-		return "Accept".equalsIgnoreCase(headerName) || "Content-Type".equalsIgnoreCase(headerName);
-	}
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java

@@ -1,905 +0,0 @@
-/*
- * Copyright 2002-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.web.servlet.mvc.annotation.support;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.BridgeMethodResolver;
-import org.springframework.core.Conventions;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.document.web.servlet.ActionInterceptor;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.ui.Model;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ValueConstants;
-import org.springframework.web.bind.annotation.support.HandlerMethodInvocationException;
-import org.springframework.web.bind.annotation.support.HandlerMethodResolver;
-import org.springframework.web.bind.support.DefaultSessionAttributeStore;
-import org.springframework.web.bind.support.SessionAttributeStore;
-import org.springframework.web.bind.support.SessionStatus;
-import org.springframework.web.bind.support.SimpleSessionStatus;
-import org.springframework.web.bind.support.WebArgumentResolver;
-import org.springframework.web.bind.support.WebBindingInitializer;
-import org.springframework.web.bind.support.WebRequestDataBinder;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-/**
- * Support class for invoking an annotated handler method. Operates on the introspection results of a {@link
- * HandlerMethodResolver} for a specific handler type.
- *
- * <p>Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter} and {@link
- * org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 2.5.2
- * @see #invokeHandlerMethod
- */
-public class InterceptingHandlerMethodInvoker {
-
-	private static final String MODEL_KEY_PREFIX_STALE = SessionAttributeStore.class.getName() + ".STALE.";
-
-	/** We'll create a lot of these objects, so we don't want a new logger every time. */
-	private static final Log logger = LogFactory.getLog(InterceptingHandlerMethodInvoker.class);
-
-	protected final HandlerMethodResolver methodResolver;
-
-	private final WebBindingInitializer bindingInitializer;
-
-	protected final SessionAttributeStore sessionAttributeStore;
-
-	private final ParameterNameDiscoverer parameterNameDiscoverer;
-
-	private final WebArgumentResolver[] customArgumentResolvers;
-
-	private final HttpMessageConverter[] messageConverters;
-	
-	private final ActionInterceptor[] actionInterceptors;
-
-	private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus();
-
-
-	public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver) {
-		this(methodResolver, null);
-	}
-
-	public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer) {
-		this(methodResolver, bindingInitializer, new DefaultSessionAttributeStore(), null, null, null, null);
-	}
-
-	public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer,
-			SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer,
-			WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters, ActionInterceptor[] actionInterceptors) {
-
-		this.methodResolver = methodResolver;
-		this.bindingInitializer = bindingInitializer;
-		this.sessionAttributeStore = sessionAttributeStore;
-		this.parameterNameDiscoverer = parameterNameDiscoverer;
-		this.customArgumentResolvers = customArgumentResolvers;
-		this.messageConverters = messageConverters;
-		this.actionInterceptors = actionInterceptors;
-	}
-	
-	protected ActionInterceptor[] getActionInterceptors() {
-		return actionInterceptors;
-	}
-
-
-	public final Object invokeHandlerMethod(Method handlerMethod, Object handler,
-			NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-		Method handlerMethodToInvoke = BridgeMethodResolver.findBridgedMethod(handlerMethod);
-		try {
-			boolean debug = logger.isDebugEnabled();
-			for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-				Object attrValue = this.sessionAttributeStore.retrieveAttribute(webRequest, attrName);
-				if (attrValue != null) {
-					implicitModel.addAttribute(attrName, attrValue);
-				}
-			}
-			for (Method attributeMethod : this.methodResolver.getModelAttributeMethods()) {
-				Method attributeMethodToInvoke = BridgeMethodResolver.findBridgedMethod(attributeMethod);
-				Object[] args = resolveHandlerArguments(attributeMethodToInvoke, handler, webRequest, implicitModel);
-				if (debug) {
-					logger.debug("Invoking model attribute method: " + attributeMethodToInvoke);
-				}
-				String attrName = AnnotationUtils.findAnnotation(attributeMethod, ModelAttribute.class).value();
-				if (!"".equals(attrName) && implicitModel.containsAttribute(attrName)) {
-					continue;
-				}
-				ReflectionUtils.makeAccessible(attributeMethodToInvoke);
-				Object attrValue = attributeMethodToInvoke.invoke(handler, args);
-				if ("".equals(attrName)) {
-					Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass());
-					attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue);
-				}
-				if (!implicitModel.containsAttribute(attrName)) {
-					implicitModel.addAttribute(attrName, attrValue);
-				}
-			}
-			Object[] args = resolveHandlerArguments(handlerMethodToInvoke, handler, webRequest, implicitModel);
-			if (debug) {
-				logger.debug("Invoking request handler method: " + handlerMethodToInvoke);
-			}
-			ReflectionUtils.makeAccessible(handlerMethodToInvoke);
-			return handlerMethodToInvoke.invoke(handler, args);
-		}
-		catch (IllegalStateException ex) {
-			// Internal assertion failed (e.g. invalid signature):
-			// throw exception with full handler method context...
-			throw new HandlerMethodInvocationException(handlerMethodToInvoke, ex);
-		}
-		catch (InvocationTargetException ex) {
-			// User-defined @ModelAttribute/@InitBinder/@RequestMapping method threw an exception...
-			ReflectionUtils.rethrowException(ex.getTargetException());
-			return null;
-		}
-	}
-
-	public final void updateModelAttributes(Object handler, Map<String, Object> mavModel,
-			ExtendedModelMap implicitModel, NativeWebRequest webRequest) throws Exception {
-
-		if (this.methodResolver.hasSessionAttributes() && this.sessionStatus.isComplete()) {
-			for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-				this.sessionAttributeStore.cleanupAttribute(webRequest, attrName);
-			}
-		}
-
-		// Expose model attributes as session attributes, if required.
-		// Expose BindingResults for all attributes, making custom editors available.
-		Map<String, Object> model = (mavModel != null ? mavModel : implicitModel);
-		if (model != null) {
-			try {
-				String[] originalAttrNames = model.keySet().toArray(new String[model.size()]);
-				for (String attrName : originalAttrNames) {
-					Object attrValue = model.get(attrName);
-					boolean isSessionAttr = this.methodResolver.isSessionAttribute(
-							attrName, (attrValue != null ? attrValue.getClass() : null));
-					if (isSessionAttr) {
-						if (this.sessionStatus.isComplete()) {
-							implicitModel.put(MODEL_KEY_PREFIX_STALE + attrName, Boolean.TRUE);
-						}
-						else if (!implicitModel.containsKey(MODEL_KEY_PREFIX_STALE + attrName)) {
-							this.sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
-						}
-					}
-					if (!attrName.startsWith(BindingResult.MODEL_KEY_PREFIX) &&
-							(isSessionAttr || isBindingCandidate(attrValue))) {
-						String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attrName;
-						if (mavModel != null && !model.containsKey(bindingResultKey)) {
-							WebDataBinder binder = createBinder(webRequest, attrValue, attrName);
-							initBinder(handler, attrName, binder, webRequest);
-							mavModel.put(bindingResultKey, binder.getBindingResult());
-						}
-					}
-				}
-			}
-			catch (InvocationTargetException ex) {
-				// User-defined @InitBinder method threw an exception...
-				ReflectionUtils.rethrowException(ex.getTargetException());
-			}
-		}
-	}
-
-
-	protected Object[] resolveHandlerArguments(Method handlerMethod, Object handler,
-			NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-		Class[] paramTypes = handlerMethod.getParameterTypes();
-		Object[] args = new Object[paramTypes.length];
-
-		for (int i = 0; i < args.length; i++) {
-			MethodParameter methodParam = new MethodParameter(handlerMethod, i);
-			methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-			GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-			String paramName = null;
-			String headerName = null;
-			boolean requestBodyFound = false;
-			String cookieName = null;
-			String pathVarName = null;
-			String attrName = null;
-			boolean required = false;
-			String defaultValue = null;
-			boolean validate = false;
-			int annotationsFound = 0;
-			Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-			for (Annotation paramAnn : paramAnns) {
-				if (RequestParam.class.isInstance(paramAnn)) {
-					RequestParam requestParam = (RequestParam) paramAnn;
-					paramName = requestParam.value();
-					required = requestParam.required();
-					defaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-					annotationsFound++;
-				}
-				else if (RequestHeader.class.isInstance(paramAnn)) {
-					RequestHeader requestHeader = (RequestHeader) paramAnn;
-					headerName = requestHeader.value();
-					required = requestHeader.required();
-					defaultValue = parseDefaultValueAttribute(requestHeader.defaultValue());
-					annotationsFound++;
-				}
-				else if (RequestBody.class.isInstance(paramAnn)) {
-					requestBodyFound = true;
-					annotationsFound++;
-				}
-				else if (CookieValue.class.isInstance(paramAnn)) {
-					CookieValue cookieValue = (CookieValue) paramAnn;
-					cookieName = cookieValue.value();
-					required = cookieValue.required();
-					defaultValue = parseDefaultValueAttribute(cookieValue.defaultValue());
-					annotationsFound++;
-				}
-				else if (PathVariable.class.isInstance(paramAnn)) {
-					PathVariable pathVar = (PathVariable) paramAnn;
-					pathVarName = pathVar.value();
-					annotationsFound++;
-				}
-				else if (ModelAttribute.class.isInstance(paramAnn)) {
-					ModelAttribute attr = (ModelAttribute) paramAnn;
-					attrName = attr.value();
-					annotationsFound++;
-				}
-				else if (Value.class.isInstance(paramAnn)) {
-					defaultValue = ((Value) paramAnn).value();
-				}
-				else if ("Valid".equals(paramAnn.annotationType().getSimpleName())) {
-					validate = true;
-				}
-			}
-
-			if (annotationsFound > 1) {
-				throw new IllegalStateException("Handler parameter annotations are exclusive choices - " +
-						"do not specify more than one such annotation on the same parameter: " + handlerMethod);
-			}
-
-			if (annotationsFound == 0) {
-				Object argValue = resolveCommonArgument(methodParam, webRequest);
-				if (argValue != WebArgumentResolver.UNRESOLVED) {
-					args[i] = argValue;
-				}
-				else if (defaultValue != null) {
-					args[i] = resolveDefaultValue(defaultValue);
-				}
-				else {
-					Class paramType = methodParam.getParameterType();
-					if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
-						args[i] = implicitModel;
-					}
-					else if (SessionStatus.class.isAssignableFrom(paramType)) {
-						args[i] = this.sessionStatus;
-					}
-					else if (HttpEntity.class.isAssignableFrom(paramType)) {
-						args[i] = resolveHttpEntityRequest(methodParam, webRequest);
-					}
-					else if (Errors.class.isAssignableFrom(paramType)) {
-						throw new IllegalStateException("Errors/BindingResult argument declared " +
-								"without preceding model attribute. Check your handler method signature!");
-					}
-					else if (BeanUtils.isSimpleProperty(paramType)) {
-						paramName = "";
-					}
-					else {
-						attrName = "";
-					}
-				}
-			}
-
-			if (paramName != null) {
-				args[i] = resolveRequestParam(paramName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (headerName != null) {
-				args[i] = resolveRequestHeader(headerName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (requestBodyFound) {
-				args[i] = resolveRequestBody(methodParam, webRequest, handler);
-			}
-			else if (cookieName != null) {
-				args[i] = resolveCookieValue(cookieName, required, defaultValue, methodParam, webRequest, handler);
-			}
-			else if (pathVarName != null) {
-				args[i] = resolvePathVariable(pathVarName, methodParam, webRequest, handler);
-			}
-			else if (attrName != null) {
-				WebDataBinder binder =
-						resolveModelAttribute(attrName, methodParam, implicitModel, webRequest, handler);
-				boolean assignBindingResult = (args.length > i + 1 && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-				if (binder.getTarget() != null) {
-					doBind(binder, webRequest, validate, !assignBindingResult);
-				}
-				args[i] = binder.getTarget();
-				if (assignBindingResult) {
-					args[i + 1] = binder.getBindingResult();
-					i++;
-				}
-				implicitModel.putAll(binder.getBindingResult().getModel());
-			}
-		}
-
-		return args;
-	}
-
-	protected void initBinder(Object handler, String attrName, WebDataBinder binder, NativeWebRequest webRequest)
-			throws Exception {
-
-		if (this.bindingInitializer != null) {
-			this.bindingInitializer.initBinder(binder, webRequest);
-		}
-		if (handler != null) {
-			Set<Method> initBinderMethods = this.methodResolver.getInitBinderMethods();
-			if (!initBinderMethods.isEmpty()) {
-				boolean debug = logger.isDebugEnabled();
-				for (Method initBinderMethod : initBinderMethods) {
-					Method methodToInvoke = BridgeMethodResolver.findBridgedMethod(initBinderMethod);
-					String[] targetNames = AnnotationUtils.findAnnotation(initBinderMethod, InitBinder.class).value();
-					if (targetNames.length == 0 || Arrays.asList(targetNames).contains(attrName)) {
-						Object[] initBinderArgs =
-								resolveInitBinderArguments(handler, methodToInvoke, binder, webRequest);
-						if (debug) {
-							logger.debug("Invoking init-binder method: " + methodToInvoke);
-						}
-						ReflectionUtils.makeAccessible(methodToInvoke);
-						Object returnValue = methodToInvoke.invoke(handler, initBinderArgs);
-						if (returnValue != null) {
-							throw new IllegalStateException(
-									"InitBinder methods must not have a return value: " + methodToInvoke);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod,
-			WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-
-		Class[] initBinderParams = initBinderMethod.getParameterTypes();
-		Object[] initBinderArgs = new Object[initBinderParams.length];
-
-		for (int i = 0; i < initBinderArgs.length; i++) {
-			MethodParameter methodParam = new MethodParameter(initBinderMethod, i);
-			methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-			GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-			String paramName = null;
-			boolean paramRequired = false;
-			String paramDefaultValue = null;
-			String pathVarName = null;
-			Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-			for (Annotation paramAnn : paramAnns) {
-				if (RequestParam.class.isInstance(paramAnn)) {
-					RequestParam requestParam = (RequestParam) paramAnn;
-					paramName = requestParam.value();
-					paramRequired = requestParam.required();
-					paramDefaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-					break;
-				}
-				else if (ModelAttribute.class.isInstance(paramAnn)) {
-					throw new IllegalStateException(
-							"@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
-				}
-				else if (PathVariable.class.isInstance(paramAnn)) {
-					PathVariable pathVar = (PathVariable) paramAnn;
-					pathVarName = pathVar.value();
-				}
-			}
-
-			if (paramName == null && pathVarName == null) {
-				Object argValue = resolveCommonArgument(methodParam, webRequest);
-				if (argValue != WebArgumentResolver.UNRESOLVED) {
-					initBinderArgs[i] = argValue;
-				}
-				else {
-					Class paramType = initBinderParams[i];
-					if (paramType.isInstance(binder)) {
-						initBinderArgs[i] = binder;
-					}
-					else if (BeanUtils.isSimpleProperty(paramType)) {
-						paramName = "";
-					}
-					else {
-						throw new IllegalStateException("Unsupported argument [" + paramType.getName() +
-								"] for @InitBinder method: " + initBinderMethod);
-					}
-				}
-			}
-
-			if (paramName != null) {
-				initBinderArgs[i] =
-						resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
-			}
-			else if (pathVarName != null) {
-				initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
-			}
-		}
-
-		return initBinderArgs;
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object resolveRequestParam(String paramName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) {
-			return resolveRequestParamMap((Class<? extends Map>) paramType, webRequest);
-		}
-		if (paramName.length() == 0) {
-			paramName = getRequiredParameterName(methodParam);
-		}
-		Object paramValue = null;
-		MultipartRequest multipartRequest = webRequest.getNativeRequest(MultipartRequest.class);
-		if (multipartRequest != null) {
-			List<MultipartFile> files = multipartRequest.getFiles(paramName);
-			if (!files.isEmpty()) {
-				if (files.size() == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-					paramValue = files.get(0);
-				}
-				else {
-					paramValue = files;
-				}
-			}
-		}
-		if (paramValue == null) {
-			String[] paramValues = webRequest.getParameterValues(paramName);
-			if (paramValues != null) {
-				if (paramValues.length == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-					paramValue = paramValues[0];
-				}
-				else {
-					paramValue = paramValues;
-				}
-			}
-		}
-		if (paramValue == null) {
-			if (defaultValue != null) {
-				paramValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingParameterException(paramName, paramType);
-			}
-			paramValue = checkValue(paramName, paramValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, paramName);
-		initBinder(handlerForInitBinderCall, paramName, binder, webRequest);
-		return binder.convertIfNecessary(paramValue, paramType, methodParam);
-	}
-
-	private Map resolveRequestParamMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-		Map<String, String[]> parameterMap = webRequest.getParameterMap();
-		if (MultiValueMap.class.isAssignableFrom(mapType)) {
-			MultiValueMap<String, String> result = new LinkedMultiValueMap<String, String>(parameterMap.size());
-			for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-				for (String value : entry.getValue()) {
-					result.add(entry.getKey(), value);
-				}
-			}
-			return result;
-		}
-		else {
-			Map<String, String> result = new LinkedHashMap<String, String>(parameterMap.size());
-			for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-				if (entry.getValue().length > 0) {
-					result.put(entry.getKey(), entry.getValue()[0]);
-				}
-			}
-			return result;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object resolveRequestHeader(String headerName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (Map.class.isAssignableFrom(paramType)) {
-			return resolveRequestHeaderMap((Class<? extends Map>) paramType, webRequest);
-		}
-		if (headerName.length() == 0) {
-			headerName = getRequiredParameterName(methodParam);
-		}
-		Object headerValue = null;
-		String[] headerValues = webRequest.getHeaderValues(headerName);
-		if (headerValues != null) {
-			headerValue = (headerValues.length == 1 ? headerValues[0] : headerValues);
-		}
-		if (headerValue == null) {
-			if (defaultValue != null) {
-				headerValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingHeaderException(headerName, paramType);
-			}
-			headerValue = checkValue(headerName, headerValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, headerName);
-		initBinder(handlerForInitBinderCall, headerName, binder, webRequest);
-		return binder.convertIfNecessary(headerValue, paramType, methodParam);
-	}
-
-	private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-		if (MultiValueMap.class.isAssignableFrom(mapType)) {
-			MultiValueMap<String, String> result;
-			if (HttpHeaders.class.isAssignableFrom(mapType)) {
-				result = new HttpHeaders();
-			}
-			else {
-				result = new LinkedMultiValueMap<String, String>();
-			}
-			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-				String headerName = iterator.next();
-				for (String headerValue : webRequest.getHeaderValues(headerName)) {
-					result.add(headerName, headerValue);
-				}
-			}
-			return result;
-		}
-		else {
-			Map<String, String> result = new LinkedHashMap<String, String>();
-			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-				String headerName = iterator.next();
-				String headerValue = webRequest.getHeader(headerName);
-				result.put(headerName, headerValue);
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * Resolves the given {@link RequestBody @RequestBody} annotation.
-	 */
-	protected Object resolveRequestBody(MethodParameter methodParam, NativeWebRequest webRequest, Object handler)
-			throws Exception {
-
-		return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType());
-	}
-
-	private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest)
-			throws Exception {
-
-		HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
-		Class<?> paramType = getHttpEntityType(methodParam);
-		Object body = readWithMessageConverters(methodParam, inputMessage, paramType);
-		return new HttpEntity<Object>(body, inputMessage.getHeaders());
-	}
-
-	private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType)
-			throws Exception {
-
-		MediaType contentType = inputMessage.getHeaders().getContentType();
-		if (contentType == null) {
-			StringBuilder builder = new StringBuilder(ClassUtils.getShortName(methodParam.getParameterType()));
-			String paramName = methodParam.getParameterName();
-			if (paramName != null) {
-				builder.append(' ');
-				builder.append(paramName);
-			}
-			throw new HttpMediaTypeNotSupportedException(
-					"Cannot extract parameter (" + builder.toString() + "): no Content-Type found");
-		}
-
-		List<MediaType> allSupportedMediaTypes = new ArrayList<MediaType>();
-		if (this.messageConverters != null) {
-			for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
-				allSupportedMediaTypes.addAll(messageConverter.getSupportedMediaTypes());
-				if (messageConverter.canRead(paramType, contentType)) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Reading [" + paramType.getName() + "] as \"" + contentType
-								+"\" using [" + messageConverter + "]");
-					}
-					return messageConverter.read(paramType, inputMessage);
-				}
-			}
-		}
-		throw new HttpMediaTypeNotSupportedException(contentType, allSupportedMediaTypes);
-	}
-
-	private Class<?> getHttpEntityType(MethodParameter methodParam) {
-		Assert.isAssignable(HttpEntity.class, methodParam.getParameterType());
-		ParameterizedType type = (ParameterizedType) methodParam.getGenericParameterType();
-		if (type.getActualTypeArguments().length == 1) {
-			Type typeArgument = type.getActualTypeArguments()[0];
-			if (typeArgument instanceof Class) {
-				return (Class<?>) typeArgument;
-			}
-			else if (typeArgument instanceof GenericArrayType) {
-				Type componentType = ((GenericArrayType) typeArgument).getGenericComponentType();
-				if (componentType instanceof Class) {
-					// Surely, there should be a nicer way to do this
-					Object array = Array.newInstance((Class<?>) componentType, 0);
-					return array.getClass();
-				}
-			}
-		}
-		throw new IllegalArgumentException(
-				"HttpEntity parameter (" + methodParam.getParameterName() + ") is not parameterized");
-		
-	}
-
-	private Object resolveCookieValue(String cookieName, boolean required, String defaultValue,
-			MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-			throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (cookieName.length() == 0) {
-			cookieName = getRequiredParameterName(methodParam);
-		}
-		Object cookieValue = resolveCookieValue(cookieName, paramType, webRequest);
-		if (cookieValue == null) {
-			if (defaultValue != null) {
-				cookieValue = resolveDefaultValue(defaultValue);
-			}
-			else if (required) {
-				raiseMissingCookieException(cookieName, paramType);
-			}
-			cookieValue = checkValue(cookieName, cookieValue, paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, null, cookieName);
-		initBinder(handlerForInitBinderCall, cookieName, binder, webRequest);
-		return binder.convertIfNecessary(cookieValue, paramType, methodParam);
-	}
-
-	/**
-	 * Resolves the given {@link CookieValue @CookieValue} annotation.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest)
-			throws Exception {
-
-		throw new UnsupportedOperationException("@CookieValue not supported");
-	}
-
-	private Object resolvePathVariable(String pathVarName, MethodParameter methodParam,
-			NativeWebRequest webRequest, Object handlerForInitBinderCall) throws Exception {
-
-		Class<?> paramType = methodParam.getParameterType();
-		if (pathVarName.length() == 0) {
-			pathVarName = getRequiredParameterName(methodParam);
-		}
-		String pathVarValue = resolvePathVariable(pathVarName, paramType, webRequest);
-		WebDataBinder binder = createBinder(webRequest, null, pathVarName);
-		initBinder(handlerForInitBinderCall, pathVarName, binder, webRequest);
-		return binder.convertIfNecessary(pathVarValue, paramType, methodParam);
-	}
-
-	/**
-	 * Resolves the given {@link PathVariable @PathVariable} annotation.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest)
-			throws Exception {
-
-		throw new UnsupportedOperationException("@PathVariable not supported");
-	}
-
-	private String getRequiredParameterName(MethodParameter methodParam) {
-		String name = methodParam.getParameterName();
-		if (name == null) {
-			throw new IllegalStateException(
-					"No parameter name specified for argument of type [" + methodParam.getParameterType().getName() +
-							"], and no parameter name information found in class file either.");
-		}
-		return name;
-	}
-
-	private Object checkValue(String name, Object value, Class paramType) {
-		if (value == null) {
-			if (boolean.class.equals(paramType)) {
-				return Boolean.FALSE;
-			}
-			else if (paramType.isPrimitive()) {
-				throw new IllegalStateException("Optional " + paramType + " parameter '" + name +
-						"' is not present but cannot be translated into a null value due to being declared as a " +
-						"primitive type. Consider declaring it as object wrapper for the corresponding primitive type.");
-			}
-		}
-		return value;
-	}
-
-	private WebDataBinder resolveModelAttribute(String attrName, MethodParameter methodParam,
-			ExtendedModelMap implicitModel, NativeWebRequest webRequest, Object handler) throws Exception {
-
-		// Bind request parameter onto object...
-		String name = attrName;
-		if ("".equals(name)) {
-			name = Conventions.getVariableNameForParameter(methodParam);
-		}
-		Class<?> paramType = methodParam.getParameterType();
-		Object bindObject;
-		if (implicitModel.containsKey(name)) {
-			bindObject = implicitModel.get(name);
-		}
-		else if (this.methodResolver.isSessionAttribute(name, paramType)) {
-			bindObject = this.sessionAttributeStore.retrieveAttribute(webRequest, name);
-			if (bindObject == null) {
-				raiseSessionRequiredException("Session attribute '" + name + "' required - not found in session");
-			}
-		}
-		else {
-			bindObject = BeanUtils.instantiateClass(paramType);
-		}
-		WebDataBinder binder = createBinder(webRequest, bindObject, name);
-		initBinder(handler, name, binder, webRequest);
-		return binder;
-	}
-
-
-	/**
-	 * Determine whether the given value qualifies as a "binding candidate", i.e. might potentially be subject to
-	 * bean-style data binding later on.
-	 */
-	protected boolean isBindingCandidate(Object value) {
-		return (value != null && !value.getClass().isArray() && !(value instanceof Collection) &&
-				!(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass()));
-	}
-
-	protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception {
-		throw new IllegalStateException("Missing parameter '" + paramName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception {
-		throw new IllegalStateException("Missing header '" + headerName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception {
-		throw new IllegalStateException(
-				"Missing cookie value '" + cookieName + "' of type [" + paramType.getName() + "]");
-	}
-
-	protected void raiseSessionRequiredException(String message) throws Exception {
-		throw new IllegalStateException(message);
-	}
-
-	protected WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
-			throws Exception {
-
-		return new WebRequestDataBinder(target, objectName);
-	}
-
-	private void doBind(WebDataBinder binder, NativeWebRequest webRequest, boolean validate, boolean failOnErrors)
-			throws Exception {
-
-		doBind(binder, webRequest);
-		if (validate) {
-			binder.validate();
-		}
-		if (failOnErrors && binder.getBindingResult().hasErrors()) {
-			throw new BindException(binder.getBindingResult());
-		}
-	}
-
-	protected void doBind(WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-		((WebRequestDataBinder) binder).bind(webRequest);
-	}
-
-	/**
-	 * Return a {@link HttpInputMessage} for the given {@link NativeWebRequest}.
-	 * <p>Throws an UnsupportedOperation1Exception by default.
-	 */
-	protected HttpInputMessage createHttpInputMessage(NativeWebRequest webRequest) throws Exception {
-		throw new UnsupportedOperationException("@RequestBody not supported");
-	}
-
-	/**
-	 * Return a {@link HttpOutputMessage} for the given {@link NativeWebRequest}.
-	 * <p>Throws an UnsupportedOperationException by default.
-	 */
-	protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception {
-		throw new UnsupportedOperationException("@ResponseBody not supported");
-	}
-
-	protected String parseDefaultValueAttribute(String value) {
-		return (ValueConstants.DEFAULT_NONE.equals(value) ? null : value);
-	}
-
-	protected Object resolveDefaultValue(String value) {
-		return value;
-	}
-
-	protected Object resolveCommonArgument(MethodParameter methodParameter, NativeWebRequest webRequest)
-			throws Exception {
-
-		// Invoke custom argument resolvers if present...
-		if (this.customArgumentResolvers != null) {
-			for (WebArgumentResolver argumentResolver : this.customArgumentResolvers) {
-				Object value = argumentResolver.resolveArgument(methodParameter, webRequest);
-				if (value != WebArgumentResolver.UNRESOLVED) {
-					return value;
-				}
-			}
-		}
-
-		// Resolution of standard parameter types...
-		Class paramType = methodParameter.getParameterType();
-		Object value = resolveStandardArgument(paramType, webRequest);
-		if (value != WebArgumentResolver.UNRESOLVED && !ClassUtils.isAssignableValue(paramType, value)) {
-			throw new IllegalStateException("Standard argument type [" + paramType.getName() +
-					"] resolved to incompatible value of type [" + (value != null ? value.getClass() : null) +
-					"]. Consider declaring the argument type in a less specific fashion.");
-		}
-		return value;
-	}
-
-	protected Object resolveStandardArgument(Class<?> parameterType, NativeWebRequest webRequest) throws Exception {
-		if (WebRequest.class.isAssignableFrom(parameterType)) {
-			return webRequest;
-		}
-		return WebArgumentResolver.UNRESOLVED;
-	}
-
-	protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType,
-			Object returnValue, ExtendedModelMap implicitModel) {
-
-		ModelAttribute attr = AnnotationUtils.findAnnotation(handlerMethod, ModelAttribute.class);
-		String attrName = (attr != null ? attr.value() : "");
-		if ("".equals(attrName)) {
-			Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType);
-			attrName = Conventions.getVariableNameForReturnType(handlerMethod, resolvedType, returnValue);
-		}
-		implicitModel.addAttribute(attrName, returnValue);
-	}
-
-}

spring-data-document-core/template.mf

@@ -1,32 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.document
-Bundle-Name: Spring Data Document
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
-Import-Template: 
- javax.servlet;version="[2.4.0, 4.0.0)",
- javax.servlet.http;version="[2.4.0, 4.0.0)",
- org.springframework.http.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.converter.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.server*;version="[3.0.0, 4.0.0)",
- org.springframework.ui.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.context.request.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.support.*;version="[3.0.0, 4.0.0)",
- 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.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- 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/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-parent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

spring-data-document-parent/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Tue Jun 29 21:59:00 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-document-parent/pom.xml

@@ -1,383 +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.M1</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.springframework.version>3.0.5.RELEASE</org.springframework.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>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-tx</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-document-core</artifactId>
-				<version>${project.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>
-			</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>2.0.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:all</compilerArgument>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
-				</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>
-	</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

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-mongodb-parent</artifactId>
+    <version>1.1.0.RELEASE</version>
+    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-mongodb-cross-store</artifactId>
+  <name>Spring Data MongoDB Cross-store Persistence Support</name>
+  <dependencies>
+
+    <!--  Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${org.springframework.version.range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${org.springframework.version.range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aspects</artifactId>
+      <version>${org.springframework.version.range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>${org.springframework.version.range}</version>
+    </dependency>
+
+    <!--  Spring Data -->
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons-core</artifactId>
+      <version>${data.commons.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-mongodb</artifactId>
+      <version>1.1.0.RELEASE</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>${aspectj.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.2</version>
+    </dependency>
+
+    <!-- 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>
+
+  <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>
+
+</project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * 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.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.springframework.data.mongodb.crossstore;
 
-package org.springframework.data.document;
+import org.springframework.data.crossstore.ChangeSetBacked;
 
-public interface DocumentStoreConnectionCallback<C, T> {
+public interface DocumentBacked extends ChangeSetBacked {
 
-	T doInConnection(C con) throws Exception;
 }

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

@@ -0,0 +1,176 @@
+/*
+ * 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 javax.persistence.EntityManagerFactory;
+
+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.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;
+
+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());
+		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;
+	}
+
+	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
+		return ClassUtils.getQualifiedName(entityClass);
+	}
+
+}

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

@@ -0,0 +1,271 @@
+/*
+ * 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.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.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 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 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

@@ -0,0 +1,29 @@
+/*
+ * 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.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Thomas Risberg
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD })
+public @interface RelatedDocument {
+}

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

@@ -0,0 +1,167 @@
+/*
+ * 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 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.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.crossstore.test.Address;
+import org.springframework.data.mongodb.crossstore.test.Person;
+import org.springframework.data.mongodb.crossstore.test.Resume;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.PlatformTransactionManager;
+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/mongodb/crossstore/test/Address.java

@@ -0,0 +1,75 @@
+/*
+ * 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) {
+		super();
+		this.streetNumber = streetNumber;
+		this.streetName = streetName;
+		this.city = city;
+		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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             version="2.0"
+             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.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-->
+      <property name="hibernate.hbm2ddl.auto" value="update"/>
+      <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>
+    </properties>
+  </persistence-unit>
+</persistence>

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

@@ -0,0 +1,72 @@
+<?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:tx="http://www.springframework.org/schema/tx"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+  <context:spring-configured/>
+
+  <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.mongodb.core.MongoFactoryBean">
+    <property name="host" value="localhost"/>
+    <property name="port" value="27017"/>
+  </bean>
+
+  <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.mongodb.core.MongoTemplate">
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
+  </bean>
+
+  <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
+
+  <!--  Mongo aspect config -->
+  <bean class="org.springframework.data.mongodb.crossstore.MongoDocumentBacking"
+        factory-method="aspectOf">
+    <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
+  </bean>
+  <bean id="mongoChangeSetPersister" 
+      class="org.springframework.data.mongodb.crossstore.MongoChangeSetPersister">
+    <property name="mongoTemplate" ref="mongoTemplate"/>
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <jdbc:embedded-database id="dataSource" type="HSQL">
+  </jdbc:embedded-database>
+
+  <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
+
+  <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
+    <property name="persistenceUnitName" value="test"/>
+    <property name="dataSource" ref="dataSource"/>
+    <property name="jpaVendorAdapter">
+      <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+        <property name="showSql" value="true"/>
+        <property name="generateDdl" value="true"/>
+        <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect"/>
+      </bean>
+    </property>
+  </bean>
+
+</beans>

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

@@ -0,0 +1,12 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
+
+log4j.category.org.springframework=INFO
+log4j.category.org.springframework.data=TRACE
+
+log4j.category.org.hibernate.SQL=DEBUG
+# for debugging datasource initialization
+# log4j.category.test.jdbc=DEBUG

spring-data-mongodb-log4j/README.md

@@ -0,0 +1,52 @@
+# MongoDB Log4J Appender
+
+This module sets up a Log4J appender that puts logging events in MongoDB. It is fully configurable
+and connects directly to the MongoDB server using the driver. It has no dependency on any Spring package.
+
+To use it, configure a host, port, (optionally) applicationId, and database property in your Log4J configuration:
+
+    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
+    log4j.appender.stdout.port = 27017
+    log4j.appender.stdout.database = logs
+    log4j.appender.stdout.collectionPattern = %c
+    log4j.appender.stdout.applicationId = my.application
+    log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
+
+It will even support properties in your MDC (so long as they're Strings or support .toString()).
+
+The collection name is configurable as well. If you don't specify anything, it will use the Category name.
+If you want to specify a collection name, you can give it a Log4J pattern layout format string which will have
+the following additional MDC variables in the context when the collection name is rendered:
+
+    "year" = Calendar.YEAR
+    "month" = Calendar.MONTH + 1
+    "day" = Calendar.DAY_OF_MONTH
+    "hour" = Calendar.HOUR_OF_DAY
+    "applicationId" = configured applicationId
+
+An example log entry might look like:
+
+    {
+      "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
+      "applicationId" : "my.application",
+      "name" : "org.springframework.data.mongodb.log4j.AppenderTest",
+      "level" : "DEBUG",
+      "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
+      "properties" : {
+        "property" : "one"
+      },
+      "message" : "DEBUG message"
+    }
+
+To set WriteConcern levels for WARN or higher messages, set warnOrHigherWriteConcern to one of the following:
+
+* FSYNC_SAFE
+* NONE
+* NORMAL
+* REPLICAS_SAFE
+* SAFE
+
+[http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail](http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail)

spring-data-mongodb-log4j/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-mongodb-parent</artifactId>
+    <version>1.1.0.RELEASE</version>
+    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-mongodb-log4j</artifactId>
+  <name>Spring Data MongoDB Log4J Appender</name>
+
+  <dependencies>
+
+    <!-- MongoDB -->
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+      <version>${mongo.version}</version>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.springsource.bundlor</groupId>
+        <artifactId>com.springsource.bundlor.maven</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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

@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.mongodb.log4j;
+
+import 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/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.mongodb.log4j;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.net.UnknownHostException;
+import java.util.Calendar;
+
+import com.mongodb.DB;
+import com.mongodb.DBCursor;
+import com.mongodb.Mongo;
+import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ */
+public class AppenderTest {
+
+  private static final String NAME = AppenderTest.class.getName();
+  private Logger log = Logger.getLogger(NAME);
+  private Mongo mongo;
+  private DB db;
+  private String collection;
+
+  @Before
+  public void setup() {
+    try {
+      mongo = new Mongo("localhost", 27017);
+      db = mongo.getDB("logs");
+      Calendar now = Calendar.getInstance();
+      collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
+      db.getCollection(collection).drop();
+    } catch (UnknownHostException e) {
+      throw new RuntimeException(e.getMessage(), e);
+    }
+  }
+
+  @Test
+  public void testLogging() {
+    log.debug("DEBUG message");
+    log.info("INFO message");
+    log.warn("WARN message");
+    log.error("ERROR message");
+
+    DBCursor msgs = db.getCollection(collection).find();
+    assertThat(msgs.count(), is(4));
+
+  }
+
+  @Test
+  public void testProperties() {
+    MDC.put("property", "one");
+    log.debug("DEBUG message");
+  }
+
+}

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

@@ -0,0 +1,20 @@
+log4j.rootCategory=INFO, stdout
+
+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
+log4j.appender.stdout.port = 27017
+log4j.appender.stdout.database = logs
+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

spring-data-mongodb-log4j/template.mf

@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.springframework.data.mongodb.log4j
+Bundle-Name: Spring Data Mongo DB Log4J Appender
+Bundle-Vendor: SpringSource
+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)"

spring-data-mongodb-parent/pom.xml

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

spring-data-mongodb/.classpath

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/main/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/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-mongodb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

spring-data-mongodb/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +0,0 @@
-#Thu Oct 14 10:28:36 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-mongodb/.settings/org.eclipse.wst.common.component

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-data-mongodb">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>

spring-data-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>

spring-data-mongodb/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<context version="7.0.3.1152">
+    <scope name="spring-data-mongodb" type="Project">
+        <element name="Filter" type="TypeFilterReferenceOverridden">
+            <element name="org.springframework.data.mongodb.**" type="IncludeTypePattern"/>
+        </element>
+        <architecture>
+            <element name="Config" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.config.**" type="WeakTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Monitoring"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories"/>
+            </element>
+            <element name="Repositories" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.repository.**" type="IncludeTypePattern"/>
+                </element>
+                <element name="API" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.repository.*" type="IncludeTypePattern"/>
+                    </element>
+                </element>
+                <element name="Query" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.query.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                </element>
+                <element name="Implementation" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.support.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query"/>
+                </element>
+                <element name="Config" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.config.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
+            <element name="Monitoring" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.monitor.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
+            <element name="GridFS" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
+            <element name="Core" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.core.**" type="IncludeTypePattern"/>
+                </element>
+                <element name="Mapping" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.mapping.**" type="IncludeTypePattern"/>
+                    </element>
+                </element>
+                <element name="Geospatial" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.geo.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                </element>
+                <element name="Query" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.query.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                </element>
+                <element name="Index" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.index.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                </element>
+                <element name="Core" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.core.**" type="WeakTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                </element>
+            </element>
+        </architecture>
+        <workspace>
+            <element name="src/main/java" type="JavaRootDirectory">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+            <element name="target/classes" type="JavaRootDirectory">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+        </workspace>
+        <physical>
+            <element name="spring-data-mongodb" type="BuildUnit"/>
+        </physical>
+    </scope>
+    <scope name="External" type="External">
+        <element name="Filter" type="TypeFilter">
+            <element name="**" type="IncludeTypePattern"/>
+            <element name="java.**" type="ExcludeTypePattern"/>
+            <element name="javax.**" type="ExcludeTypePattern"/>
+        </element>
+        <architecture>
+            <element name="Spring" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.springframework.**" type="IncludeTypePattern"/>
+                    <element name="org.springframework.data.**" type="ExcludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Spring Data Core" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.springframework.data.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Mongo Java Driver" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="com.mongodb.**" type="IncludeTypePattern"/>
+                    <element name="org.bson.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Querydsl" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="com.mysema.query.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+        </architecture>
+    </scope>
+    <scope name="Global" type="Global">
+        <element name="Configuration" type="Configuration"/>
+        <element name="Filter" type="TypeFilter">
+            <element name="**" type="IncludeTypePattern"/>
+        </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,121 +1,194 @@
-<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/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.M1</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>1.1.0.RELEASE</version>
+		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data MongoDB Support</name>
+	<name>Spring Data MongoDB</name>
+
+	<properties>
+		<querydsl.version>2.8.0</querydsl.version>
+		<cdi.version>1.0</cdi.version>
+		<validation.version>1.0.0.GA</validation.version>
+		<webbeans.version>1.1.3</webbeans.version>
+	</properties>
+
 	<dependencies>
 
 		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
+			<version>${org.springframework.version.range}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-context</artifactId>
+			<version>${org.springframework.version.range}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${org.springframework.version.range}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${org.springframework.version.range}</version>
+			<exclusions>
+				<exclusion>
+          			<groupId>commons-logging</groupId>
+          			<artifactId>commons-logging</artifactId>
+        		</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+			<version>${org.springframework.version.range}</version>
 		</dependency>
 
 		<!--  Spring Data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-document-core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons-core</artifactId>
-			<version>1.0.0.M3</version>
+			<version>${data.commons.version}</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>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<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>
-		</dependency>
-		
-		
 		<!-- MongoDB -->
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
-			<version>2.3</version>
+			<version>${mongo.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-mongodb</artifactId>
+			<version>${querydsl.version}</version>
+			<optional>true</optional>
+		</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}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>${cdi.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>${webbeans.version}</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}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
+	
+	<profiles>
+		<profile>
+			<id>performance-tests</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>2.8</version>
+						<configuration>
+							<includes>
+								<include>**/PerformanceTests.java</include>
+							</includes>
+							<excludes>
+								<exclude>none</exclude>
+							</excludes>
+							<junitArtifactName>junit:junit-dep</junitArtifactName>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>com.springsource.bundlor</groupId>
 				<artifactId>com.springsource.bundlor.maven</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>com.mysema.maven</groupId>
+				<artifactId>maven-apt-plugin</artifactId>
+				<version>1.0.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.mysema.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl.version}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<phase>generate-test-sources</phase>
+						<goals>
+							<goal>test-process</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/generated-test-sources</outputDirectory>
+							<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
+	
 </project>

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

@@ -1,83 +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 static org.springframework.beans.PropertyAccessorFactory.*;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.ConfigurablePropertyAccessor;
-import org.springframework.core.convert.ConversionService;
-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;
-
-	/**
-	 * 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.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);
-		accessor.setPropertyValue(descriptor.getName(), value);
-	}
-}

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

@@ -1,41 +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 org.bson.types.ObjectId;
-
-
-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);
-}

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

@@ -1,166 +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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes.
- *
- * <p>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.debug("Opening Mongo DB");
-		DB db = mongo.getDB(databaseName);
-		boolean creadentialsGiven = username != null && password != null;
-		
-		if(creadentialsGiven && !db.authenticate(username, password)) {
-			throw new CannotGetMongoDbConnectionException("Failed to authenticate with Mongo using the given credentials");
-		}
-		
-		// 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,137 +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 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;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoOptions;
-import com.mongodb.ServerAddress;
-
-/**
- * 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,619 +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 java.util.Set;
-
-import org.springframework.data.document.mongodb.query.IndexDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.Update;
-
-import com.mongodb.CommandResult;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.WriteResult;
-
-/**
- * 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 default collection name used by this template.
-	 * @return
-	 */
-	String getDefaultCollectionName();
-
-	/**
-	 * The default collection used by this template.
-	 * @return The default collection used by this template
-	 */
-	DBCollection getDefaultCollection();
-	
-	/**
-	 * 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.
-	 * 
-	 * 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 default collection.
-	 * 
-	 * 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 action  
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> T execute(CollectionCallback<T> action);
-
-	/**
-	 * Executes the given {@link CollectionCallback} on the collection of the given name.
-	 * 
-	 * 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>}
-	 * 
-	 * 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 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.
-	 * 
-	 * 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 given name exists.
-	 * 
-	 * 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 given name.
-	 * 
-	 * 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 default collection.  
-	 * 
-	 * 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.  
-	 * 
-	 * 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 targetClass the parameterized type of the returned list
-	 * @return the converted collection
-	 */
-	<T> List<T> getCollection(Class<T> targetClass);
-
-	/**
-	 * Query for a list of objects of type T from the specified collection.  
-	 * 
-	 * 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.  
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @return the converted collection
-	 */
-	<T> List<T> getCollection(String collectionName, Class<T> targetClass);
-
-	/**
-	 * Query for a list of objects of type T from the specified collection, mapping the DBObject using
-	 * the provided MongoReader.
-	 * 
-	 * @param collectionName name of the collection to retrieve the objects from 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @param reader the MongoReader to convert from DBObject to an object.
-	 * @return the converted collection
-	 */
-	<T> List<T> getCollection(String collectionName, Class<T> targetClass,
-			MongoReader<T> reader);
-	
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists for the default collection. 
-	 * If not it will be created.
-	 * 
-	 * @param index
-	 */
-	void ensureIndex(IndexDefinition indexDefinition);
-
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists. If not it will be
-	 * created.
-	 * 
-	 * @param collectionName
-	 * @param index
-	 */
-	void ensureIndex(String collectionName, IndexDefinition indexDefinition);
-
-	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object 
-	 * of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 targetClass the parameterized type of the returned list.
-	 * @return the converted object
-	 */
-	<T> T findOne(Query query, Class<T> targetClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object 
-	 * of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 targetClass the parameterized type of the returned list.
-	 * @param reader the MongoReader to convert from DBObject to an object.
-	 * @return the converted object
-	 */
-	<T> T findOne(Query query, Class<T> targetClass,
-			MongoReader<T> reader);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object 
-	 * of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from	 
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields specification 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @return the converted object
-	 */
-	<T> T findOne(String collectionName, Query query,
-			Class<T> targetClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object 
-	 * of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from	 
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields specification 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @param reader the MongoReader to convert from DBObject to an object.
-	 * @return the converted object
-	 */
-	<T> T findOne(String collectionName, Query query,
-			Class<T> targetClass, MongoReader<T> reader);
-
-	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 targetClass the parameterized type of the returned list.
-	 * @return the List of converted objects
-	 */
-	<T> List<T> find(Query query, Class<T> targetClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 targetClass the parameterized type of the returned list.
-	 * @param reader the MongoReader to convert from DBObject to an object.
-	 * @return the List of converted objects
-	 */
-	<T> List<T> find(Query query, Class<T> targetClass,
-			MongoReader<T> reader);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from	 
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields specification 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @return the List of converted objects
-	 */
-	<T> List<T> find(String collectionName, Query query,
-			Class<T> targetClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-	 *
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from	 
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields specification 
-	 * @param targetClass the parameterized type of the returned list.
-	 * @param reader the MongoReader to convert from DBObject to an object.
-	 * @return the List of converted objects
-	 */
-	<T> List<T> find(String collectionName, Query query,
-			Class<T> targetClass, MongoReader<T> reader);
-
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-	 * 
-	 * The object is converted from the MongoDB native representation using an instance of 
-	 * {@see MongoConverter}.  Unless configured otherwise, an
-	 * instance of SimpleMongoConverter will be used.   
-	 * 
-	 * 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 collectionName name of the collection to retrieve the objects from
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields specification 
-	 * @param targetClass 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).
-	 * @return the List of converted objects.
-	 */
-	<T> List<T> find(String collectionName, Query query, Class<T> targetClass, CursorPreparer preparer);
-
-	/**
-	 * Insert the object into the default collection.  
-	 * 
-	 * 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.  
-	 * 
-	 * 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.
-	 *   
-	 * 
-	 * 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.  
-	 * 
-	 * 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. 
-	 * 
-	 * Insert is used to initially store the object into the 
-	 * database.  To update an existing object use the save method.
-	 * 
-	 * @param collectionName name of the collection to store the object in
-	 * @param objectToSave the object to store in the collection
-	 */
-	void insert(String collectionName, Object objectToSave);
-
-	/**
-	 * Insert the object into the default collection.  
-	 * 
-	 * The object is converted to the MongoDB native representation using an instance of 
-	 * {@see MongoWriter} 
-	 * 
-	 * Insert is used to initially store the object into the 
-	 * database.  To update an existing object use the save method.
-	 * 
-	 * @param <T> the type of the object to insert
-	 * @param objectToSave  the object to store in the collection
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void insert(T objectToSave, MongoWriter<T> writer);
-
-	/**
-	 * Insert the object into the specified collection.  
-	 * 
-	 * The object is converted to the MongoDB native representation using an instance of 
-	 * {@see MongoWriter} 
-	 * 
-	 * Insert is used to initially store the object into the 
-	 * database.  To update an existing object use the save method.
-	 * 
-	 * @param <T> the type of the object to insert
-	 * @param collectionName name of the collection to store the object in 
-	 * @param objectToSave  the object to store in the collection
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void insert(String collectionName, T objectToSave, MongoWriter<T> writer);
-
-	/**
-	 * Insert a list of objects into the default collection in a single batch write to the database.
-	 * 
-	 * @param listToSave the list of objects to save.
-	 */
-	void insertList(List<? extends Object> listToSave);
-
-	/**
-	 * Insert a list of objects into the specified collection in a single batch write to the database.
-	 * @param collectionName name of the collection to store the object in 
-	 * @param listToSave the list of objects to save.
-	 */
-	void insertList(String collectionName, List<? extends Object> listToSave);
-
-	/**
-	 * Insert a list of objects into the default collection using the provided MongoWriter instance
-	 * 
-	 * @param <T> the type of object being saved
-	 * @param listToSave the list of objects to save.
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void insertList(List<? extends T> listToSave, MongoWriter<T> writer);
-
-	/**
-	 * Insert a list of objects into the specified collection using the provided MongoWriter instance
-	 * 
-	 * @param <T> the type of object being saved
-	 * @param collectionName name of the collection to store the object in 
-	 * @param listToSave the list of objects to save.
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void insertList(String collectionName, List<? extends T> listToSave, MongoWriter<T> writer);
-
-	/**
-	 * Save the object to the default collection.  This will perform an insert if the object is not already 
-	 * present, that is an 'upsert'.
-	 * 
-	 * 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.  
-	 * 
-	 * 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'.
-	 * 
-	 * 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.  
-	 * 
-	 * 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 collectionName name of the collection to store the object in 
-	 * @param objectToSave the object to store in the collection
-	 */
-	void save(String collectionName, Object objectToSave);
-
-	/**
-	 * Save the object into the default collection using the provided writer. 
-	 * This will perform an insert if the object is not already 
-	 * present, that is an 'upsert'.  
-	 * 
-	 * The object is converted to the MongoDB native representation using an instance of 
-	 * {@see MongoWriter}
-	 *  
-	 * @param <T> the type of the object to insert
-	 * @param objectToSave  the object to store in the collection
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void save(T objectToSave, MongoWriter<T> writer);
-
-	/**
-	 * Save the object into the specified collection using the provided writer. 
-	 * This will perform an insert if the object is not already 
-	 * present, that is an 'upsert'.  
-	 * 
-	 * The object is converted to the MongoDB native representation using an instance of 
-	 * {@see MongoWriter}
-	 *  
-	 * @param <T> the type of the object to insert
-	 * @param collectionName name of the collection to store the object in 
-	 * @param objectToSave  the object to store in the collection
-	 * @param writer the writer to convert the object to save into a DBObject
-	 */
-	<T> void save(String collectionName, T objectToSave, MongoWriter<T> writer);
-
-	/**
-	 * Updates the first object that is found in the default collection that matches the query document 
-	 * with the provided updated document.
-	 * 
-	 * @param queryDoc the query document that specifies the criteria used to select a record to be updated
-	 * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-	 * existing object. 
-	 */
-	WriteResult updateFirst(Query query, Update update);
-
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria
-	 * with the provided updated document.
-	 * 
-	 * @param collectionName name of the collection to update the object in 
-	 * @param queryDoc the query document that specifies the criteria used to select a record to be updated
-	 * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-	 * existing object. 
-	 */
-	WriteResult updateFirst(String collectionName, Query query,
-			Update update);
-
-	/**
-	 * Updates all objects that are found in the default collection that matches the query document criteria
-	 * with the provided updated document.
-	 * 
-	 * @param queryDoc the query document that specifies the criteria used to select a record to be updated
-	 * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-	 * existing object. 
-	 */
-	WriteResult updateMulti(Query query, Update update);
-
-	/**
-	 * Updates all objects that are found in the specified collection that matches the query document criteria
-	 * with the provided updated document.
-	 * 
-	 * @param collectionName name of the collection to update the object in 
-	 * @param queryDoc the query document that specifies the criteria used to select a record to be updated
-	 * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-	 * existing object. 
-	 */
-	WriteResult updateMulti(String collectionName, Query query,
-			Update update);
-
-	/**
-	 * Remove all documents from the default collection that match the provided query document criteria.
-	 * @param queryDoc the query document that specifies the criteria used to remove a record 
-	 */
-	void remove(Query query);
-
-	/**
-	 * Remove all documents from the specified collection that match the provided query document criteria.
-	 * @param collectionName name of the collection where the objects will removed
-	 * @param queryDoc the query document that specifies the criteria used to remove a record 
-	 */
-	void remove(String collectionName, Query query);
-
-}

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

@@ -1,137 +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 org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-
-import com.mongodb.MongoOptions;
-
-/**
- * A factory bean for consruction a MongoOptions instance
- * 
- * @author Graeme Rocher
- *
- */
-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 on a connect, the system retries automatically 
-    */
-    private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
-    
-    
-    /**
-    	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 on a connect, the system retries automatically 
-     */	
-	public void setAutoConnectRetry(boolean autoConnectRetry) {
-		this.autoConnectRetry = autoConnectRetry;
-	}
-
-	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.autoConnectRetry = autoConnectRetry;
-		
-	}
-
-	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,239 +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.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-
-/**
- * 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);
-			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;
-
-		/**
-		 * Creates a new {@link MongoPropertyDescriptor} for the given {@link PropertyDescriptor}.
-		 * 
-		 * @param descriptor
-		 */
-		public MongoPropertyDescriptor(PropertyDescriptor descriptor) {
-			Assert.notNull(descriptor);
-			this.delegate = descriptor;
-		}
-
-		/**
-		 * Returns whether the property is the id-property. Will be identified by name for now ({@value #ID_PROPERTY}).
-		 * 
-		 * @return
-		 */
-		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() {
-			return !delegate.getName().equals("class") && delegate.getReadMethod() != null;
-		}
-
-		/**
-		 * 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,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 a native MongoDB DBObject to an object of type T.
- * 
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author Oliver Gierke
- *
- * @param <T> the type of the object to convert from a DBObject
- */
-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/MongoWriter.java

@@ -1,37 +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.
- * 
- * @author Mark Pollack
- * @author Thomas Risberg
- *
- * @param <T> the type of the object to convert to a DBObject
- */
-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/SimpleMongoConverter.java

@@ -1,557 +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.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.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-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 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.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.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.util.Assert;
-import org.springframework.util.comparator.CompoundComparator;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-
-/**
- * Basic {@link MongoConverter} implementation to convert between domain classes and {@link DBObject}s.
- * 
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author Oliver Gierke
- */
-public class SimpleMongoConverter implements MongoConverter {
-
-	private static final Log LOG = LogFactory.getLog(SimpleMongoConverter.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());
-		// TODO check on enums..
-		basics.add(Enum.class.getName());
-		SIMPLE_TYPES = Collections.unmodifiableSet(basics);
-	}
-
-	private final GenericConversionService conversionService;
-
-	/**
-	 * Creates a {@link SimpleMongoConverter}.
-	 */
-	public SimpleMongoConverter() {
-		this.conversionService = ConversionServiceFactory.createDefaultConversionService();
-		initializeConverters();
-	}
-
-	/**
-	 * Creates a new {@link SimpleMongoConverter} for the given {@link ConversionService}.
-	 * 
-	 * @param conversionService
-	 */
-	public SimpleMongoConverter(GenericConversionService conversionService) {
-		Assert.notNull(conversionService);
-		this.conversionService = conversionService;
-		initializeConverters();
-	}
-
-	/**
-	 * Initializes additional converters that handle {@link ObjectId} conversion. Will register converters for supported
-	 * id types if none are registered for those conversion already. {@link GenericConversionService} is configured.
-	 */
-	protected void initializeConverters() {
-		
-		if (!conversionService.canConvert(ObjectId.class, String.class)) {
-			conversionService.addConverter(ObjectIdToStringConverter.INSTANCE);
-			conversionService.addConverter(StringToObjectIdConverter.INSTANCE);
-		}
-		
-		if (!conversionService.canConvert(ObjectId.class, BigInteger.class)) {
-			conversionService.addConverter(ObjectIdToBigIntegerConverter.INSTANCE);
-			conversionService.addConverter(BigIntegerToIdConverter.INSTANCE);
-		}
-	}
-
-	/*
-	 * (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();
-				// TODO validate Enums...
-				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.warn("Unable to map property " + descriptor.getName() + ".  Skipping.");
-				}
-			}
-		}
-	}
-
-	/**
-	 * 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;
-		}
-		DBObject nestedDbo = new BasicDBObject();
-		write(value, nestedDbo);
-		dbo.put(keyToUse, nestedDbo);
-
-	}
-
-	/**
-	 * 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) {
-		// TODO
-		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(MongoPropertyDescriptors.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(MongoPropertyDescriptors.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);
-	}
-
-	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.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.MongoConverter#convertObjectId(java.lang.Object)
-	 */
-	public ObjectId convertObjectId(Object id) {
-		return conversionService.convert(id, ObjectId.class);
-	}
-
-	/**
-	 * 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 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 BigIntegerToIdConverter 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/config/MongoParser.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.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.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;
-
-/**
- * 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);
-
-		setPropertyValue(element, builder, "port", "port");
-		setPropertyValue(element, builder, "host", "host");
-		
-		parseOptions(parserContext, element, builder);
-		
-	}
-
-	/**
-	 * Parses the options sub-element. Populates the given attribute factory with the proper attributes.
-	 * 
-	 * @param element
-	 * @param attrBuilder
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	private boolean parseOptions(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, "connectionsPerHost", "connectionsPerHost");
-		setPropertyValue(optionsElement, optionsDefBuilder, "threadsAllowedToBlockForConnectionMultiplier", "threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(optionsElement, optionsDefBuilder, "maxWaitTime", "maxWaitTime");
-		setPropertyValue(optionsElement, optionsDefBuilder, "connectTimeout", "connectTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "socketTimeout", "socketTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "autoConnectRetry", "autoConnectRetry");
-		
-		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-		return true;
-	}
-
-	@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;
-	}
-	
-	private 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/MongoRepositoryConfigDefinitionParser.java

@@ -1,66 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.document.mongodb.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-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 MongoRepositoryConfigDefinitionParser
-        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,
-     * java.lang.Object)
-     */
-    @Override
-    protected void postProcessBeanDefinition(
-            MongoRepositoryConfiguration context,
-            BeanDefinitionBuilder builder, Object beanSource) {
-
-        builder.addPropertyReference("template", context.getMongoTemplateRef());
-    }
-}

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

@@ -1,42 +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.xml.NamespaceHandlerSupport;
-
-
-/**
- * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB
- * based repositories.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryNamespaceHandler extends NamespaceHandlerSupport {
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
-     */
-    public void init() {
-
-        registerBeanDefinitionParser("repositories",
-                new MongoRepositoryConfigDefinitionParser());
-        
-        registerBeanDefinitionParser("mongo", new MongoParser());
-        registerBeanDefinitionParser("jmx", new MongoJmxParser());
-    }
-}

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

@@ -1,195 +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.MongoRepository;
-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
-     * @param defaultRepositoryFactoryBeanClassName
-     */
-    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.GlobalRepositoryConfigInformation
-     * #getRepositoryBaseInterface()
-     */
-    public Class<?> getRepositoryBaseInterface() {
-
-        return MongoRepository.class;
-    }
-
-
-    /*
-     * (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/monitor/package-info.java

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

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

@@ -1,4 +0,0 @@
-/**
- * MongoDB core support.
- */
-package org.springframework.data.document.mongodb;

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

@@ -1,263 +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.query;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.springframework.data.document.InvalidDocumentStoreApiUsageException;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-public class Criteria implements CriteriaDefinition {
-	
-	private String key;
-	
-	private LinkedHashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
-
-	private Object isValue = null;
-	
-	
-	public Criteria(String key) {
-		this.key = key;
-	}
-
-
-	/**
-	 * Static factory method to create a Criteria using the provided key
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public static Criteria where(String key) {
-		return new Criteria(key);
-	}
-
-	/**
-	 * Creates a criterion using the $is operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria is(Object o) {
-		if (isValue != null) {
-			throw new InvalidDocumentStoreApiUsageException("Multiple 'is' values declared.");
-		}
-		this.isValue = o;
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $lt operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria lt(Object o) {
-		criteria.put("$lt", o);
-		return this;
-	}
-	
-	/**
-	 * Creates a criterion using the $lte operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria lte(Object o) {
-		criteria.put("$lte", o);
-		return this;
-	}
-	
-	/**
-	 * Creates a criterion using the $gt operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria gt(Object o) {
-		criteria.put("$gt", o);
-		return this;
-	}
-	
-	/**
-	 * Creates a criterion using the $gte operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria gte(Object o) {
-		criteria.put("$gte", o);
-		return this;
-	}
-	
-	/**
-	 * Creates a criterion using the $in operator
-	 * @param o
-	 * @return
-	 */
-	public Criteria in(Object... o) {
-		criteria.put("$in", o);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $nin operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria nin(Object... o) {
-		criteria.put("$min", o);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $mod operator
-	 * 
-	 * @param value
-	 * @param remainder
-	 * @return
-	 */
-	public Criteria mod(Number value, Number remainder) {
-		List<Object> l = new ArrayList<Object>();
-		l.add(value);
-		l.add(remainder);
-		criteria.put("$mod", l);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $all operator
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public Criteria all(Object o) {
-		criteria.put("$is", o);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $size operator
-	 * 
-	 * @param s
-	 * @return
-	 */
-	public Criteria size(int s) {
-		criteria.put("$size", s);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $exists operator
-	 * 
-	 * @param b
-	 * @return
-	 */
-	public Criteria exists(boolean b) {
-		criteria.put("$exists", b);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $type operator
-	 * 
-	 * @param t
-	 * @return
-	 */
-	public Criteria type(int t) {
-		criteria.put("$type", t);
-		return this;
-	}
-
-	/**
-	 * Creates a criterion using the $not meta operator which affects the clause directly following
-	 * 
-	 * @return
-	 */
-	public Criteria not() {
-		criteria.put("$not", null);
-		return this;
-	}
-	
-	/**
-	 * Creates a criterion using a $regex
-	 * 
-	 * @param re
-	 * @return
-	 */
-	public Criteria regex(String re) {
-		criteria.put("$regex", re);
-		return this;
-	}
-
-	/**
-	 * Creates an or query using the $or operator for all of the provided queries
-	 * 
-	 * @param queries
-	 */
-	public void or(List<Query> queries) {
-		criteria.put("$or", queries);		
-	}
-	
-	public String getKey() {
-		return this.key; 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.datastore.document.mongodb.query.Criteria#getCriteriaObject(java.lang.String)
-	 */
-	public DBObject getCriteriaObject() {
-		DBObject dbo = new BasicDBObject();
-		boolean not = false;
-		for (String k : this.criteria.keySet()) {
-			if (not) {
-				DBObject notDbo = new BasicDBObject();
-				notDbo.put(k, convertValueIfNecessary(this.criteria.get(k)));
-				dbo.put("$not", notDbo);
-				not = false;
-			}
-			else {
-				if ("$not".equals(k)) {
-					not = true;
-				}
-				else {
-					dbo.put(k, convertValueIfNecessary(this.criteria.get(k)));
-				}
-			}
-		}
-		DBObject queryCriteria = new BasicDBObject();
-		if (isValue != null) {
-			queryCriteria.put(this.key, convertValueIfNecessary(this.isValue));
-			queryCriteria.putAll(dbo);
-		}
-		else {
-			queryCriteria.put(this.key, dbo);
-		}
-		return queryCriteria;
-	}
-	
-	private Object convertValueIfNecessary(Object value) {
-		if (value instanceof Enum) {
-			return ((Enum<?>)value).name();
-		}
-		return value;
-	}
-
-}

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

@@ -1,11 +0,0 @@
-package org.springframework.data.document.mongodb.query;
-
-import com.mongodb.DBObject;
-
-public interface IndexDefinition {
-
-	DBObject getIndexObject();
-	
-	DBObject getIndexOptions();
-
-}

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

@@ -1,46 +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.query;
-
-import org.bson.types.BasicBSONList;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-public class OrCriteria implements CriteriaDefinition {
-	
-	Query[] queries = null;
-	
-	public OrCriteria(Query[] queries) {
-		super();
-		this.queries = queries;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.springframework.datastore.document.mongodb.query.Criteria#getCriteriaObject(java.lang.String)
-	 */
-	public DBObject getCriteriaObject() {
-		DBObject dbo = new BasicDBObject();
-		BasicBSONList l = new BasicBSONList();
-		for (Query q : queries) {
-			l.add(q.getQueryObject());
-		}
-		dbo.put("$or", l);
-		return dbo;
-	}
-
-}

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

@@ -1,9 +0,0 @@
-package org.springframework.data.document.mongodb.query;
-
-public class OrQuery extends Query {
-
-	public OrQuery(Query... q) {
-		super.or(q);
-	}
-	
-}

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

@@ -1,111 +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.query;
-
-import java.util.LinkedHashMap;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-public class Query {
-	
-	private LinkedHashMap<String, CriteriaDefinition> criteria = new LinkedHashMap<String, CriteriaDefinition>();
-	
-	private Field fieldSpec;
-	
-	private Sort sort;
-
-	private int skip;
-
-	private int limit;
-	
-	public Query() {
-	}
-	
-	public Query(Criteria criteria) {
-		and(criteria);
-	}
-
-	public Query and(Criteria criteria) {
-		this.criteria.put(criteria.getKey(), criteria);
-		return this;
-	}
-
-	protected Query or(Query... queries) {
-		this.criteria.put("$or", new OrCriteria(queries));
-		return this;
-	}
-
-	public Field fields() {
-		synchronized (this) {
-			if (fieldSpec == null) {
-				this.fieldSpec = new Field();
-			}
-		}
-		return this.fieldSpec;
-	}
-	
-	public Query skip(int skip) {
-		this.skip = skip;
-		return this;
-	}
-
-	public Query limit(int limit) {
-		this.limit = limit;
-		return this;
-	}
-	
-	public Sort sort() {
-		synchronized (this) {
-			if (this.sort == null) {
-				this.sort = new Sort();
-			}
-		}
-		return this.sort;
-	}
-	
-	public DBObject getQueryObject() {
-		DBObject dbo = new BasicDBObject();
-		for (String k : criteria.keySet()) {
-			CriteriaDefinition c = criteria.get(k);
-			DBObject cl = c.getCriteriaObject();
-			dbo.putAll(cl);
-		}
-		return dbo;
-	}
-
-	public DBObject getFieldsObject() {
-		if (this.fieldSpec == null) {
-			return null;
-		}
-		return fieldSpec.getFieldsObject();
-	}
-
-	public DBObject getSortObject() {
-		if (this.sort == null) {
-			return null;
-		}
-		return this.sort.getSortObject();
-	}
-
-	public int getSkip() {
-		return this.skip;
-	}
-
-	public int getLimit() {
-		return this.limit;
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB specific query and update support.
- */
-package org.springframework.data.document.mongodb.query;

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

@@ -1,100 +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.repository;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.data.repository.support.IdAware;
-import org.springframework.data.repository.support.IsNewAware;
-import org.springframework.util.ReflectionUtils;
-
-
-/**
- * Expects the domain class to contain a field with a name out of the following
- * {@value #FIELD_NAMES}.
- * 
- * @author Oliver Gierke
- */
-class MongoEntityInformation implements IsNewAware, IdAware {
-
-    private static final List<String> FIELD_NAMES = Arrays.asList("ID", "id", "_id");
-    private Field field;
-
-
-    /**
-     * Creates a new {@link MongoEntityInformation}.
-     * 
-     * @param domainClass
-     */
-    public MongoEntityInformation(Class<?> domainClass) {
-
-        for (String name : FIELD_NAMES) {
-
-            Field candidate = ReflectionUtils.findField(domainClass, name);
-
-            if (candidate != null) {
-                ReflectionUtils.makeAccessible(candidate);
-                this.field = candidate;
-                break;
-            }
-        }
-
-        if (this.field == null) {
-            throw new IllegalArgumentException(String.format(
-                    "Given domain class %s does not contain an id property!",
-                    domainClass.getName()));
-        }
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.IsNewAware#isNew(java.lang
-     * .Object)
-     */
-    public boolean isNew(Object entity) {
-
-        return null == ReflectionUtils.getField(field, entity);
-    }
-
-
-    /**
-     * Returns the actual field name containing the id.
-     * 
-     * @return
-     */
-    public String getFieldName() {
-
-        return field.getName();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.IdAware#getId(java.lang.Object
-     * )
-     */
-    public Object getId(Object entity) {
-
-        return ReflectionUtils.getField(field, entity);
-    }
-}

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

@@ -1,210 +0,0 @@
-/*
- * Copyright 2002-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.mongodb.repository;
-
-import static org.springframework.data.document.mongodb.repository.QueryUtils.*;
-
-import java.util.List;
-
-import org.springframework.data.document.mongodb.CollectionCallback;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.query.SimpleParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.util.Assert;
-
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-
-
-/**
- * {@link RepositoryQuery} implementation for Mongo.
- * 
- * @author Oliver Gierke
- */
-public class MongoQuery implements RepositoryQuery {
-
-    private final QueryMethod method;
-    private final MongoTemplate template;
-    private final PartTree tree;
-
-
-    /**
-     * Creates a new {@link MongoQuery} from the given {@link QueryMethod} and
-     * {@link MongoTemplate}.
-     * 
-     * @param method
-     * @param template
-     */
-    public MongoQuery(QueryMethod method, MongoTemplate template) {
-
-        Assert.notNull(template);
-        Assert.notNull(method);
-
-        this.method = method;
-        this.template = template;
-        this.tree = new PartTree(method.getName(), method.getDomainClass());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.query.RepositoryQuery#execute(java
-     * .lang.Object[])
-     */
-    public Object execute(Object[] parameters) {
-
-        SimpleParameterAccessor accessor =
-                new SimpleParameterAccessor(method.getParameters(), parameters);
-
-        MongoQueryCreator creator =
-                new MongoQueryCreator(tree, accessor, template.getConverter());
-        Query query = creator.createQuery();
-
-        if (method.isCollectionQuery()) {
-            return new CollectionExecution().execute(query);
-        } else if (method.isPageQuery()) {
-            return new PagedExecution(creator, accessor.getPageable())
-                    .execute(query);
-        } else {
-            return new SingleEntityExecution().execute(query);
-        }
-    }
-
-    private abstract class Execution {
-
-        abstract Object execute(Query query);
-
-
-        protected List<?> readCollection(Query query) {
-
-            String collectionName = getCollectionName(method.getDomainClass());
-            return template
-                    .find(collectionName, query, method.getDomainClass());
-        }
-    }
-
-    /**
-     * {@link Execution} for collection returning queries.
-     * 
-     * @author Oliver Gierke
-     */
-    class CollectionExecution extends Execution {
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.springframework.data.document.mongodb.repository.MongoQuery.Execution
-         * #execute(com.mongodb.DBObject)
-         */
-        @Override
-        public Object execute(Query query) {
-
-            return readCollection(query);
-        }
-    }
-
-    /**
-     * {@link Execution} for pagination queries.
-     * 
-     * @author Oliver Gierke
-     */
-    class PagedExecution extends Execution {
-
-        private final Pageable pageable;
-        private final MongoQueryCreator creator;
-
-
-        /**
-         * Creates a new {@link PagedExecution}.
-         * 
-         * @param pageable
-         */
-        public PagedExecution(MongoQueryCreator creator, Pageable pageable) {
-
-            Assert.notNull(creator);
-            Assert.notNull(pageable);
-            this.creator = creator;
-            this.pageable = pageable;
-        }
-
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.springframework.data.document.mongodb.repository.MongoQuery.Execution
-         * #execute(com.mongodb.DBObject)
-         */
-        @Override
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        Object execute(Query query) {
-
-            Query countQuery = creator.createQuery();
-            String collectionName = getCollectionName(method.getDomainClass());
-            int count =
-                    getCollectionCursor(collectionName, countQuery.getQueryObject()).count();
-
-            List<?> result =
-                    template.find(collectionName, applyPagination(query, pageable),
-                            method.getDomainClass());
-
-            return new PageImpl(result, pageable, count);
-        }
-
-
-        private DBCursor getCollectionCursor(String collectionName, final DBObject query) {
-
-            return template.execute(collectionName, new CollectionCallback<DBCursor>() {
-
-                public DBCursor doInCollection(DBCollection collection) {
-
-                    return collection.find(query);
-                }
-            });
-        }
-    }
-
-    /**
-     * {@link Execution} to return a single entity.
-     * 
-     * @author Oliver Gierke
-     */
-    class SingleEntityExecution extends Execution {
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.springframework.data.document.mongodb.repository.MongoQuery.Execution
-         * #execute(com.mongodb.DBObject)
-         */
-        @Override
-        Object execute(Query query) {
-
-            List<?> result = readCollection(query);
-            return result.isEmpty() ? null : result.get(0);
-        }
-    }
-}

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

@@ -1,210 +0,0 @@
-/*
- * Copyright 2002-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.mongodb.repository;
-
-import static org.springframework.data.document.mongodb.query.Criteria.*;
-
-import java.util.Collections;
-import java.util.regex.Pattern;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.mongodb.MongoConverter;
-import org.springframework.data.document.mongodb.query.Criteria;
-import org.springframework.data.document.mongodb.query.CriteriaDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.query.SimpleParameterAccessor;
-import org.springframework.data.repository.query.SimpleParameterAccessor.BindableParameterIterator;
-import org.springframework.data.repository.query.parser.AbstractQueryCreator;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-
-/**
- * Custom query creator to create Mongo criterias.
- * 
- * @author Oliver Gierke
- */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
-
-    private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
-    private final MongoConverter converter;
-
-
-    /**
-     * Creates a new {@link MongoQueryCreator} from the given {@link PartTree}
-     * and {@link SimpleParameterAccessor}.
-     * 
-     * @param tree
-     * @param accessor
-     */
-    public MongoQueryCreator(PartTree tree,
-            SimpleParameterAccessor accessor, MongoConverter converter) {
-
-        super(tree, accessor);
-        this.converter = converter;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.AbstractQueryCreator
-     * #create(org.springframework.data.repository.query.parser.Part,
-     * org.springframework
-     * .data.repository.query.SimpleParameterAccessor.BindableParameterIterator)
-     */
-    @Override
-    protected Criteria create(Part part, BindableParameterIterator iterator) {
-
-        return from(part.getType(),
-                where(part.getProperty().toDotPath()), iterator);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.AbstractQueryCreator
-     * #handlePart(org.springframework.data.repository.query.parser.Part,
-     * org.springframework
-     * .data.repository.query.SimpleParameterAccessor.BindableParameterIterator)
-     */
-    @Override
-    protected Criteria and(Part part, Criteria base,
-            BindableParameterIterator iterator) {
-
-        return from(part.getType(), where(part.getProperty().toDotPath()),
-                iterator);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.query.parser.AbstractQueryCreator
-     * #or(java.lang.Object, java.lang.Object)
-     */
-    @Override
-    protected Criteria or(Criteria base, Criteria criteria) {
-
-        base.or(Collections.singletonList(new Query(criteria)));
-        return base;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.query.parser.AbstractQueryCreator
-     * #complete(java.lang.Object, org.springframework.data.domain.Sort)
-     */
-    @Override
-    protected Query complete(Criteria criteria, Sort sort) {
-
-        Query query = new Query(criteria);
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Created query " + query.getQueryObject());
-        }
-
-        return query;
-    }
-
-
-    /**
-     * Populates the given {@link CriteriaDefinition} depending on the {@link Type} given.
-     * 
-     * @param type
-     * @param criteria
-     * @param parameters
-     * @return
-     */
-    private Criteria from(Type type, Criteria criteria,
-            BindableParameterIterator parameters) {
-
-        switch (type) {
-        case GREATER_THAN:
-            return criteria.gt(getConvertedParameter(parameters));
-        case LESS_THAN:
-            return criteria.lt(getConvertedParameter(parameters));
-        case BETWEEN:
-            return criteria.gt(getConvertedParameter(parameters)).lt(
-                    getConvertedParameter(parameters));
-        case IS_NOT_NULL:
-            return criteria.not().is(null);
-        case IS_NULL:
-            return criteria.is(null);
-        case LIKE:
-            String value = parameters.next().toString();
-            return criteria.is(toLikeRegex(value));
-        case SIMPLE_PROPERTY:
-            return criteria.is(getConvertedParameter(parameters));
-        case NEGATING_SIMPLE_PROPERTY:
-            return criteria.not().is(getConvertedParameter(parameters));
-        }
-
-        throw new IllegalArgumentException("Unsupported keyword!");
-    }
-
-
-    private Object getConvertedParameter(BindableParameterIterator parameters) {
-
-        DBObject result = new BasicDBObject();
-        converter.write(new ValueHolder(parameters.next()), result);
-        return result.get("value");
-    }
-
-
-    private Pattern toLikeRegex(String source) {
-
-        String regex = source.replaceAll("\\*", ".*");
-        return Pattern.compile(regex);
-    }
-
-    /**
-     * Simple value holder class to allow conversion and accessing the converted
-     * value in a deterministic way.
-     * 
-     * @author Oliver Gierke
-     */
-    private static class ValueHolder {
-
-        private Object value;
-
-
-        public ValueHolder(Object value) {
-
-            this.value = value;
-        }
-
-
-        @SuppressWarnings("unused")
-        public Object getValue() {
-
-            return value;
-        }
-    }
-}

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

@@ -1,156 +0,0 @@
-/*
- * Copyright 2002-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.mongodb.repository;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.support.RepositoryFactoryBeanSupport;
-import org.springframework.data.repository.support.RepositoryFactorySupport;
-import org.springframework.data.repository.support.RepositorySupport;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} to create {@link MongoRepository} instances.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryFactoryBean extends
-        RepositoryFactoryBeanSupport<MongoRepository<?, ?>> {
-
-    private MongoTemplate template;
-
-
-    /**
-     * Configures the {@link MongoTemplate} to be used.
-     * 
-     * @param template the template to set
-     */
-    public void setTemplate(MongoTemplate template) {
-
-        this.template = template;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-     * #createRepositoryFactory()
-     */
-    @Override
-    protected RepositoryFactorySupport createRepositoryFactory() {
-
-        return new MongoRepositoryFactory(template);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-     * #afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-
-        super.afterPropertiesSet();
-        Assert.notNull(template, "MongoTemplate must not be null!");
-    }
-
-    /**
-     * Repository to create {@link MongoRepository} instances.
-     * 
-     * @author Oliver Gierke
-     */
-    public static class MongoRepositoryFactory extends RepositoryFactorySupport {
-    	
-    	private final MongoTemplate template;
-    	
-    	/**
-    	 * Creates a new {@link MongoRepositoryFactory} fwith the given {@link MongoTemplate}.
-    	 * 
-    	 * @param template
-    	 */
-		public MongoRepositoryFactory(MongoTemplate template) {
-		
-			this.template = template;
-		}
-
-
-		@Override
-        protected <T, ID extends Serializable> RepositorySupport<T, ID> getTargetRepository(
-                Class<T> domainClass, Class<?> repositoryInterface) {
-
-            return new SimpleMongoRepository<T, ID>(domainClass, template);
-        }
-
-
-        @Override
-        @SuppressWarnings("rawtypes")
-        protected Class<? extends RepositorySupport> getRepositoryClass(Class<?> repositoryInterface) {
-
-            return SimpleMongoRepository.class;
-        }
-
-
-        @Override
-        protected QueryLookupStrategy getQueryLookupStrategy(Key key) {
-
-            return new MongoQueryLookupStrategy();
-        }
-
-        /**
-         * {@link QueryLookupStrategy} to create {@link MongoQuery} instances.
-         * 
-         * @author Oliver Gierke
-         */
-        private class MongoQueryLookupStrategy implements QueryLookupStrategy {
-
-            public RepositoryQuery resolveQuery(Method method) {
-
-                return new MongoQuery(new QueryMethod(method), template);
-            }
-        }
-        
-        /* (non-Javadoc)
-         * @see org.springframework.data.repository.support.RepositoryFactorySupport#validate(java.lang.Class, java.lang.Object)
-         */
-        @Override
-        protected void validate(Class<? extends Repository<?, ?>> repositoryInterface, Object customImplementation) {
-        	
-        	Class<?> idClass = ClassUtils.getIdClass(repositoryInterface);
-        	if (!MongoPropertyDescriptor.SUPPORTED_ID_CLASSES.contains(idClass)) {
-				throw new IllegalArgumentException(String.format("Unsupported id class! Only %s are supported!",
-						StringUtils.collectionToCommaDelimitedString(MongoPropertyDescriptor.SUPPORTED_ID_CLASSES)));
-        	}
-        	
-        	super.validate(repositoryInterface, customImplementation);
-        }
-    }
-}

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

@@ -1,93 +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.repository;
-
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Order;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.DBCursor;
-
-
-/**
- * Collection of utility methods to apply sorting and pagination to a
- * {@link DBCursor}.
- * 
- * @author Oliver Gierke
- */
-abstract class QueryUtils {
-
-    private QueryUtils() {
-
-    }
-
-
-    /**
-     * Applies the given {@link Pageable} to the given {@link Query}. Will do
-     * nothing if {@link Pageable} is {@literal null}.
-     * 
-     * @param query
-     * @param pageable
-     * @return
-     */
-    public static Query applyPagination(Query query, Pageable pageable) {
-
-        if (pageable == null) {
-            return query;
-        }
-
-        query.limit(pageable.getPageSize());
-        query.skip(pageable.getOffset());
-
-        return applySorting(query, pageable.getSort());
-    }
-
-
-    /**
-     * Applies the given {@link Sort} to the {@link Query}. Will do nothing if
-     * {@link Sort} is {@literal null}.
-     * 
-     * @param query
-     * @param sort
-     * @return
-     */
-    public static Query applySorting(Query query, Sort sort) {
-
-        if (sort == null) {
-            return query;
-        }
-
-        org.springframework.data.document.mongodb.query.Sort bSort =
-                query.sort();
-
-        for (Order order : sort) {
-            bSort.on(
-                    order.getProperty(),
-                    order.isAscending() ? org.springframework.data.document.mongodb.query.Order.ASCENDING
-                            : org.springframework.data.document.mongodb.query.Order.DESCENDING);
-        }
-
-        return query;
-    }
-    
-    
-    public static String getCollectionName(Class<?> domainClass) {
-
-        return StringUtils.uncapitalize(domainClass.getSimpleName());
-    }
-}

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

@@ -1,244 +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.repository;
-
-import static org.springframework.data.document.mongodb.query.Criteria.*;
-import static org.springframework.data.document.mongodb.repository.QueryUtils.*;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.types.ObjectId;
-import org.springframework.data.document.mongodb.MongoConverter;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.support.IsNewAware;
-import org.springframework.data.repository.support.RepositorySupport;
-import org.springframework.util.Assert;
-
-
-/**
- * Repository base implementation for Mongo.
- * 
- * @author Oliver Gierke
- */
-public class SimpleMongoRepository<T, ID extends Serializable> extends
-        RepositorySupport<T, ID> implements PagingAndSortingRepository<T, ID> {
-
-    private final MongoTemplate template;
-    private MongoEntityInformation entityInformation;
-
-
-    /**
-     * Creates a ew {@link SimpleMongoRepository} for the given domain class and
-     * {@link MongoTemplate}.
-     * 
-     * @param domainClass
-     * @param template
-     */
-    public SimpleMongoRepository(Class<T> domainClass, MongoTemplate template) {
-
-        super(domainClass);
-
-        Assert.notNull(template);
-        this.template = template;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#save(java.lang.Object)
-     */
-    public T save(T entity) {
-
-        template.save(getCollectionName(getDomainClass()), entity);
-        return entity;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#save(java.lang.Iterable)
-     */
-    public List<T> save(Iterable<? extends T> entities) {
-
-        List<T> result = new ArrayList<T>();
-
-        for (T entity : entities) {
-            save(entity);
-            result.add(entity);
-        }
-
-        return result;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#findById(java.io.Serializable
-     * )
-     */
-    public T findById(ID id) {
-
-        MongoConverter converter = template.getConverter();
-        ObjectId objectId = converter.convertObjectId(id);
-
-        return template.findOne(getCollectionName(getDomainClass()), new Query(
-        		where("_id").is(objectId)), getDomainClass());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#exists(java.io.Serializable
-     * )
-     */
-    public boolean exists(ID id) {
-
-        return findById(id) == null;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.data.repository.Repository#findAll()
-     */
-    public List<T> findAll() {
-
-        return template.getCollection(getCollectionName(getDomainClass()),
-                getDomainClass());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.data.repository.Repository#count()
-     */
-    public Long count() {
-
-        return template.getCollection(getCollectionName(getDomainClass()))
-                .count();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#delete(java.lang.Object)
-     */
-    public void delete(T entity) {
-
-        Query query =
-                new Query(where(entityInformation.getFieldName()).is(
-                        entityInformation.getId(entity)));
-        template.remove(getCollectionName(getDomainClass()), query);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.Repository#delete(java.lang.Iterable)
-     */
-    public void delete(Iterable<? extends T> entities) {
-
-        for (T entity : entities) {
-            delete(entity);
-        }
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.data.repository.Repository#deleteAll()
-     */
-    public void deleteAll() {
-
-        template.dropCollection(getCollectionName(getDomainClass()));
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.PagingAndSortingRepository#findAll
-     * (org.springframework.data.domain.Pageable)
-     */
-    public Page<T> findAll(final Pageable pageable) {
-
-        Long count = count();
-        Query spec = new Query();
-
-        List<T> list =
-                template.find(getCollectionName(getDomainClass()),
-                        QueryUtils.applyPagination(spec, pageable),
-                        getDomainClass());
-
-        return new PageImpl<T>(list, pageable, count);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.PagingAndSortingRepository#findAll
-     * (org.springframework.data.domain.Sort)
-     */
-    public List<T> findAll(final Sort sort) {
-
-        Query query = QueryUtils.applySorting(new Query(), sort);
-        return template.find(getCollectionName(getDomainClass()), query,
-                getDomainClass());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.data.repository.support.RepositorySupport#
-     * createIsNewStrategy(java.lang.Class)
-     */
-    @Override
-    protected IsNewAware createIsNewStrategy(Class<?> domainClass) {
-
-        if (entityInformation == null) {
-            this.entityInformation = new MongoEntityInformation(domainClass);
-        }
-
-        return entityInformation;
-    }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB specific repository implementation.
- */
-package org.springframework.data.document.mongodb.repository;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.data.authentication.UserCredentials;
+
+/**
+ * Exception being thrown in case we cannot connect to a MongoDB instance.
+ * 
+ * @author Oliver Gierke
+ */
+public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
+
+	private final UserCredentials credentials;
+	private final String database;
+
+	private static final long serialVersionUID = 1172099106475265589L;
+
+	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
+		super(msg, cause);
+		this.database = null;
+		this.credentials = UserCredentials.NO_CREDENTIALS;
+	}
+
+	public CannotGetMongoDbConnectionException(String msg) {
+		this(msg, null, UserCredentials.NO_CREDENTIALS);
+	}
+
+	public CannotGetMongoDbConnectionException(String msg, String database, UserCredentials credentials) {
+		super(msg);
+		this.database = database;
+		this.credentials = credentials;
+	}
+
+	/**
+	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
+	 * 
+	 * @return
+	 */
+	public UserCredentials getCredentials() {
+		return this.credentials;
+	}
+
+	/**
+	 * Returns the name of the database trying to be accessed.
+	 * 
+	 * @return
+	 */
+	public String getDatabase() {
+		return database;
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * 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.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.document;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
-public class InvalidDocumentStoreApiUsageException extends InvalidDataAccessApiUsageException {
+public class InvalidMongoDbApiUsageException extends InvalidDataAccessApiUsageException {
 
-	public InvalidDocumentStoreApiUsageException(String msg) {
+	private static final long serialVersionUID = 2034770973290508041L;
+
+	public InvalidMongoDbApiUsageException(String msg) {
 		super(msg);
 	}
 
-	public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
+	public InvalidMongoDbApiUsageException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
-
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java

@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Helper class featuring helper methods for working with MongoDb collections.
+ * <p/>
+ * <p/>
+ * Mainly intended for internal use within the framework.
+ * 
+ * @author Thomas Risberg
+ * @since 1.0
+ */
+public abstract class MongoCollectionUtils {
+
+	/**
+	 * Private constructor to prevent instantiation.
+	 */
+	private MongoCollectionUtils() {
+
+	}
+
+	/**
+	 * Obtains the collection name to use for the provided class
+	 * 
+	 * @param entityClass The class to determine the preferred collection name for
+	 * @return The preferred collection name
+	 */
+	public static String getPreferredCollectionName(Class<?> entityClass) {
+		return StringUtils.uncapitalize(entityClass.getSimpleName());
+	}
+
+}

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

@@ -0,0 +1,30 @@
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataAccessException;
+
+import com.mongodb.DB;
+
+/**
+ * Interface for factories creating {@link DB} instances.
+ * 
+ * @author Mark Pollack
+ */
+public interface MongoDbFactory {
+
+	/**
+	 * Creates a default {@link DB} instance.
+	 * 
+	 * @return
+	 * @throws DataAccessException
+	 */
+	DB getDb() throws DataAccessException;
+
+	/**
+	 * Creates a {@link DB} instance to access the database with the given name.
+	 * 
+	 * @param dbName must not be {@literal null} or empty.
+	 * @return
+	 * @throws DataAccessException
+	 */
+	DB getDb(String dbName) throws DataAccessException;
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * 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.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.document;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.UncategorizedDataAccessException;
 
-public class UncategorizedDocumentStoreException extends UncategorizedDataAccessException {
+public class UncategorizedMongoDbException extends UncategorizedDataAccessException {
 
-	public UncategorizedDocumentStoreException(String msg, Throwable cause) {
+	private static final long serialVersionUID = -2336595514062364929L;
+
+	public UncategorizedMongoDbException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
-
 }