DATAMONGO-491 - Release 1.1.0.M2.

DATAMONGO-491 - Prepare 1.1.0.M2 release.
Updated changelog and links to reference documentation.
2012-07-24 07:57:10 -07:00 · 2012-07-24 16:50:53 +02:00 · 2012-07-24 15:27:55 +02:00 · 2012-07-24 13:23:40 +02:00 · 2012-07-23 17:01:12 +02:00 · 2012-07-23 16:33:24 +02:00
137 changed files with 5273 additions and 2175 deletions
--- a/etc/formatting.xml
+++ b/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>
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,7 @@
  <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.0.5.BUILD-SNAPSHOT</version>
+  <version>1.1.0.M2</version>
  <packaging>pom</packaging>
  <modules>
    <module>spring-data-mongodb</module>
@@ -15,18 +13,7 @@
    <module>spring-data-mongodb-parent</module>
  </modules>

-   <developers>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Project lead</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
+  <developers>
    <developer>
      <id>trisberg</id>
      <name>Thomas Risberg</name>
@@ -51,6 +38,17 @@
      </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>
@@ -262,16 +260,10 @@
  </build>

  <pluginRepositories>
+    <!-- Necessary for the build extension -->
    <pluginRepository>
-      <!-- necessary for bundlor and utils -->
-      <id>repository.plugin.springsource.release</id>
-      <name>SpringSource Maven Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>spring-libs-release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://repo.springsource.org/libs-release</url>
+      <id>spring-plugins-release</id>
+      <url>http://repo.springsource.org/plugins-release</url>
    </pluginRepository>
  </pluginRepositories>

@@ -285,9 +277,9 @@
      </url>
    </site>
    <repository>
-      <id>spring-release</id>
-      <name>Spring Release Repository</name>
-      <url>s3://maven.springframework.org/release</url>
+      <id>spring-milestone</id>
+      <name>Spring Milestone Repository</name>
+      <url>s3://maven.springframework.org/milestone</url>
    </repository>
    <snapshotRepository>
      <id>spring-snapshot</id>
@@ -295,7 +287,5 @@
      <url>s3://maven.springframework.org/snapshot</url>
    </snapshotRepository>
  </distributionManagement>
-  <scm>
-    <url>https://github.com/SpringSource/spring-data-mongodb</url>
-  </scm>
+
 </project>
--- a/spring-data-mongodb-cross-store/pom.xml
+++ b/spring-data-mongodb-cross-store/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.springframework.data</groupId>
    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.5.BUILD-SNAPSHOT</version>
+    <version>1.1.0.M2</version>
    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
  </parent>
  <artifactId>spring-data-mongodb-cross-store</artifactId>
@@ -15,10 +15,12 @@
    <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>
@@ -28,53 +30,19 @@
    <dependency>
      <groupId>org.springframework</groupId>
      <artifactId>spring-orm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
+      <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-commons-aspects</artifactId>
-    </dependency> -->
    <dependency>
      <groupId>org.springframework.data</groupId>
      <artifactId>spring-data-mongodb</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>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <optional>true</optional>
+      <version>1.1.0.M2</version>
    </dependency>

    <dependency>
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
@@ -58,10 +58,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		this.entityManagerFactory = entityManagerFactory;
 	}

-
-	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass,
-			Object id, final ChangeSet changeSet)
-					throws DataAccessException, NotFoundException {
+	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");
@@ -77,8 +75,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 			log.debug("Loading MongoDB data for " + dbk);
 		}
 		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection)
-					throws MongoException, DataAccessException {
+			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()) {
@@ -87,9 +84,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 					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");
+							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);
@@ -135,10 +131,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 				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 {
+				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
+					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 						return collection.findOne(dbQuery);
 					}
 				});
@@ -147,14 +141,12 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						log.debug("Flush: removing: " + dbQuery);
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection)
-								throws MongoException, DataAccessException {
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 							collection.remove(dbQuery);
 							return null;
 						}
 					});
-				}
-				else {
+				} else {
 					final DBObject dbDoc = new BasicDBObject();
 					dbDoc.putAll(dbQuery);
 					if (log.isDebugEnabled()) {
@@ -166,8 +158,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						dbDoc.put("_id", dbId.get("_id"));
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection)
-								throws MongoException, DataAccessException {
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 							collection.save(dbDoc);
 							return null;
 						}
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
@@ -38,235 +38,234 @@ 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.
+ * 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);
+	private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class);

-  // Aspect shared config
-  private ChangeSetPersister<Object> changeSetPersister;
+	// Aspect shared config
+	private ChangeSetPersister<Object> changeSetPersister;

-  public void setChangeSetPersister(
-      ChangeSetPersister<Object> changeSetPersister) {
-    this.changeSetPersister = changeSetPersister;
-  }
+	public void setChangeSetPersister(ChangeSetPersister<Object> changeSetPersister) {
+		this.changeSetPersister = changeSetPersister;
+	}

-  // ITD to introduce N state to Annotated objects
-  declare parents : (@Entity *) implements DocumentBacked;
+	// 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;
+	// 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) : 
+	// -------------------------------------------------------------------------
+	// 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) : 
+	pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity, ChangeSet cs) : 
 		execution((DocumentBacked+).new(ChangeSet)) &&
 		this(entity) && 
 		args(cs);

-  protected pointcut entityFieldGet(DocumentBacked entity) :
+	protected pointcut entityFieldGet(DocumentBacked entity) :
        get(@RelatedDocument * DocumentBacked+.*) &&
        this(entity) &&
        !get(* DocumentBacked.*);

-  protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
+	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) : 
+	// 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;
-  }
+	// intercept EntityManager.remove calls
+	// public pointcut entityManagerRemove(EntityManager em, Object entity) :
+	// call(* EntityManager.remove(Object)) &&
+	// target(em) &&
+	// args(entity);

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

-  // -------------------------------------------------------------------------
-  // ChangeSet-related mixins
-  // -------------------------------------------------------------------------
-  // Introduced field
-  @Transient private ChangeSet DocumentBacked.changeSet;
+	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);
+	}

-  @Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
+	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);
+			}
+		}
+	}

-  @Transient private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
+	// -------------------------------------------------------------------------
+	// ChangeSet-related mixins
+	// -------------------------------------------------------------------------
+	// Introduced field
+	@Transient
+	private ChangeSet DocumentBacked.changeSet;

-  public void DocumentBacked.setChangeSet(ChangeSet cs) {
-    this.changeSet = cs;
-  }
+	@Transient
+	private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;

-  public ChangeSet DocumentBacked.getChangeSet() {
-    return changeSet;
-  }
+	@Transient
+	private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;

-  // 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 void DocumentBacked.setChangeSet(ChangeSet cs) {
+		this.changeSet = cs;
+	}

-  public Object DocumentBacked.get_persistent_id() {
-    return itdChangeSetPersister.getPersistentId(this, this.changeSet);
-  }
+	public ChangeSet DocumentBacked.getChangeSet() {
+		return 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);
-  }
+	// Flush the entity state to the persistent store
+	public void DocumentBacked.flush() {
+		Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
+		itdChangeSetPersister.persistState(this, this.changeSet);
+	}

-  /**
-   * 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);
-  }
+	public Object DocumentBacked.get_persistent_id() {
+		return itdChangeSetPersister.getPersistentId(this, this.changeSet);
+	}

-  Field field(JoinPoint joinPoint) {
-    FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
-    return fieldSignature.getField();
-  }
+	// 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();
+	}
 }
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
@@ -24,8 +24,6 @@ import java.lang.annotation.Target;
 * @author Thomas Risberg
 */
@Retention(RetentionPolicy.RUNTIME)
-@Target({
-    ElementType.FIELD
-})
+@Target({ ElementType.FIELD })
 public @interface RelatedDocument {
 }
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
@@ -90,8 +90,7 @@ public class CrossStoreMongoTests {
 		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());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
 		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
 		found.setAge(44);
 	}
@@ -106,8 +105,7 @@ public class CrossStoreMongoTests {
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found.getResume());
-		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
-				+ "VMware, Developer, 2007-" + "; "
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-" + "; "
 				+ "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
 	}

--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
@@ -23,8 +23,7 @@ public class Address {
 	private String state;
 	private String zip;

-	public Address(Integer streetNumber, String streetName, String city,
-			String state, String zip) {
+	public Address(Integer streetNumber, String streetName, String city, String state, String zip) {
 		super();
 		this.streetNumber = streetNumber;
 		this.streetName = streetName;
@@ -36,34 +35,41 @@ public class Address {
 	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;
 	}

-
-
 }
--- a/spring-data-mongodb-log4j/pom.xml
+++ b/spring-data-mongodb-log4j/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.springframework.data</groupId>
    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.5.BUILD-SNAPSHOT</version>
+    <version>1.1.0.M2</version>
    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
  </parent>
  <artifactId>spring-data-mongodb-log4j</artifactId>
@@ -27,7 +27,7 @@
    <dependency>
      <groupId>log4j</groupId>
      <artifactId>log4j</artifactId>
-      <scope>compile</scope>
+      <version>${log4j.version}</version>
    </dependency>

  </dependencies>
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -4,98 +4,25 @@
  <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.0.5.BUILD-SNAPSHOT</version>
+  <version>1.1.0.M2</version>
  <packaging>pom</packaging>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <!-- versions for commonly-used dependencies -->
    <junit.version>4.10</junit.version>
    <log4j.version>1.2.16</log4j.version>
-    <org.mockito.version>1.8.4</org.mockito.version>
-    <hamcrest.version>1.2.1</hamcrest.version>
-    <org.slf4j.version>1.5.10</org.slf4j.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.40>4.0.0.RELEASE</org.springframework.version.40>
    <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
-    <data.commons.version>1.2.1.RELEASE</data.commons.version>
+    <data.commons.version>1.4.0.M1</data.commons.version>
    <aspectj.version>1.6.11.RELEASE</aspectj.version>
+    <bundlor.failOnWarnings>true</bundlor.failOnWarnings>
  </properties>
-
-  <developers>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Project lead</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>trisberg</id>
-      <name>Thomas Risberg</name>
-      <email>trisberg at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>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>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>
-
+ 
  <distributionManagement>
    <!-- see 'staging' profile for dry-run deployment settings -->
    <downloadUrl>http://www.springsource.com/download/community
@@ -107,9 +34,9 @@
      </url>
    </site>
    <repository>
-      <id>spring-release</id>
-      <name>Spring Release Repository</name>
-      <url>s3://maven.springframework.org/release</url>
+      <id>spring-milestone</id>
+      <name>Spring Milestone Repository</name>
+      <url>s3://maven.springframework.org/milestone</url>
    </repository>
    <snapshotRepository>
      <id>spring-snapshot</id>
@@ -117,168 +44,68 @@
      <url>s3://maven.springframework.org/snapshot</url>
    </snapshotRepository>
  </distributionManagement>
-  <scm>
-  	<url>https://github.com/SpringSource/spring-data-mongodb</url>
-  </scm>
-  <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.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>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${org.springframework.version.range}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${org.springframework.version.range}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-orm</artifactId>
-        <version>${org.springframework.version.range}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${org.springframework.version.range}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-expression</artifactId>
-        <version>${org.springframework.version.range}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${org.springframework.version.range}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <!--  Spring Data -->
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-commons-core</artifactId>
-        <version>${data.commons.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-commons-aspects</artifactId>
-        <version>${data.commons.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-couchdb</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-mongodb</artifactId>
-        <version>1.0.5.BUILD-SNAPSHOT</version>
-      </dependency>
-
-      <!-- Logging -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-        <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-core</artifactId>
-        <version>${org.mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit-dep</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
+  
  <dependencies>
-    
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>

-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
+		<!-- 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>
@@ -293,11 +120,48 @@
        <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>
+        <version>2.4</version>
        <configuration>
          <source>1.5</source>
          <target>1.5</target>
@@ -317,12 +181,15 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
+        <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>
@@ -359,7 +226,7 @@
          <artifactId>com.springsource.bundlor.maven</artifactId>
          <version>1.0.0.RELEASE</version>
          <configuration>
-            <failOnWarnings>true</failOnWarnings>
+            <failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
          </configuration>
          <executions>
            <execution>
@@ -378,15 +245,11 @@
      <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>
+      <id>spring-libs-snapshot</id>
+      <url>http://repo.springsource.org/libs-snapshot</url>
    </repository>
  </repositories>
  <reporting>
--- a/spring-data-mongodb/Spring
+++ b/spring-data-mongodb/Spring
@@ -49,6 +49,12 @@
                </element>
                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
            </element>
+            <element name="GridFS" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
            <element name="Core" type="Layer">
                <element name="Assignment" type="TypeFilter">
                    <element name="**.core.**" type="IncludeTypePattern"/>
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M2</version>
 		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
@@ -12,7 +12,10 @@

 	<properties>
 		<mongo.version>2.7.1</mongo.version>
-		<querydsl.version>2.3.0</querydsl.version>
+		<querydsl.version>2.6.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>
@@ -21,27 +24,33 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
+			<version>${org.springframework.version.range}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<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>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
+			<version>${org.springframework.version.range}</version>
 		</dependency>

 		<!--  Spring Data -->
@@ -69,45 +78,99 @@
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.morphia</groupId>
+					<artifactId>morphia</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<scope>provided</scope>
 		</dependency>

 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
+			<version>1.0</version>
 			<optional>true</optional>
 		</dependency>
-
-		<!-- Test dependencies -->
+		
+		<!-- CDI -->
 		<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>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>${cdi.version}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>${cdi.version}</version>
 			<scope>test</scope>
 		</dependency>
+		
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>${webbeans.version}</version>
 			<scope>test</scope>
 		</dependency>
+		
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<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>
@@ -118,14 +181,7 @@
 			<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>
+				<version>1.0.2</version>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,42 +16,51 @@
 package org.springframework.data.mongodb;

 import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.data.authentication.UserCredentials;

+/**
+ * Exception being thrown in case we cannot connect to a MongoDB instance.
+ * 
+ * @author Oliver Gierke
+ */
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {

-	private String username;
-
-	private char[] password;
-
-	private String database;
+	private final UserCredentials credentials;
+	private final String database;

 	private static final long serialVersionUID = 1172099106475265589L;

 	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
 		super(msg, cause);
+		this.database = null;
+		this.credentials = UserCredentials.NO_CREDENTIALS;
 	}

 	public CannotGetMongoDbConnectionException(String msg) {
-		super(msg);
+		this(msg, null, UserCredentials.NO_CREDENTIALS);
 	}

-	public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password) {
+	public CannotGetMongoDbConnectionException(String msg, String database, UserCredentials credentials) {
 		super(msg);
-		this.username = username;
-		this.password = password == null ? null : password.clone();
 		this.database = database;
+		this.credentials = credentials;
 	}

-	public String getUsername() {
-		return username;
-	}
-
-	public char[] getPassword() {
-		return password;
+	/**
+	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
+	 * 
+	 * @return
+	 */
+	public UserCredentials getCredentials() {
+		return this.credentials;
 	}

+	/**
+	 * Returns the name of the database trying to be accessed.
+	 * 
+	 * @return
+	 */
 	public String getDatabase() {
 		return database;
 	}
-
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
@@ -15,6 +15,7 @@
 */
 package org.springframework.data.mongodb.config;

+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

@@ -22,12 +23,13 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -37,7 +39,7 @@ import org.springframework.util.StringUtils;
 import com.mongodb.Mongo;

 /**
- * Abstract base class to ease JavaConfig setup for Spring Data MongoDB.
+ * Base class for Spring Data Mongo configuration using JavaConfig.
 * 
 * @author Mark Pollack
 * @author Oliver Gierke
@@ -45,19 +47,47 @@ import com.mongodb.Mongo;
@Configuration
 public abstract class AbstractMongoConfiguration {

-	public abstract String getDatabaseName();
+	/**
+	 * Return the name of the database to connect to.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	protected abstract String getDatabaseName();

+	/**
+	 * Return the {@link Mongo} instance to connect to.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
 	@Bean
 	public abstract Mongo mongo() throws Exception;

+	/**
+	 * Creates a {@link MongoTemplate}.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
 	@Bean
 	public MongoTemplate mongoTemplate() throws Exception {
 		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
 	}

+	/**
+	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
+	 * configured in {@link #mongo()}.
+	 * 
+	 * @see #mongo()
+	 * @see #mongoTemplate()
+	 * @return
+	 * @throws Exception
+	 */
 	@Bean
-	public MongoDbFactory mongoDbFactory() throws Exception {
+	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
+
 		UserCredentials credentials = getUserCredentials();
+
 		if (credentials == null) {
 			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
 		} else {
@@ -65,46 +95,96 @@ public abstract class AbstractMongoConfiguration {
 		}
 	}

-	public String getMappingBasePackage() {
-		return "";
-	}
-
-	public UserCredentials getUserCredentials() {
+	/**
+	 * Return the base package to scan for mapped {@link Document}s.
+	 * 
+	 * @return
+	 */
+	protected String getMappingBasePackage() {
 		return null;
 	}

+	/**
+	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
+	 * be used.
+	 * 
+	 * @return
+	 */
+	protected UserCredentials getUserCredentials() {
+		return null;
+	}
+
+	/**
+	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
 	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+
 		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setInitialEntitySet(getInitialEntitySet());
+		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+		mappingContext.initialize();
+
+		return mappingContext;
+	}
+
+	/**
+	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
+	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
+	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	@Bean
+	public CustomConversions customConversions() {
+		return new CustomConversions(Collections.emptyList());
+	}
+
+	/**
+	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
+	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * 
+	 * @see #customConversions()
+	 * @see #mongoMappingContext()
+	 * @see #mongoDbFactory()
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
+		converter.setCustomConversions(customConversions());
+		return converter;
+	}
+
+	/**
+	 * Scans the mapping base package for classes annotated with {@link Document}.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+
 		String basePackage = getMappingBasePackage();
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+
 		if (StringUtils.hasText(basePackage)) {
 			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 					false);
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));

-			Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
 			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass()
-						.getClassLoader()));
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
+						AbstractMongoConfiguration.class.getClassLoader()));
 			}
-			mappingContext.setInitialEntitySet(initialEntitySet);
 		}
-		return mappingContext;
-	}

-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
-		afterMappingMongoConverterCreation(converter);
-		return converter;
-	}
-
-	/**
-	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
-	 * 
-	 * @param converter
-	 */
-	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
+		return initialEntitySet;
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
@@ -25,4 +25,5 @@ public abstract class BeanNames {
 	static final String INDEX_HELPER = "indexCreationHelper";
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
+	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.config;

 import static org.springframework.data.mongodb.config.BeanNames.*;
@@ -30,12 +29,14 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -52,18 +53,25 @@ import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Bean definition parser for the {@code mapping-converter} element.
+ * 
+ * @author Jon Brisbin
 * @author Oliver Gierke
+ * @author Maciej Walkowiak
 */
 public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {

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

 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
@@ -107,9 +115,53 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
 		}

+		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
+
+		if (validatingMongoEventListener != null) {
+			registry.registerBeanDefinition(VALIDATING_EVENT_LISTENER, validatingMongoEventListener);
+		}
+
 		return converterBuilder.getBeanDefinition();
 	}

+	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
+
+		String disableValidation = element.getAttribute("disable-validation");
+		boolean validationDisabled = StringUtils.hasText(disableValidation) && Boolean.valueOf(disableValidation);
+
+		if (!validationDisabled) {
+
+			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition();
+			RuntimeBeanReference validator = getValidator(builder, parserContext);
+
+			if (validator != null) {
+
+				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
+				builder.addConstructorArgValue(validator);
+
+				return builder.getBeanDefinition();
+			}
+		}
+
+		return null;
+	}
+
+	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
+
+		if (!jsr303Present) {
+			return null;
+		}
+
+		RootBeanDefinition validatorDef = new RootBeanDefinition(
+				"org.springframework.validation.beanvalidation.LocalValidatorFactoryBean");
+		validatorDef.setSource(source);
+		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
+		parserContext.registerComponent(new BeanComponentDefinition(validatorDef, validatorName));
+
+		return new RuntimeBeanReference(validatorName);
+	}
+
 	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
 			BeanDefinition conversionsDefinition) {

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 by the original author(s).
+ * Copyright 2011-2012 by the original author(s).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,19 +15,19 @@
 */
 package org.springframework.data.mongodb.config;

-import static org.springframework.data.mongodb.config.BeanNames.*;
-import static org.springframework.data.mongodb.config.ParsingUtils.*;
+import static org.springframework.data.config.ParsingUtils.*;
+import static org.springframework.data.mongodb.config.MongoParsingUtils.*;

 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
@@ -44,19 +44,29 @@ import com.mongodb.MongoURI;
 */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
-		String id = element.getAttribute("id");
-		if (!StringUtils.hasText(id)) {
-			id = DB_FACTORY;
-		}
-		return id;
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY;
 	}

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {

+		Object source = parserContext.extractSource(element);
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
 		String uri = element.getAttribute("uri");
 		String mongoRef = element.getAttribute("mongo-ref");
 		String dbname = element.getAttribute("dbname");
@@ -64,12 +74,11 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {

 		// Common setup
 		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
-		ParsingUtils.setPropertyValue(element, dbFactoryBuilder, "write-concern", "writeConcern");
+		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");

 		if (StringUtils.hasText(uri)) {
 			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
-				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!",
-						parserContext.extractSource(element));
+				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!", source);
 			}

 			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
@@ -77,19 +86,26 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		}

 		// Defaulting
-		mongoRef = StringUtils.hasText(mongoRef) ? mongoRef : registerMongoBeanDefinition(element, parserContext);
-		dbname = StringUtils.hasText(dbname) ? dbname : "db";
+		if (StringUtils.hasText(mongoRef)) {
+			dbFactoryBuilder.addConstructorArgReference(mongoRef);
+		} else {
+			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
+		}

-		dbFactoryBuilder.addConstructorArgValue(new RuntimeBeanReference(mongoRef));
+		dbname = StringUtils.hasText(dbname) ? dbname : "db";
 		dbFactoryBuilder.addConstructorArgValue(dbname);

 		if (userCredentials != null) {
 			dbFactoryBuilder.addConstructorArgValue(userCredentials);
 		}

-		ParsingUtils.registerWriteConcernPropertyEditor(parserContext.getRegistry());
+		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();

-		return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
+		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
+		parserContext.registerBeanComponent(component);
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY)
+				.getBeanDefinition();
 	}

 	/**
@@ -100,14 +116,13 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 * @param parserContext must not be {@literal null}.
 	 * @return
 	 */
-	private String registerMongoBeanDefinition(Element element, ParserContext parserContext) {
+	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {

 		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
-		ParsingUtils.setPropertyValue(element, mongoBuilder, "host");
-		ParsingUtils.setPropertyValue(element, mongoBuilder, "port");
+		setPropertyValue(mongoBuilder, element, "host");
+		setPropertyValue(mongoBuilder, element, "port");

-		return BeanDefinitionReaderUtils.registerWithGeneratedName(mongoBuilder.getBeanDefinition(),
-				parserContext.getRegistry());
+		return getSourceBeanDefinition(mongoBuilder, parserContext, element);
 	}

 	/**
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
@@ -16,7 +16,9 @@
 package org.springframework.data.mongodb.config;

 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigParser;
+import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension;
+import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;

 /**
 * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
@@ -32,7 +34,10 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 	*/
 	public void init() {

-		registerBeanDefinitionParser("repositories", new MongoRepositoryConfigParser());
+		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
+		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
+
+		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -13,20 +13,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.config;

 import java.util.Map;

-import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.CustomEditorConfigurer;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
@@ -35,54 +35,59 @@ import org.w3c.dom.Element;
 * Parser for &lt;mongo;gt; definitions.
 * 
 * @author Mark Pollack
+ * @author Oliver Gierke
 */
-public class MongoParser extends AbstractSingleBeanDefinitionParser {
+public class MongoParser implements BeanDefinitionParser {

-	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return MongoFactoryBean.class;
-	}
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	public BeanDefinition parse(Element element, ParserContext parserContext) {

-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		Object source = parserContext.extractSource(element);
+		String id = element.getAttribute("id");

-		ParsingUtils.setPropertyValue(element, builder, "port", "port");
-		ParsingUtils.setPropertyValue(element, builder, "host", "host");
-		ParsingUtils.setPropertyValue(element, builder, "write-concern", "writeConcern");
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);

-		ParsingUtils.parseMongoOptions(element, builder);
-		ParsingUtils.parseReplicaSet(element, builder);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
+		ParsingUtils.setPropertyValue(builder, element, "port", "port");
+		ParsingUtils.setPropertyValue(builder, element, "host", "host");
+		ParsingUtils.setPropertyValue(builder, element, "write-concern", "writeConcern");

-		registerServerAddressPropertyEditor(parserContext.getRegistry());
-		ParsingUtils.registerWriteConcernPropertyEditor(parserContext.getRegistry());
+		MongoParsingUtils.parseMongoOptions(element, builder);
+		MongoParsingUtils.parseReplicaSet(element, builder);

+		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO;
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
+
+		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
+		parserContext.registerBeanComponent(mongoComponent);
+		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(registerServerAddressPropertyEditor());
+		parserContext.registerBeanComponent(serverAddressPropertyEditor);
+		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
+				.getWriteConcernPropertyEditorBuilder());
+		parserContext.registerBeanComponent(writeConcernPropertyEditor);
+
+		parserContext.popAndRegisterContainingComponent();
+
+		return mongoComponent.getBeanDefinition();
 	}

 	/**
 	 * One should only register one bean definition but want to have the convenience of using
 	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
 	 * container.
-	 * 
-	 * @param parserContext the ParserContext to
 	 */
-	private void registerServerAddressPropertyEditor(BeanDefinitionRegistry registry) {
+	private BeanDefinitionBuilder registerServerAddressPropertyEditor() {

-		BeanDefinitionBuilder customEditorConfigurer = BeanDefinitionBuilder
-				.genericBeanDefinition(CustomEditorConfigurer.class);
 		Map<String, String> customEditors = new ManagedMap<String, String>();
 		customEditors.put("com.mongodb.ServerAddress[]",
 				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
-		customEditorConfigurer.addPropertyValue("customEditors", customEditors);
-		BeanDefinitionReaderUtils.registerWithGeneratedName(customEditorConfigurer.getBeanDefinition(), registry);
-	}

-	@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;
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+		return builder;
 	}
-}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2011-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.springframework.data.config.ParsingUtils.*;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.CustomEditorConfigurer;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Utility methods for {@link BeanDefinitionParser} implementations for MongoDB.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+abstract class MongoParsingUtils {
+
+	private MongoParsingUtils() {
+
+	}
+
+	/**
+	 * Parses the mongo replica-set element.
+	 * 
+	 * @param parserContext the parser context
+	 * @param element the mongo element
+	 * @param mongoBuilder the bean definition builder to populate
+	 * @return
+	 */
+	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
+		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
+	}
+
+	/**
+	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
+	 * 
+	 * @return true if parsing actually occured, false otherwise
+	 */
+	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
+		if (optionsElement == null) {
+			return false;
+		}
+
+		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoOptionsFactoryBean.class);
+
+		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(optionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
+				"threadsAllowedToBlockForConnectionMultiplier");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
+		setPropertyValue(optionsDefBuilder, optionsElement, "auto-connect-retry", "autoConnectRetry");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-number", "writeNumber");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
+		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
+
+		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
+		return true;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link WriteConcernPropertyEditor}.
+	 * 
+	 * @return
+	 */
+	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.config;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.CustomEditorConfigurer;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-abstract class ParsingUtils {
-
-	/**
-	 * Parses the mongo replica-set element.
-	 * 
-	 * @param parserContext the parser context
-	 * @param element the mongo element
-	 * @param mongoBuilder the bean definition builder to populate
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
-
-		String replicaSetString = element.getAttribute("replica-set");
-		if (StringUtils.hasText(replicaSetString)) {
-			mongoBuilder.addPropertyValue("replicaSetSeeds", replicaSetString);
-		}
-		return true;
-
-	}
-
-	/**
-	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
-	 * 
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
-		if (optionsElement == null) {
-			return false;
-		}
-
-		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoOptionsFactoryBean.class);
-
-		setPropertyValue(optionsElement, optionsDefBuilder, "connections-per-host", "connectionsPerHost");
-		setPropertyValue(optionsElement, optionsDefBuilder, "threads-allowed-to-block-for-connection-multiplier",
-				"threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(optionsElement, optionsDefBuilder, "max-wait-time", "maxWaitTime");
-		setPropertyValue(optionsElement, optionsDefBuilder, "connect-timeout", "connectTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "socket-timeout", "socketTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "socket-keep-alive", "socketKeepAlive");
-		setPropertyValue(optionsElement, optionsDefBuilder, "auto-connect-retry", "autoConnectRetry");
-		setPropertyValue(optionsElement, optionsDefBuilder, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-number", "writeNumber");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-timeout", "writeTimeout");
-		setPropertyValue(optionsElement, optionsDefBuilder, "write-fsync", "writeFsync");
-		setPropertyValue(optionsElement, optionsDefBuilder, "slave-ok", "slaveOk");
-
-		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-		return true;
-	}
-
-	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName, String propertyName) {
-		String attr = element.getAttribute(attrName);
-		if (StringUtils.hasText(attr)) {
-			builder.addPropertyValue(propertyName, attr);
-		}
-	}
-
-	/**
-	 * Sets the property with the given attribute name on the given {@link BeanDefinitionBuilder} to the value of the
-	 * attribute with the given name.
-	 * 
-	 * @param element must not be {@literal null}.
-	 * @param builder must not be {@literal null}.
-	 * @param attrName must not be {@literal null} or empty.
-	 */
-	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName) {
-		String attr = element.getAttribute(attrName);
-		if (StringUtils.hasText(attr)) {
-			builder.addPropertyValue(attrName, attr);
-		}
-	}
-
-	/**
-	 * Returns the {@link BeanDefinition} built by the given {@link BeanDefinitionBuilder} enriched with source
-	 * information derived from the given {@link Element}.
-	 * 
-	 * @param builder must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @param element must not be {@literal null}.
-	 * @return
-	 */
-	static AbstractBeanDefinition getSourceBeanDefinition(BeanDefinitionBuilder builder, ParserContext context,
-			Element element) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(element));
-		return definition;
-	}
-
-	/**
-	 * Registers a {@link WriteConcernPropertyEditor} in the given {@link BeanDefinitionRegistry}.
-	 * 
-	 * @param registry must not be {@literal null}.
-	 */
-	static void registerWriteConcernPropertyEditor(BeanDefinitionRegistry registry) {
-
-		Assert.notNull(registry);
-
-		BeanDefinitionBuilder customEditorConfigurer = BeanDefinitionBuilder
-				.genericBeanDefinition(CustomEditorConfigurer.class);
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
-		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
-		customEditorConfigurer.addPropertyValue("customEditors", customEditors);
-		BeanDefinitionReaderUtils.registerWithGeneratedName(customEditorConfigurer.getBeanDefinition(), registry);
-	}
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
@@ -20,8 +20,8 @@ import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;

 import com.mongodb.ServerAddress;
@@ -34,7 +34,7 @@ import com.mongodb.ServerAddress;
 */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {

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

 	/*
 	 * (non-Javadoc)
@@ -74,7 +74,7 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");

 		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
-			LOG.warn(String.format("Could not parse address source '%s'. Check your replica set configuration!", source));
+			LOG.warn("Could not parse address source '{}'. Check your replica set configuration!", source);
 			return null;
 		}

@@ -82,9 +82,9 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
 					Integer.parseInt(hostAndPort[1]));
 		} catch (UnknownHostException e) {
-			LOG.warn(String.format("Could not parse host '%s'. Check your replica set configuration!", hostAndPort[0]));
+			LOG.warn("Could not parse host '{}'. Check your replica set configuration!", hostAndPort[0]);
 		} catch (NumberFormatException e) {
-			LOG.warn(String.format("Could not parse port '%s'. Check your replica set configuration!", hostAndPort[1]));
+			LOG.warn("Could not parse port '{}'. Check your replica set configuration!", hostAndPort[1]);
 		}

 		return null;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java
@@ -16,9 +16,7 @@
 package org.springframework.data.mongodb.core;

 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
@@ -131,7 +129,6 @@ public class DefaultIndexOperations implements IndexOperations {
 					DBObject keyDbObject = (DBObject) ix.get("key");
 					int numberOfElements = keyDbObject.keySet().size();

-					Map<String, Order> keyOrderMap = new HashMap<String, Order>();
 					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);

 					for (String key : keyDbObject.keySet()) {
@@ -139,10 +136,8 @@ public class DefaultIndexOperations implements IndexOperations {
 						Object value = keyDbObject.get(key);

 						if (Integer.valueOf(1).equals(value)) {
-							keyOrderMap.put(key, Order.ASCENDING);
 							indexFields.add(IndexField.create(key, Order.ASCENDING));
 						} else if (Integer.valueOf(-1).equals(value)) {
-							keyOrderMap.put(key, Order.DESCENDING);
 							indexFields.add(IndexField.create(key, Order.DESCENDING));
 						} else if ("2d".equals(value)) {
 							indexFields.add(IndexField.geo(key));
@@ -155,7 +150,7 @@ public class DefaultIndexOperations implements IndexOperations {
 					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
 					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;

-					indexInfoList.add(new IndexInfo(keyOrderMap, indexFields, name, unique, dropDuplicates, sparse));
+					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
 				}

 				return indexInfoList;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java
@@ -20,6 +20,7 @@ import java.util.List;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;

+
 /**
 * Index operations on a collection.
 * 
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,32 +15,28 @@
 */
 package org.springframework.data.mongodb.core;

-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
+import org.springframework.util.Assert;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;

 /**
 * Mongo server administration exposed via JMX annotations
 * 
 * @author Mark Pollack
 */
-
@ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {

-	/**
-	 * Logger available to subclasses
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private Mongo mongo;
+	private final Mongo mongo;
 	private String username;
 	private String password;

 	public MongoAdmin(Mongo mongo) {
+		Assert.notNull(mongo);
 		this.mongo = mongo;
 	}

@@ -83,11 +79,10 @@ public class MongoAdmin implements MongoAdminOperations {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
-
 		this.password = password;
 	}

 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java
@@ -15,8 +15,9 @@
 */
 package org.springframework.data.mongodb.core;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
@@ -37,7 +38,7 @@ import com.mongodb.Mongo;
 */
 public abstract class MongoDbUtils {

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

 	/**
 	 * Private constructor to prevent instantiation.
@@ -49,76 +50,90 @@ public abstract class MongoDbUtils {
 	/**
 	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
 	 * 
-	 * @param mongo The {@link Mongo} instance
-	 * @param databaseName The database name
-	 * @return The {@link DB} connection
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, null, null, true);
+		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true);
 	}

 	/**
 	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
 	 * 
-	 * @param mongo The {@link Mongo} instance
-	 * @param databaseName The database name
-	 * @param username The username to authenticate with
-	 * @param password The password to authenticate with
-	 * @return The {@link DB} connection
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @param credentials the credentials to use, must not be {@literal null}.
+	 * @return the {@link DB} connection
 	 */
-	public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
-		return doGetDB(mongo, databaseName, username, password, true);
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
+
+		Assert.notNull(mongo, "No Mongo instance specified!");
+		Assert.hasText(databaseName, "Database name must be given!");
+		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
+
+		return doGetDB(mongo, databaseName, credentials, true);
 	}

-	public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
-		Assert.notNull(mongo, "No Mongo instance specified");
+	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate) {

 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
+
 		if (dbHolder != null && !dbHolder.isEmpty()) {
-			// pre-bound Mongo DB
+
 			DB db = null;
+
 			if (TransactionSynchronizationManager.isSynchronizationActive() && dbHolder.doesNotHoldNonDefaultDB()) {
-				// Spring transaction management is active ->
+
 				db = dbHolder.getDB(databaseName);
+
 				if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
-					LOGGER.debug("Registering Spring transaction synchronization for existing Mongo DB");
+
+					LOGGER.debug("Registering Spring transaction synchronization for existing MongoDB {}.", databaseName);
+
 					TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
 					dbHolder.setSynchronizedWithTransaction(true);
 				}
 			}
+
 			if (db != null) {
 				return db;
 			}
 		}

-		LOGGER.trace("Getting Mongo Database name=[" + databaseName + "]");
-		DB db = mongo.getDB(databaseName);
+		LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
+
+		DB db = mongo.getDB(databaseName);
+		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();

-		boolean credentialsGiven = username != null && password != null;
 		if (credentialsGiven && !db.isAuthenticated()) {
-			// Note, can only authenticate once against the same com.mongodb.DB object.
-			synchronized (db) {
-				if (!db.authenticate(username, password)) {
-					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
-							+ "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username,
-							password);
-				}
+
+			String username = credentials.getUsername();
+			String password = credentials.hasPassword() ? credentials.getPassword() : null;
+
+			if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
+				throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
+						+ "], username = [" + username + "], password = [" + password + "]", databaseName, 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");
+
+			LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
+
 			DbHolder holderToUse = dbHolder;
+
 			if (holderToUse == null) {
 				holderToUse = new DbHolder(databaseName, db);
 			} else {
 				holderToUse.addDB(databaseName, db);
 			}
+
 			TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
 			holderToUse.setSynchronizedWithTransaction(true);
+
 			if (holderToUse != dbHolder) {
 				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
 			}
@@ -142,11 +157,12 @@ public abstract class MongoDbUtils {
 	 * @return whether the DB is transactional
 	 */
 	public static boolean isDBTransactional(DB db, Mongo mongo) {
+
 		if (mongo == null) {
 			return false;
 		}
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-		return dbHolder != null && dbHolder.containsDB(db);
+		return (dbHolder != null && dbHolder.containsDB(db));
 	}

 	/**
@@ -155,6 +171,7 @@ public abstract class MongoDbUtils {
 	 * @param db the DB to close (may be <code>null</code>)
 	 */
 	public static void closeDB(DB db) {
+
 		if (db != null) {
 			LOGGER.debug("Closing Mongo DB object");
 			try {
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core;

 import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;

 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -30,9 +29,9 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Set;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.bson.types.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -55,6 +54,7 @@ import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.GeoResult;
 import org.springframework.data.mongodb.core.geo.GeoResults;
@@ -110,7 +110,7 @@ import com.mongodb.util.JSON;
 */
 public class MongoTemplate implements MongoOperations, ApplicationContextAware {

-	private static final Log LOGGER = LogFactory.getLog(MongoTemplate.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class);
 	private static final String ID = "_id";
 	private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE;
 	@SuppressWarnings("serial")
@@ -337,7 +337,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("Executing query: %s sort: %s fields: %s in collection: $s",
-					serializeToJsonSafely(queryObject), sortObject, fieldsObject, collectionName));
+					SerializationUtils.serializeToJsonSafely(queryObject), sortObject, fieldsObject, collectionName));
 		}

 		this.executeQueryInternal(new FindCallback(queryObject, fieldsObject), preparer, dch, collectionName);
@@ -456,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		} else {
 			query.limit(1);
 			List<T> results = find(query, entityClass, collectionName);
-			return results.isEmpty() ? null : results.get(0);
+			return (results.isEmpty() ? null : results.get(0));
 		}
 	}

@@ -836,11 +836,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 				DBObject queryObj = query == null ? new BasicDBObject()
 						: mapper.getMappedObject(query.getQueryObject(), entity);
-				DBObject updateObj = update.getUpdateObject();
-
-				for (String key : updateObj.keySet()) {
-					updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
-				}
+				DBObject updateObj = update == null ? new BasicDBObject() : mapper.getMappedObject(update.getUpdateObject(),
+						entity);

 				if (LOGGER.isDebugEnabled()) {
 					LOGGER.debug("calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
@@ -879,12 +876,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}

-		doRemove(collection, getIdQueryFor(object), object.getClass());
+		remove(getIdQueryFor(object), collection);
 	}

 	/**
 	 * Returns a {@link Query} for the given entity by its id.
-	 * 
+	 *
 	 * @param object must not be {@literal null}.
 	 * @return
 	 */
@@ -1008,7 +1005,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		handleCommandError(commandResult, commandObject);

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

 		MapReduceOutput mapReduceOutput = new MapReduceOutput(inputCollection, commandObject, commandResult);
@@ -1061,7 +1059,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		DBObject commandObject = new BasicDBObject("group", dbo);

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

 		CommandResult commandResult = executeCommand(commandObject, getDb().getOptions());
@@ -1173,7 +1172,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	/**
 	 * Create the specified collection using the provided options
-	 * 
+	 *
 	 * @param collectionName
 	 * @param collectionOptions
 	 * @return the collection that was created
@@ -1195,7 +1194,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * Map the results of an ad-hoc query on the default MongoDB collection to an object using the template's converter
 	 * <p/>
 	 * The query document is specified as a standard DBObject and so is the fields specification.
-	 * 
+	 *
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param fields the document that specifies the fields to be returned
@@ -1220,7 +1219,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * The query document is specified as a standard DBObject and so is the fields specification.
 	 * <p/>
 	 * Can be overridden by subclasses.
-	 * 
+	 *
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param fields the document that specifies the fields to be returned
@@ -1237,14 +1236,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	protected <S, T> List<T> doFind(String collectionName, DBObject query, DBObject fields, Class<S> entityClass,
 			CursorPreparer preparer, DbObjectCallback<T> objectCallback) {
-
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("find using query: %s fields: %s for class: %s in collection: %s",
-					serializeToJsonSafely(query), fields, entityClass, collectionName));
+			LOGGER.debug("find using query: " + query + " fields: " + fields + " for class: " + entityClass
+					+ " in collection: " + collectionName);
 		}
-
 		return executeFindMultiInternal(new FindCallback(mapper.getMappedObject(query, entity), fields), preparer,
 				objectCallback, collectionName);
 	}
@@ -1253,7 +1249,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * Map the results of an ad-hoc query on the default MongoDB collection to a List using the template's converter.
 	 * <p/>
 	 * The query document is specified as a standard DBObject and so is the fields specification.
-	 * 
+	 *
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param fields the document that specifies the fields to be returned
@@ -1292,7 +1288,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * The first document that matches the query is returned and also removed from the collection in the database.
 	 * <p/>
 	 * The query document is specified as a standard DBObject and so is the fields specification.
-	 * 
+	 *
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param entityClass the parameterized type of the returned list.
@@ -1339,7 +1335,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {

 	/**
 	 * Populates the id property of the saved object, if it's not set already.
-	 * 
+	 *
 	 * @param savedObject
 	 * @param id
 	 */
@@ -1392,7 +1388,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * <li>Execute the given {@link ConnectionCallback} for a {@link DBObject}.</li>
 	 * <li>Apply the given {@link DbObjectCallback} to each of the {@link DBObject}s to obtain the result.</li>
 	 * <ol>
-	 * 
+	 *
 	 * @param <T>
 	 * @param collectionCallback the callback to retrieve the {@link DBObject} with
 	 * @param objectCallback the {@link DbObjectCallback} to transform {@link DBObject}s into the actual domain type
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.mongodb.core.query;
+package org.springframework.data.mongodb.core;

 import java.util.Collection;
 import java.util.Iterator;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @param databaseName database name, not be {@literal null}.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, new UserCredentials(), false);
+		this(mongo, databaseName, UserCredentials.NO_CREDENTIALS, false);
 	}

 	/**
@@ -87,7 +87,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		this.mongo = mongo;
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.credentials = credentials == null ? new UserCredentials() : credentials;
+		this.credentials = credentials == null ? UserCredentials.NO_CREDENTIALS : credentials;
 	}

 	/**
@@ -115,10 +115,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {

 		Assert.hasText(dbName, "Database name must not be empty.");

-		String username = credentials.getUsername();
-		String password = credentials.getPassword();
-
-		DB db = MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
+		DB db = MongoDbUtils.getDB(mongo, dbName, credentials);

 		if (writeConcern != null) {
 			db.setWriteConcern(writeConcern);
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToObjectIdConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToBigIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToStringConverter;
@@ -39,6 +40,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali

 	protected final GenericConversionService conversionService;
 	protected CustomConversions conversions = new CustomConversions();
+	protected EntityInstantiators instantiators = new EntityInstantiators();

 	/**
 	 * Creates a new {@link AbstractMongoConverter} using the given {@link GenericConversionService}.
@@ -60,6 +62,15 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		this.conversions = conversions;
 	}

+	/**
+	 * Registers {@link EntityInstantiators} to customize entity instantiation.
+	 * 
+	 * @param instantiators
+	 */
+	public void setInstantiators(EntityInstantiators instantiators) {
+		this.instantiators = instantiators == null ? new EntityInstantiators() : instantiators;
+	}
+
 	/**
 	 * Registers additional converters that will be available when using the {@link ConversionService} directly (e.g. for
 	 * id conversion). These converters are not custom conversions as they'd introduce unwanted conversions (e.g.
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
 */
 public class CustomConversions {

-	private static final Log LOG = LogFactory.getLog(CustomConversions.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CustomConversions.class);
 	private static final String READ_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as reading converter although it doesn't convert from a Mongo supported type! You might wanna check you annotation setup at the converter implementation.";
 	private static final String WRITE_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as writing converter although it doesn't convert to a Mongo supported type! You might wanna check you annotation setup at the converter implementation.";

@@ -223,7 +223,7 @@ public class CustomConversions {

 	/**
 	 * Returns the target type we can write an onject of the given source type to. The returned type might be a subclass
-	 * oth the given expected type though. If {@code expexctedTargetType} is {@literal null} we will simply return the
+	 * oth the given expected type though. If {@code expectedTargetType} is {@literal null} we will simply return the
 	 * first target type matching or {@literal null} if no conversion can be found.
 	 * 
 	 * @param source must not be {@literal null}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappedConstructor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappedConstructor.java
@@ -1,180 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.PersistentPropertyPath;
-import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-
-/**
- * Abstraction for a {@link PreferredConstructor} alongside mapping information.
- * 
- * @author Oliver Gierke
- */
-class MappedConstructor {
-
-	private static final String REJECT_CONSTRUCTOR = String.format("Entity doesn't have a usable constructor, either "
-			+ "provide a custom converter or annotate a constructor with @%s!", PersistenceConstructor.class.getSimpleName());
-
-	private final Set<MappedConstructor.MappedParameter> parameters;
-
-	/**
-	 * Creates a new {@link MappedConstructor} from the given {@link MongoPersistentEntity} and {@link MappingContext}.
-	 * 
-	 * @param entity must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @throws MappingException in case the {@link MongoPersistentEntity} handed in does not have a
-	 *           {@link PreferredConstructor}.
-	 */
-	public MappedConstructor(MongoPersistentEntity<?> entity,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) throws MappingException {
-
-		Assert.notNull(entity);
-		Assert.notNull(context);
-
-		if (entity.getPreferredConstructor() == null) {
-			throw new MappingException(REJECT_CONSTRUCTOR);
-		}
-
-		this.parameters = new HashSet<MappedConstructor.MappedParameter>();
-
-		for (Parameter<?> parameter : entity.getPreferredConstructor().getParameters()) {
-			parameters.add(new MappedParameter(parameter, entity, context));
-		}
-	}
-
-	/**
-	 * Returns whether the given {@link PersistentProperty} is referenced in a constructor argument of the
-	 * {@link PersistentEntity} backing this {@link MappedConstructor}.
-	 * 
-	 * @param property must not be {@literal null}.
-	 * @return
-	 */
-	public boolean isConstructorParameter(PersistentProperty<?> property) {
-
-		Assert.notNull(property);
-
-		for (MappedConstructor.MappedParameter parameter : parameters) {
-			if (parameter.maps(property)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the {@link MappedParameter} for the given {@link Parameter}.
-	 * 
-	 * @param parameter must not be {@literal null}.
-	 * @return
-	 * @throws MappingException in case no {@link MappedParameter} can be found for the given {@link Parameter}.
-	 */
-	public MappedParameter getFor(Parameter<?> parameter) {
-
-		for (MappedParameter mappedParameter : parameters) {
-			if (mappedParameter.parameter.equals(parameter)) {
-				return mappedParameter;
-			}
-		}
-
-		throw new MappingException(String.format("Didn't find a MappedParameter for %s!", parameter.toString()));
-	}
-
-	/**
-	 * Abstraction of a {@link Parameter} alongside mapping information.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	static class MappedParameter {
-
-		private final MongoPersistentProperty property;
-		private final Parameter<?> parameter;
-
-		/**
-		 * Creates a new {@link MappedParameter} for the given {@link Parameter}, {@link MongoPersistentProperty} and
-		 * {@link MappingContext}.
-		 * 
-		 * @param parameter must not be {@literal null}.
-		 * @param entity must not be {@literal null}.
-		 * @param context must not be {@literal null}.
-		 */
-		public MappedParameter(Parameter<?> parameter, MongoPersistentEntity<?> entity,
-				MappingContext<? extends MongoPersistentEntity<?>, ? extends MongoPersistentProperty> context) {
-
-			Assert.notNull(parameter);
-			Assert.notNull(entity);
-			Assert.notNull(context);
-
-			this.parameter = parameter;
-
-			PropertyPath propertyPath = PropertyPath.from(parameter.getName(), entity.getType());
-			PersistentPropertyPath<? extends MongoPersistentProperty> path = context.getPersistentPropertyPath(propertyPath);
-			this.property = path == null ? null : path.getLeafProperty();
-		}
-
-		/**
-		 * Returns whether there is a SpEL expression configured for this parameter.
-		 * 
-		 * @return
-		 */
-		public boolean hasSpELExpression() {
-			return parameter.getKey() != null;
-		}
-
-		/**
-		 * Returns the field name to be used to lookup the value which in turn shall be converted into the constructor
-		 * parameter.
-		 * 
-		 * @return
-		 */
-		public String getFieldName() {
-			return property.getFieldName();
-		}
-
-		/**
-		 * Returns the type of the property backing the {@link Parameter}.
-		 * 
-		 * @return
-		 */
-		public TypeInformation<?> getPropertyTypeInformation() {
-			return property.getTypeInformation();
-		}
-
-		/**
-		 * Returns whether the given {@link PersistentProperty} is mapped by the parameter.
-		 * 
-		 * @param property
-		 * @return
-		 */
-		public boolean maps(PersistentProperty<?> property) {
-			return this.property.equals(property);
-		}
-	}
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 by the original author(s).
+ * Copyright 2011-2012 by the original author(s).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,44 +15,44 @@
 */
 package org.springframework.data.mongodb.core.convert;

-import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.support.ConversionServiceFactory;
+import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
+import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mapping.model.SpELAwareParameterValueProvider;
+import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
+import org.springframework.data.mapping.model.PropertyValueProvider;
+import org.springframework.data.mapping.model.SpELContext;
+import org.springframework.data.mapping.model.SpELExpressionEvaluator;
 import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -72,7 +72,7 @@ import com.mongodb.DBRef;
 */
 public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {

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

 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
@@ -83,6 +83,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	protected MongoTypeMapper typeMapper;
 	protected String mapKeyDotReplacement = null;

+	private SpELContext spELContext;
+
 	/**
 	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
 	 * 
@@ -102,6 +104,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		this.mappingContext = mappingContext;
 		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext);
 		this.idMapper = new QueryMapper(this);
+
+		this.spELContext = new SpELContext(DBObjectPropertyAccessor.INSTANCE);
 	}

 	/**
@@ -153,7 +157,9 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+
 		this.applicationContext = applicationContext;
+		this.spELContext = new SpELContext(this.spELContext, applicationContext);
 	}

 	/*
@@ -164,8 +170,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return read(ClassTypeInformation.from(clazz), dbo);
 	}

-	@SuppressWarnings("unchecked")
 	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo) {
+		return read(type, dbo, null);
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo, Object parent) {

 		if (null == dbo) {
 			return null;
@@ -183,11 +193,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}

 		if (typeToUse.isCollectionLike() && dbo instanceof BasicDBList) {
-			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo);
+			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo, parent);
 		}

 		if (typeToUse.isMap()) {
-			return (S) readMap(typeToUse, dbo);
+			return (S) readMap(typeToUse, dbo, parent);
 		}

 		// Retrieve persistent entity info
@@ -197,37 +207,43 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No mapping metadata found for " + rawType.getName());
 		}

-		return read(persistentEntity, dbo);
+		return read(persistentEntity, dbo, parent);
 	}

-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo) {
+	private ParameterValueProvider<MongoPersistentProperty> getParameterProvider(MongoPersistentEntity<?> entity,
+			DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {

-		final StandardEvaluationContext spelCtx = new StandardEvaluationContext(dbo);
-		spelCtx.addPropertyAccessor(DBObjectPropertyAccessor.INSTANCE);
+		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, parent);
+		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<MongoPersistentProperty>(
+				entity, provider, parent);
+		parameterProvider.setSpELEvaluator(evaluator);

-		if (applicationContext != null) {
-			spelCtx.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		}
+		return parameterProvider;
+	}

-		final MappedConstructor constructor = new MappedConstructor(entity, mappingContext);
+	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {

-		SpELAwareParameterValueProvider delegate = new SpELAwareParameterValueProvider(spelExpressionParser, spelCtx);
-		ParameterValueProvider provider = new DelegatingParameterValueProvider(constructor, dbo, delegate);
+		final DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(dbo, spELContext);

-		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(entity, provider, conversionService);
+		ParameterValueProvider<MongoPersistentProperty> provider = getParameterProvider(entity, dbo, evaluator, parent);
+		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
+		S instance = instantiator.createInstance(entity, provider);
+
+		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(instance, conversionService);
+		final S result = wrapper.getBean();

 		// Set properties not already set in the constructor
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {

-				boolean isConstructorProperty = constructor.isConstructorParameter(prop);
+				boolean isConstructorProperty = entity.isConstructorArgument(prop);
 				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());

 				if (!hasValueForProperty || isConstructorProperty) {
 					return;
 				}

-				Object obj = getValueInternal(prop, dbo, spelCtx, prop.getSpelExpression());
+				Object obj = getValueInternal(prop, dbo, evaluator, result);
 				wrapper.setProperty(prop, obj, useFieldAccessOnly);
 			}
 		});
@@ -236,7 +252,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
 				MongoPersistentProperty inverseProp = association.getInverse();
-				Object obj = getValueInternal(inverseProp, dbo, spelCtx, inverseProp.getSpelExpression());
+				Object obj = getValueInternal(inverseProp, dbo, evaluator, result);
 				try {
 					wrapper.setProperty(inverseProp, obj);
 				} catch (IllegalAccessException e) {
@@ -247,7 +263,23 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			}
 		});

-		return wrapper.getBean();
+		return result;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#toDBRef(java.lang.Object, org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
+	 */
+	public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
+
+		org.springframework.data.mongodb.core.mapping.DBRef annotation = null;
+
+		if (referingProperty != null) {
+			annotation = referingProperty.getDBRef();
+			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
+		}
+
+		return createDBRef(object, annotation);
 	}

 	/**
@@ -642,12 +674,20 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App

 	protected DBRef createDBRef(Object target, org.springframework.data.mongodb.core.mapping.DBRef dbref) {

+		Assert.notNull(target);
+
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
-		if (null == targetEntity || null == targetEntity.getIdProperty()) {
-			return null;
+
+		if (null == targetEntity) {
+			throw new MappingException("No mapping metadata found for " + target.getClass());
 		}

 		MongoPersistentProperty idProperty = targetEntity.getIdProperty();
+
+		if (idProperty == null) {
+			throw new MappingException("No id property found on class " + targetEntity.getType());
+		}
+
 		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
 		Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);

@@ -655,69 +695,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("Cannot create a reference to an object with a NULL id.");
 		}

-		String collection = dbref.collection();
-		if ("".equals(collection)) {
-			collection = targetEntity.getCollection();
-		}
+		DB db = mongoDbFactory.getDb();
+		db = dbref != null && StringUtils.hasText(dbref.db()) ? mongoDbFactory.getDb(dbref.db()) : db;

-		String dbname = dbref.db();
-		DB db = StringUtils.hasText(dbname) ? mongoDbFactory.getDb(dbname) : mongoDbFactory.getDb();
-
-		return new DBRef(db, collection, idMapper.convertId(id));
+		return new DBRef(db, targetEntity.getCollection(), idMapper.convertId(id));
 	}

-	@SuppressWarnings("unchecked")
-	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, StandardEvaluationContext ctx,
-			String spelExpr) {
+	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
+			Object parent) {

-		Object o;
-		if (null != spelExpr) {
-			Expression x = spelExpressionParser.parseExpression(spelExpr);
-			o = x.getValue(ctx);
-		} else {
-
-			Object sourceValue = dbo.get(prop.getFieldName());
-
-			if (sourceValue == null) {
-				return null;
-			}
-
-			Class<?> propertyType = prop.getType();
-
-			if (conversions.hasCustomReadTarget(sourceValue.getClass(), propertyType)) {
-				return conversionService.convert(sourceValue, propertyType);
-			}
-
-			if (sourceValue instanceof DBRef) {
-				sourceValue = ((DBRef) sourceValue).fetch();
-			}
-			if (sourceValue instanceof DBObject) {
-				if (prop.isMap()) {
-					return readMap(prop.getTypeInformation(), (DBObject) sourceValue);
-				} else if (prop.isArray() && sourceValue instanceof BasicDBObject
-						&& ((DBObject) sourceValue).keySet().size() == 0) {
-					// It's empty
-					return Array.newInstance(prop.getComponentType(), 0);
-				} else if (prop.isCollectionLike() && sourceValue instanceof BasicDBList) {
-					return readCollectionOrArray((TypeInformation<? extends Collection<?>>) prop.getTypeInformation(),
-							(BasicDBList) sourceValue);
-				}
-
-				TypeInformation<?> toType = typeMapper.readType((DBObject) sourceValue, prop.getTypeInformation());
-
-				// It's a complex object, have to read it in
-				if (toType != null) {
-					// TODO: why do we remove the type?
-					// dbo.removeField(CUSTOM_TYPE_KEY);
-					o = read(toType, (DBObject) sourceValue);
-				} else {
-					o = read(mappingContext.getPersistentEntity(prop.getTypeInformation()), (DBObject) sourceValue);
-				}
-			} else {
-				o = sourceValue;
-			}
-		}
-		return o;
+		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(dbo, spELContext, parent);
+		return provider.getPropertyValue(prop);
 	}

 	/**
@@ -725,28 +713,36 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param targetType must not be {@literal null}.
 	 * @param sourceValue must not be {@literal null}.
-	 * @return the converted {@link Collections}, will never be {@literal null}.
+	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
 	@SuppressWarnings("unchecked")
-	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue) {
+	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {

 		Assert.notNull(targetType);

+		if (sourceValue.isEmpty()) {
+			return new HashSet<Object>();
+		}
+
 		Class<?> collectionType = targetType.getType();
 		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;

 		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
 				.createCollection(collectionType, sourceValue.size());
+		TypeInformation<?> componentType = targetType.getComponentType();
+		Class<?> rawComponentType = componentType == null ? null : componentType.getType();

 		for (int i = 0; i < sourceValue.size(); i++) {
+
 			Object dbObjItem = sourceValue.get(i);
+
 			if (dbObjItem instanceof DBRef) {
-				items.add(read(targetType.getComponentType(), ((DBRef) dbObjItem).fetch()));
+				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, ((DBRef) dbObjItem).fetch(),
+						parent));
 			} else if (dbObjItem instanceof DBObject) {
-				items.add(read(targetType.getComponentType(), (DBObject) dbObjItem));
+				items.add(read(componentType, (DBObject) dbObjItem, parent));
 			} else {
-				TypeInformation<?> componentType = targetType.getComponentType();
-				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, componentType == null ? null : componentType.getType()));
+				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, rawComponentType));
 			}
 		}

@@ -761,7 +757,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject) {
+	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, Object parent) {

 		Assert.notNull(dbObject);

@@ -784,9 +780,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App

 			Object value = entry.getValue();
 			TypeInformation<?> valueType = type.getMapValueType();
+			Class<?> rawValueType = valueType == null ? null : valueType.getType();

 			if (value instanceof DBObject) {
-				map.put(key, read(valueType, (DBObject) value));
+				map.put(key, read(valueType, (DBObject) value, parent));
+			} else if (value instanceof DBRef) {
+				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, ((DBRef) value).fetch()));
 			} else {
 				Class<?> valueClass = valueType == null ? null : valueType.getType();
 				map.put(key, getPotentiallyConvertedSimpleRead(value, valueClass));
@@ -907,53 +906,53 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbObject;
 	}

-	private class DelegatingParameterValueProvider implements ParameterValueProvider {
+	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {

 		private final DBObject source;
-		private final ParameterValueProvider delegate;
-		private final MappedConstructor constructor;
+		private final SpELExpressionEvaluator evaluator;
+		private final Object parent;

-		/**
-		 * {@link ParameterValueProvider} to delegate source object lookup to a {@link SpELAwareParameterValueProvider} in
-		 * case a MappCon
-		 * 
-		 * @param constructor must not be {@literal null}.
-		 * @param source must not be {@literal null}.
-		 * @param delegate must not be {@literal null}.
-		 */
-		public DelegatingParameterValueProvider(MappedConstructor constructor, DBObject source,
-				SpELAwareParameterValueProvider delegate) {
+		public MongoDbPropertyValueProvider(DBObject source, SpELContext factory, Object parent) {
+			this(source, new DefaultSpELExpressionEvaluator(source, factory), parent);
+		}
+
+		public MongoDbPropertyValueProvider(DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {

-			Assert.notNull(constructor);
 			Assert.notNull(source);
-			Assert.notNull(delegate);
+			Assert.notNull(evaluator);

-			this.constructor = constructor;
 			this.source = source;
-			this.delegate = delegate;
+			this.evaluator = evaluator;
+			this.parent = parent;
 		}

 		/* 
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mapping.model.ParameterValueProvider#getParameterValue(org.springframework.data.mapping.PreferredConstructor.Parameter)
+		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
 		 */
 		@SuppressWarnings("unchecked")
-		public <T> T getParameterValue(Parameter<T> parameter) {
+		public <T> T getPropertyValue(MongoPersistentProperty property) {

-			MappedConstructor.MappedParameter mappedParameter = constructor.getFor(parameter);
-			Object value = mappedParameter.hasSpELExpression() ? delegate.getParameterValue(parameter) : source
-					.get(mappedParameter.getFieldName());
+			String expression = property.getSpelExpression();
+			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property.getFieldName());

-			TypeInformation<?> type = mappedParameter.getPropertyTypeInformation();
+			if (value == null) {
+				return null;
+			}

-			if (value instanceof DBRef) {
-				return (T) read(type, ((DBRef) value).fetch());
+			TypeInformation<?> type = property.getTypeInformation();
+			Class<?> rawType = type.getType();
+
+			if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
+				return (T) conversionService.convert(value, rawType);
+			} else if (value instanceof DBRef) {
+				return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
 			} else if (value instanceof BasicDBList) {
-				return (T) getPotentiallyConvertedSimpleRead(readCollectionOrArray(type, (BasicDBList) value), type.getType());
+				return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
 			} else if (value instanceof DBObject) {
-				return (T) read(type, (DBObject) value);
+				return (T) read(type, (DBObject) value, parent);
 			} else {
-				return (T) getPotentiallyConvertedSimpleRead(value, type.getType());
+				return (T) getPotentiallyConvertedSimpleRead(value, rawType);
 			}
 		}
 	}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 package org.springframework.data.mongodb.core.convert;

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

 import com.mongodb.DBObject;
+import com.mongodb.DBRef;

 /**
 * A MongoWriter is responsible for converting an object of type T to the native MongoDB representation DBObject.
@@ -37,4 +39,14 @@ public interface MongoWriter<T> extends EntityWriter<T, DBObject> {
 	 * @return
 	 */
 	Object convertToMongoType(Object obj);
+
+	/**
+	 * Creates a {@link DBRef} to refer to the given object.
+	 * 
+	 * @param object the object to create a {@link DBRef} to link to. The object's type has to carry an id attribute.
+	 * @param referingProperty the client-side property referring to the object which might carry additional metadata for
+	 *          the {@link DBRef} object to create. Can be {@literal null}.
+	 * @return will never be {@literal null}.
+	 */
+	DBRef toDBRef(Object object, MongoPersistentProperty referingProperty);
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.mongodb.core;
+package org.springframework.data.mongodb.core.convert;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,6 @@ import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
@@ -86,8 +85,6 @@ public class QueryMapper {
 							ids.add(convertId(id));
 						}
 						valueDbo.put(inKey, ids.toArray(new Object[ids.size()]));
-					} else if (valueDbo.containsField("$ne")) {
-						valueDbo.put("$ne", convertId(valueDbo.get("$ne")));
 					} else {
 						value = getMappedObject((DBObject) value, null);
 					}
@@ -101,9 +98,11 @@ public class QueryMapper {
 				BasicBSONList newConditions = new BasicBSONList();
 				Iterator<?> iter = conditions.iterator();
 				while (iter.hasNext()) {
-					newConditions.add(getMappedObject((DBObject) iter.next(), entity));
+					newConditions.add(getMappedObject((DBObject) iter.next(), null));
 				}
 				value = newConditions;
+			} else if (key.equals("$ne")) {
+				value = convertId(value);
 			}

 			newDbo.put(newKey, convertSimpleOrDBObject(value, null));
@@ -145,8 +144,9 @@ public class QueryMapper {
 			return false;
 		}

-		if (entity.getIdProperty() != null) {
-			MongoPersistentProperty idProperty = entity.getIdProperty();
+		MongoPersistentProperty idProperty = entity.getIdProperty();
+
+		if (idProperty != null) {
 			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
 		}

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
@@ -15,16 +15,16 @@
 */
 package org.springframework.data.mongodb.core.index;

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

-import org.springframework.data.mongodb.core.query.Order;
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

 public class IndexInfo {

-	private final Map<String, Order> fieldSpec;
 	private final List<IndexField> indexFields;

 	private final String name;
@@ -32,10 +32,8 @@ public class IndexInfo {
 	private final boolean dropDuplicates;
 	private final boolean sparse;

-	public IndexInfo(Map<String, Order> fieldSpec, List<IndexField> indexFields, String name, boolean unique,
-			boolean dropDuplicates, boolean sparse) {
+	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean dropDuplicates, boolean sparse) {

-		this.fieldSpec = fieldSpec;
 		this.indexFields = Collections.unmodifiableList(indexFields);
 		this.name = name;
 		this.unique = unique;
@@ -43,15 +41,6 @@ public class IndexInfo {
 		this.sparse = sparse;
 	}

-	/**
-	 * @deprecated use {@link #getIndexFields()} instead as this {@link Map} does not contain geo indexes.
-	 * @return
-	 */
-	@Deprecated
-	public Map<String, Order> getFieldSpec() {
-		return fieldSpec;
-	}
-
 	/**
 	 * Returns the individual index fields of the index.
 	 * 
@@ -61,6 +50,24 @@ public class IndexInfo {
 		return this.indexFields;
 	}

+	/**
+	 * Returns whether the index is covering exactly the fields given independently of the order.
+	 * 
+	 * @param keys must not be {@literal null}.
+	 * @return
+	 */
+	public boolean isIndexForFields(Collection<String> keys) {
+
+		Assert.notNull(keys);
+		List<String> indexKeys = new ArrayList<String>(indexFields.size());
+
+		for (IndexField field : indexFields) {
+			indexKeys.add(field.getKey());
+		}
+
+		return indexKeys.containsAll(keys);
+	}
+
 	public String getName() {
 		return name;
 	}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
@@ -19,8 +19,8 @@ import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyHandler;
@@ -46,7 +46,7 @@ import com.mongodb.util.JSON;
 public class MongoPersistentEntityIndexCreator implements
 		ApplicationListener<MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>> {

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

 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
@@ -21,9 +21,9 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.bson.types.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -39,7 +39,7 @@ import com.mongodb.DBObject;
 public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty<MongoPersistentProperty> implements
 		MongoPersistentProperty {

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

 	private static final String ID_FIELD_NAME = "_id";
 	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
@@ -87,6 +87,7 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 */
 	@Override
 	public boolean isIdProperty() {
+
 		if (super.isIdProperty()) {
 			return true;
 		}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
@@ -28,6 +28,7 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
 public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty {

 	private Boolean isIdProperty;
+	private Boolean isAssociation;
 	private String fieldName;

 	/**
@@ -57,6 +58,18 @@ public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty
 		return this.isIdProperty;
 	}

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isAssociation()
+	 */
+	@Override
+	public boolean isAssociation() {
+		if (this.isAssociation == null) {
+			this.isAssociation = super.isAssociation();
+		}
+		return this.isAssociation;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getFieldName()
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 by the original author(s).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core.mapping;

+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -24,19 +24,21 @@ import java.lang.annotation.Target;
 import org.springframework.data.annotation.Reference;

 /**
- * An annotation that indicates the annotated field is to be stored using a com.mongodb.DBRef
+ * An annotation that indicates the annotated field is to be stored using a {@link com.mongodb.DBRef}.
 * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
+ * @authot Oliver Gierke
 */
+@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.FIELD })
@Reference
 public @interface DBRef {

-	String collection() default "";
-
-	String id() default "";
-
+	/**
+	 * The database the referred entity resides in.
+	 * 
+	 * @return
+	 */
 	String db() default "";
-
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java
@@ -15,12 +15,13 @@
 */
 package org.springframework.data.mongodb.core.mapping.event;

-import com.mongodb.DBObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.GenericTypeResolver;

+import com.mongodb.DBObject;
+
 /**
 * Base class to implement domain class specific {@link ApplicationListener}s.
 * 
@@ -29,7 +30,7 @@ import org.springframework.core.GenericTypeResolver;
 */
 public abstract class AbstractMongoEventListener<E> implements ApplicationListener<MongoMappingEvent<?>> {

-	protected final Log LOG = LogFactory.getLog(getClass());
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractMongoEventListener.class);
 	private final Class<?> domainClass;

 	/**
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,22 +15,31 @@
 */
 package org.springframework.data.mongodb.core.mapping.event;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.mongodb.DBObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;

 /**
 * @author Jon Brisbin <jbrisbin@vmware.com>
 */
 public class LoggingEventListener extends AbstractMongoEventListener<Object> {

-	private Log log = LogFactory.getLog(getClass());
+	private static final Logger log = LoggerFactory.getLogger(LoggingEventListener.class);

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeConvert(java.lang.Object)
+	 */
 	@Override
 	public void onBeforeConvert(Object source) {
 		log.info("onBeforeConvert: " + source);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.DBObject)
+	 */
 	@Override
 	public void onBeforeSave(Object source, DBObject dbo) {
 		try {
@@ -39,19 +48,30 @@ public class LoggingEventListener extends AbstractMongoEventListener<Object> {
 		}
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterSave(java.lang.Object, com.mongodb.DBObject)
+	 */
 	@Override
 	public void onAfterSave(Object source, DBObject dbo) {
 		log.info("onAfterSave: " + source + ", " + dbo);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterLoad(com.mongodb.DBObject)
+	 */
 	@Override
 	public void onAfterLoad(DBObject dbo) {
 		log.info("onAfterLoad: " + dbo);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterConvert(com.mongodb.DBObject, java.lang.Object)
+	 */
 	@Override
 	public void onAfterConvert(DBObject dbo, Object source) {
 		log.info("onAfterConvert: " + dbo + ", " + source);
 	}
-
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
+import java.util.Set;
+
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBObject;
+
+/**
+ * javax.validation dependant entities validator. When it is registered as Spring component its automatically invoked
+ * before entities are saved in database.
+ * 
+ * @author Maciej Walkowiak
+ */
+public class ValidatingMongoEventListener extends AbstractMongoEventListener<Object> {
+
+	private static final Logger LOG = LoggerFactory.getLogger(ValidatingMongoEventListener.class);
+
+	private final Validator validator;
+
+	/**
+	 * Creates a new {@link ValidatingMongoEventListener} using the given {@link Validator}.
+	 * 
+	 * @param validator must not be {@literal null}.
+	 */
+	public ValidatingMongoEventListener(Validator validator) {
+		Assert.notNull(validator);
+		this.validator = validator;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.DBObject)
+	 */
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void onBeforeSave(Object source, DBObject dbo) {
+
+		LOG.debug("Validating object: {}", source);
+		Set violations = validator.validate(source);
+
+		if (!violations.isEmpty()) {
+
+			LOG.info("During object: {} validation violations found: {}", source, violations);
+			throw new ConstraintViolationException(violations);
+		}
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
@@ -514,28 +514,9 @@ public class Criteria implements CriteriaDefinition {

 		Criteria that = (Criteria) obj;

-		if (this.criteriaChain.size() != that.criteriaChain.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < this.criteriaChain.size(); i++) {
-
-			Criteria left = this.criteriaChain.get(i);
-			Criteria right = that.criteriaChain.get(i);
-
-			if (!simpleCriteriaEquals(left, right)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private boolean simpleCriteriaEquals(Criteria left, Criteria right) {
-
-		boolean keyEqual = left.key == null ? right.key == null : left.key.equals(right.key);
-		boolean criteriaEqual = left.criteria.equals(right.criteria);
-		boolean valueEqual = isEqual(left.isValue, right.isValue);
+		boolean keyEqual = this.key == null ? that.key == null : this.key.equals(that.key);
+		boolean criteriaEqual = this.criteria.equals(that.criteria);
+		boolean valueEqual = isEqual(this.isValue, that.isValue);

 		return keyEqual && criteriaEqual && valueEqual;
 	}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -15,7 +15,7 @@
 */
 package org.springframework.data.mongodb.core.query;

-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.SerializationUtils.*;
 import static org.springframework.util.ObjectUtils.*;

 import java.util.ArrayList;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java
@@ -0,0 +1,106 @@
+/*
+ * 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.gridfs;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.util.Assert;
+
+/**
+ * Value object to abstract Ant paths.
+ * 
+ * @author Oliver Gierke
+ */
+class AntPath {
+
+	private static final String PREFIX_DELIMITER = ":";
+	private static final Pattern WILDCARD_PATTERN = Pattern.compile("\\?|\\*\\*|\\*");
+
+	private final String path;
+
+	/**
+	 * Creates a new {@link AntPath} from the given path.
+	 * 
+	 * @param path must not be {@literal null}.
+	 */
+	public AntPath(String path) {
+		Assert.notNull(path);
+		this.path = path;
+	}
+
+	/**
+	 * Returns whether the path is a pattern.
+	 * 
+	 * @return
+	 */
+	public boolean isPattern() {
+		String path = stripPrefix(this.path);
+		return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
+	}
+
+	private static String stripPrefix(String path) {
+		int index = path.indexOf(PREFIX_DELIMITER);
+		return (index > -1 ? path.substring(index + 1) : path);
+	}
+
+	/**
+	 * Returns the regular expression equivalent of this Ant path.
+	 * 
+	 * @return
+	 */
+	public String toRegex() {
+
+		StringBuilder patternBuilder = new StringBuilder();
+		Matcher m = WILDCARD_PATTERN.matcher(path);
+		int end = 0;
+
+		while (m.find()) {
+
+			patternBuilder.append(quote(path, end, m.start()));
+			String match = m.group();
+
+			if ("?".equals(match)) {
+				patternBuilder.append('.');
+			} else if ("**".equals(match)) {
+				patternBuilder.append(".*");
+			} else if ("*".equals(match)) {
+				patternBuilder.append("[^/]*");
+			}
+
+			end = m.end();
+		}
+
+		patternBuilder.append(quote(path, end, path.length()));
+		return patternBuilder.toString();
+	}
+
+	private static String quote(String s, int start, int end) {
+		if (start == end) {
+			return "";
+		}
+		return Pattern.quote(s.substring(start, end));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return path;
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java
@@ -0,0 +1,73 @@
+/*
+ * 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.gridfs;
+
+import org.springframework.data.mongodb.core.query.Criteria;
+
+/**
+ * GridFs-specific helper class to define {@link Criteria}s.
+ * 
+ * @author Oliver Gierke
+ */
+public class GridFsCriteria extends Criteria {
+
+	/**
+	 * Creates a new {@link GridFsCriteria} for the given key.
+	 * 
+	 * @param key
+	 */
+	public GridFsCriteria(String key) {
+		super(key);
+	}
+
+	/**
+	 * Creates a {@link GridFsCriteria} for restrictions on the file's metadata.
+	 * 
+	 * @return
+	 */
+	public static GridFsCriteria whereMetaData() {
+		return new GridFsCriteria("metadata");
+	}
+
+	/**
+	 * Creates a {@link GridFsCriteria} for restrictions on a single file's metadata item.
+	 * 
+	 * @param metadataKey
+	 * @return
+	 */
+	public static GridFsCriteria whereMetaData(String metadataKey) {
+		String extension = metadataKey == null ? "" : "." + metadataKey;
+		return new GridFsCriteria(String.format("metadata%s", extension));
+	}
+
+	/**
+	 * Creates a {@link GridFsCriteria} for restrictions on the file's name.
+	 * 
+	 * @return
+	 */
+	public static GridFsCriteria whereFilename() {
+		return new GridFsCriteria("filename");
+	}
+
+	/**
+	 * Creates a {@link GridFsCriteria} for restrictions on the file's content type.
+	 * 
+	 * @return
+	 */
+	public static GridFsCriteria whereContentType() {
+		return new GridFsCriteria("contentType");
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
@@ -0,0 +1,105 @@
+/*
+ * 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.gridfs;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.data.mongodb.core.query.Query;
+
+import com.mongodb.DBObject;
+import com.mongodb.gridfs.GridFSDBFile;
+import com.mongodb.gridfs.GridFSFile;
+
+/**
+ * Collection of operations to store and read files from MongoDB GridFS.
+ * 
+ * @author Oliver Gierke
+ */
+public interface GridFsOperations extends ResourcePatternResolver {
+
+	/**
+	 * Stores the given content into a file with the given name.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename);
+
+	/**
+	 * Stores the given content into a file with the given name using the given metadata. The metadata object will be
+	 * marshalled before writing.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @param metadata
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename, Object metadata);
+
+	/**
+	 * Stores the given content into a file with the given name using the given metadata.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param filename must not be {@literal null} or empty.
+	 * @param metadata must not be {@literal null}.
+	 * @return the {@link GridFSFile} just created
+	 */
+	GridFSFile store(InputStream content, String filename, DBObject metadata);
+
+	/**
+	 * Returns all files matching the given query.
+	 * 
+	 * @param query
+	 * @return
+	 */
+	List<GridFSDBFile> find(Query query);
+
+	/**
+	 * Returns a single file matching the given query or {@literal null} in case no file matches.
+	 * 
+	 * @param query
+	 * @return
+	 */
+	GridFSDBFile findOne(Query query);
+
+	/**
+	 * Deletes all files matching the given {@link Query}.
+	 * 
+	 * @param query
+	 */
+	void delete(Query query);
+
+	/**
+	 * Returns all {@link GridFsResource} with the given file name.
+	 * 
+	 * @param filename
+	 * @return
+	 * @see ResourcePatternResolver#getResource(String)
+	 */
+	GridFsResource getResource(String filename);
+
+	/**
+	 * Returns all {@link GridFsResource}s matching the given file name pattern.
+	 * 
+	 * @param filenamePattern
+	 * @return
+	 * @see ResourcePatternResolver#getResources(String)
+	 */
+	GridFsResource[] getResources(String filenamePattern);
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java
@@ -0,0 +1,88 @@
+/*
+ * 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.gridfs;
+
+import java.io.IOException;
+
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+
+import com.mongodb.gridfs.GridFSDBFile;
+
+/**
+ * {@link GridFSDBFile} based {@link Resource} implementation.
+ * 
+ * @author Oliver Gierke
+ */
+public class GridFsResource extends InputStreamResource {
+
+	private final GridFSDBFile file;
+
+	/**
+	 * Creates a new {@link GridFsResource} from the given {@link GridFSDBFile}.
+	 * 
+	 * @param file must not be {@literal null}.
+	 */
+	public GridFsResource(GridFSDBFile file) {
+		super(file.getInputStream());
+		this.file = file;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.AbstractResource#contentLength()
+	 */
+	@Override
+	public long contentLength() throws IOException {
+		return file.getLength();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.AbstractResource#getFilename()
+	 */
+	@Override
+	public String getFilename() throws IllegalStateException {
+		return file.getFilename();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.AbstractResource#lastModified()
+	 */
+	@Override
+	public long lastModified() throws IOException {
+		return file.getUploadDate().getTime();
+	}
+
+	/**
+	 * Returns the {@link Resource}'s id.
+	 * 
+	 * @return
+	 */
+	public Object getId() {
+		return file.getId();
+	}
+
+	/**
+	 * Returns the {@link Resource}'s content type.
+	 * 
+	 * @return
+	 */
+	public String getContentType() {
+		return file.getContentType();
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
@@ -0,0 +1,194 @@
+/*
+ * 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.gridfs;
+
+import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.springframework.data.mongodb.gridfs.GridFsCriteria.*;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.DBObject;
+import com.mongodb.gridfs.GridFS;
+import com.mongodb.gridfs.GridFSDBFile;
+import com.mongodb.gridfs.GridFSFile;
+import com.mongodb.gridfs.GridFSInputFile;
+
+/**
+ * {@link GridFsOperations} implementation to store content into MongoDB GridFS.
+ * 
+ * @author Oliver Gierke
+ */
+public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {
+
+	private final MongoDbFactory dbFactory;
+	private final String bucket;
+	private final MongoConverter converter;
+	private final QueryMapper queryMapper;
+
+	/**
+	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
+	 * 
+	 * @param dbFactory must not be {@literal null}.
+	 * @param converter must not be {@literal null}.
+	 */
+	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter) {
+		this(dbFactory, converter, null);
+	}
+
+	/**
+	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
+	 * 
+	 * @param dbFactory must not be {@literal null}.
+	 * @param converter must not be {@literal null}.
+	 * @param bucket
+	 */
+	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter, String bucket) {
+
+		Assert.notNull(dbFactory);
+		Assert.notNull(converter);
+
+		this.dbFactory = dbFactory;
+		this.converter = converter;
+		this.bucket = bucket;
+
+		this.queryMapper = new QueryMapper(converter);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String)
+	 */
+	public GridFSFile store(InputStream content, String filename) {
+		return store(content, filename, (Object) null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.Object)
+	 */
+	public GridFSFile store(InputStream content, String filename, Object metadata) {
+
+		DBObject dbObject = new BasicDBObject();
+		converter.write(metadata, dbObject);
+		return store(content, filename, dbObject);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.DBObject)
+	 */
+	public GridFSFile store(InputStream content, String filename, DBObject metadata) {
+
+		Assert.notNull(content);
+		Assert.hasText(filename);
+		Assert.notNull(metadata);
+
+		GridFSInputFile file = getGridFs().createFile(content);
+		file.setFilename(filename);
+		file.setMetaData(metadata);
+		file.save();
+
+		return file;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.DBObject)
+	 */
+	public List<GridFSDBFile> find(Query query) {
+		return getGridFs().find(getMappedQuery(query));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#findOne(com.mongodb.DBObject)
+	 */
+	public GridFSDBFile findOne(Query query) {
+		return getGridFs().findOne(getMappedQuery(query));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#delete(org.springframework.data.mongodb.core.query.Query)
+	 */
+	public void delete(Query query) {
+		getGridFs().remove(getMappedQuery(query));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.ResourceLoader#getClassLoader()
+	 */
+	public ClassLoader getClassLoader() {
+		return dbFactory.getClass().getClassLoader();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
+	 */
+	public GridFsResource getResource(String location) {
+		return new GridFsResource(findOne(query(whereFilename().is(location))));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.io.support.ResourcePatternResolver#getResources(java.lang.String)
+	 */
+	public GridFsResource[] getResources(String locationPattern) {
+
+		if (!StringUtils.hasText(locationPattern)) {
+			return new GridFsResource[0];
+		}
+
+		AntPath path = new AntPath(locationPattern);
+
+		if (path.isPattern()) {
+
+			List<GridFSDBFile> files = find(query(whereFilename().regex(path.toRegex())));
+			List<GridFsResource> resources = new ArrayList<GridFsResource>(files.size());
+
+			for (GridFSDBFile file : files) {
+				resources.add(new GridFsResource(file));
+			}
+
+			return resources.toArray(new GridFsResource[resources.size()]);
+		}
+
+		return new GridFsResource[] { getResource(locationPattern) };
+	}
+
+	private DBObject getMappedQuery(Query query) {
+		return query == null ? null : queryMapper.getMappedObject(query.getQueryObject(), null);
+	}
+
+	private GridFS getGridFs() {
+		DB db = dbFactory.getDb();
+		return bucket == null ? new GridFS(db) : new GridFS(db, bucket);
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,13 +15,15 @@
 */
 package org.springframework.data.mongodb.monitor;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mongodb.core.MongoDbUtils;
+
 import com.mongodb.CommandResult;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
 import com.mongodb.MongoException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.mongodb.core.MongoDbUtils;

 /**
 * Base class to encapsulate common configuration settings when connecting to a database
@@ -30,7 +32,7 @@ import org.springframework.data.mongodb.core.MongoDbUtils;
 */
 public abstract class AbstractMonitor {

-	private final Log logger = LogFactory.getLog(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());

 	protected Mongo mongo;
 	private String username;
@@ -51,7 +53,6 @@ public abstract class AbstractMonitor {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
-
 		this.password = password;
 	}

@@ -65,6 +66,6 @@ public abstract class AbstractMonitor {
 	}

 	public DB getDb(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,22 +32,19 @@ public interface MongoRepository<T, ID extends Serializable> extends PagingAndSo

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.data.repository.Repository#save(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
 	 */
-	List<T> save(Iterable<? extends T> entites);
+	<S extends T> List<S> save(Iterable<S> entites);

 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see org.springframework.data.repository.Repository#findAll()
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.CrudRepository#findAll()
+	 */
 	List<T> findAll();

 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
+	 */
 	List<T> findAll(Sort sort);
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.cdi;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.util.Assert;
+
+/**
+ * {@link CdiRepositoryBean} to create Mongo repository instances.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoRepositoryBean<T> extends CdiRepositoryBean<T> {
+
+	private final Bean<MongoOperations> operations;
+
+	/**
+	 * Creates a new {@link MongoRepositoryBean}.
+	 * 
+	 * @param operations must not be {@literal null}.
+	 * @param qualifiers must not be {@literal null}.
+	 * @param repositoryType must not be {@literal null}.
+	 * @param beanManager must not be {@literal null}.
+	 */
+	public MongoRepositoryBean(Bean<MongoOperations> operations, Set<Annotation> qualifiers, Class<T> repositoryType,
+			BeanManager beanManager) {
+
+		super(qualifiers, repositoryType, beanManager);
+
+		Assert.notNull(operations);
+		this.operations = operations;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see javax.enterprise.inject.spi.Bean#getScope()
+	 */
+	public Class<? extends Annotation> getScope() {
+		return operations.getScope();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
+	 */
+	@Override
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
+
+		MongoOperations mongoOperations = getDependencyInstance(operations, MongoOperations.class);
+		MongoRepositoryFactory factory = new MongoRepositoryFactory(mongoOperations);
+
+		return factory.getRepository(repositoryType);
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.cdi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
+
+/**
+ * CDI extension to export Mongo repositories.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoRepositoryExtension extends CdiRepositoryExtensionSupport {
+
+	private static final Logger LOG = LoggerFactory.getLogger(MongoRepositoryExtension.class);
+
+	private final Map<Set<Annotation>, Bean<MongoOperations>> mongoOperations = new HashMap<Set<Annotation>, Bean<MongoOperations>>();
+
+	public MongoRepositoryExtension() {
+		LOG.info("Activating CDI extension for Spring Data MongoDB repositories.");
+	}
+
+	@SuppressWarnings("unchecked")
+	<X> void processBean(@Observes ProcessBean<X> processBean) {
+
+		Bean<X> bean = processBean.getBean();
+
+		for (Type type : bean.getTypes()) {
+			if (type instanceof Class<?> && MongoOperations.class.isAssignableFrom((Class<?>) type)) {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug(String.format("Discovered %s with qualifiers %s.", MongoOperations.class.getName(),
+							bean.getQualifiers()));
+				}
+
+				// Store the EntityManager bean using its qualifiers.
+				mongoOperations.put(new HashSet<Annotation>(bean.getQualifiers()), (Bean<MongoOperations>) bean);
+			}
+		}
+	}
+
+	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
+
+		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
+
+			Class<?> repositoryType = entry.getKey();
+			Set<Annotation> qualifiers = entry.getValue();
+
+			// Create the bean representing the repository.
+			Bean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
+
+			if (LOG.isInfoEnabled()) {
+				LOG.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
+			}
+
+			// Register the bean to the container.
+			afterBeanDiscovery.addBean(repositoryBean);
+		}
+	}
+
+	/**
+	 * Creates a {@link Bean}.
+	 * 
+	 * @param <T> The type of the repository.
+	 * @param repositoryType The class representing the repository.
+	 * @param beanManager The BeanManager instance.
+	 * @return The bean.
+	 */
+	private <T> Bean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers, BeanManager beanManager) {
+
+		// Determine the MongoOperations bean which matches the qualifiers of the repository.
+		Bean<MongoOperations> mongoOperations = this.mongoOperations.get(qualifiers);
+
+		if (mongoOperations == null) {
+			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
+					MongoOperations.class.getName(), qualifiers));
+		}
+
+		// Construct and return the repository bean.
+		return new MongoRepositoryBean<T>(mongoOperations, qualifiers, repositoryType, beanManager);
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.config;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.data.repository.query.QueryLookupStrategy;
+import org.springframework.data.repository.query.QueryLookupStrategy.Key;
+
+/**
+ * Annotation to activate MongoDB repositories. If no base package is configured through either {@link #value()},
+ * {@link #basePackages()} or {@link #basePackageClasses()} it will trigger scanning of the package of annotated class.
+ * 
+ * @author Oliver Gierke
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Import(MongoRepositoriesRegistrar.class)
+public @interface EnableMongoRepositories {
+
+	/**
+	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.:
+	 * {@code @EnableJpaRepositories("org.my.pkg")} instead of {@code @EnableJpaRepositories(basePackages="org.my.pkg")}.
+	 */
+	String[] value() default {};
+
+	/**
+	 * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this
+	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
+	 */
+	String[] basePackages() default {};
+
+	/**
+	 * Type-safe alternative to {@link #basePackages()} for specifying the packages to scan for annotated components. The
+	 * package of each class specified will be scanned. Consider creating a special no-op marker class or interface in
+	 * each package that serves no purpose other than being referenced by this attribute.
+	 */
+	Class<?>[] basePackageClasses() default {};
+
+	/**
+	 * Specifies which types are eligible for component scanning. Further narrows the set of candidate components from
+	 * everything in {@link #basePackages()} to everything in the base packages that matches the given filter or filters.
+	 */
+	Filter[] includeFilters() default {};
+
+	/**
+	 * Specifies which types are not eligible for component scanning.
+	 */
+	Filter[] excludeFilters() default {};
+
+	/**
+	 * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl}. So
+	 * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
+	 * for {@code PersonRepositoryImpl}.
+	 * 
+	 * @return
+	 */
+	String repositoryImplementationPostfix() default "";
+
+	/**
+	 * Configures the location of where to find the Spring Data named queries properties file. Will default to
+	 * {@code META-INFO/mongo-named-queries.properties}.
+	 * 
+	 * @return
+	 */
+	String namedQueriesLocation() default "";
+
+	/**
+	 * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
+	 * {@link Key#CREATE_IF_NOT_FOUND}.
+	 * 
+	 * @return
+	 */
+	Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND;
+
+	/**
+	 * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
+	 * {@link MongoRepositoryFactoryBean}.
+	 * 
+	 * @return
+	 */
+	Class<?> repositoryFactoryBeanClass() default MongoRepositoryFactoryBean.class;
+
+	/**
+	 * Configures the name of the {@link MongoTemplate} bean to be used with the repositories detected.
+	 * 
+	 * @return
+	 */
+	String mongoTemplateRef() default "mongoTemplate";
+
+	/**
+	 * Whether to automatically create indexes for query methods defined in the repository interface.
+	 * 
+	 * @return
+	 */
+	boolean createIndexesForQueryMethods() default false;
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.config;
+
+import java.lang.annotation.Annotation;
+
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+
+/**
+ * Mongo-specific {@link ImportBeanDefinitionRegistrar}.
+ * 
+ * @author Oliver Gierke
+ */
+class MongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
+	 */
+	@Override
+	protected Class<? extends Annotation> getAnnotation() {
+		return EnableMongoRepositories.class;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
+	 */
+	@Override
+	protected RepositoryConfigurationExtension getExtension() {
+		return new MongoRepositoryConfigurationExtension();
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigParser.java
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.repository.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.data.mongodb.repository.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
-import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} to create Mongo DB repositories from classpath
- * scanning or manual definition.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryConfigParser extends
-		AbstractRepositoryConfigDefinitionParser<SimpleMongoRepositoryConfiguration, MongoRepositoryConfiguration> {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#getGlobalRepositoryConfigInformation(org.w3c.dom.Element)
-	 */
-	@Override
-	protected SimpleMongoRepositoryConfiguration getGlobalRepositoryConfigInformation(Element element) {
-
-		return new SimpleMongoRepositoryConfiguration(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#postProcessBeanDefinition(org.springframework.data.repository.config.SingleRepositoryConfigInformation, org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.beans.factory.support.BeanDefinitionRegistry, java.lang.Object)
-	 */
-	@Override
-	protected void postProcessBeanDefinition(MongoRepositoryConfiguration context, BeanDefinitionBuilder builder,
-			BeanDefinitionRegistry registry, Object beanSource) {
-
-		builder.addPropertyReference("mongoOperations", context.getMongoTemplateRef());
-		builder.addPropertyValue("createIndexesForQueryMethods", context.getCreateQueryIndexes());
-	}
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.config;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
+import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
+import org.w3c.dom.Element;
+
+/**
+ * {@link RepositoryConfigurationExtension} for MongoDB.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoRepositoryConfigurationExtension extends RepositoryConfigurationExtensionSupport {
+
+	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
+	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
+	 */
+	@Override
+	protected String getModulePrefix() {
+		return "mongo";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
+	 */
+	public String getRepositoryFactoryClassName() {
+		return MongoRepositoryFactoryBean.class.getName();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
+	 */
+	@Override
+	public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {
+
+		Element element = config.getElement();
+
+		ParsingUtils.setPropertyReference(builder, element, MONGO_TEMPLATE_REF, "mongoOperations");
+		ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods");
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
+	 */
+	@Override
+	public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {
+
+		AnnotationAttributes attributes = config.getAttributes();
+
+		builder.addPropertyReference("mongoOperations", attributes.getString("mongoTemplateRef"));
+		builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods"));
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/SimpleMongoRepositoryConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/SimpleMongoRepositoryConfiguration.java
@@ -1,196 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.repository.config;
-
-import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
-import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
-import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
-import org.springframework.data.repository.config.RepositoryConfig;
-import org.springframework.data.repository.config.SingleRepositoryConfigInformation;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * {@link RepositoryConfig} implementation to create {@link MongoRepositoryConfiguration} instances for both automatic
- * and manual configuration.
- * 
- * @author Oliver Gierke
- */
-public class SimpleMongoRepositoryConfiguration
-		extends
-		RepositoryConfig<SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration, SimpleMongoRepositoryConfiguration> {
-
-	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
-	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
-	private static final String DEFAULT_MONGO_TEMPLATE_REF = "mongoTemplate";
-
-	/**
-	 * Creates a new {@link SimpleMongoRepositoryConfiguration} for the given {@link Element}.
-	 * 
-	 * @param repositoriesElement
-	 */
-	protected SimpleMongoRepositoryConfiguration(Element repositoriesElement) {
-
-		super(repositoriesElement, MongoRepositoryFactoryBean.class.getName());
-	}
-
-	/**
-	 * Returns the bean name of the {@link org.springframework.data.mongodb.core.core.MongoTemplate} to be referenced.
-	 * 
-	 * @return
-	 */
-	public String getMongoTemplateRef() {
-
-		String templateRef = getSource().getAttribute(MONGO_TEMPLATE_REF);
-		return StringUtils.hasText(templateRef) ? templateRef : DEFAULT_MONGO_TEMPLATE_REF;
-	}
-
-	/**
-	 * Returns whether to create indexes for query methods.
-	 * 
-	 * @return
-	 */
-	public boolean getCreateQueryIndexes() {
-
-		String createQueryIndexes = getSource().getAttribute(CREATE_QUERY_INDEXES);
-		return StringUtils.hasText(createQueryIndexes) ? Boolean.parseBoolean(createQueryIndexes) : false;
-	}
-
-	/*
-	* (non-Javadoc)
-	*
-	* @see
-	* org.springframework.data.repository.config.GlobalRepositoryConfigInformation
-	* #getAutoconfigRepositoryInformation(java.lang.String)
-	*/
-	public MongoRepositoryConfiguration getAutoconfigRepositoryInformation(String interfaceName) {
-
-		return new AutomaticMongoRepositoryConfiguration(interfaceName, this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfig#getNamedQueriesLocation()
-	 */
-	public String getNamedQueriesLocation() {
-		return "classpath*:META-INF/mongo-named-queries.properties";
-	}
-
-	/*
-	* (non-Javadoc)
-	*
-	* @see org.springframework.data.repository.config.RepositoryConfig#
-	* createSingleRepositoryConfigInformationFor(org.w3c.dom.Element)
-	*/
-	@Override
-	protected MongoRepositoryConfiguration createSingleRepositoryConfigInformationFor(Element element) {
-
-		return new ManualMongoRepositoryConfiguration(element, this);
-	}
-
-	/**
-	 * Simple interface for configuration values specific to Mongo repositories.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	public interface MongoRepositoryConfiguration extends
-			SingleRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> {
-
-		String getMongoTemplateRef();
-
-		boolean getCreateQueryIndexes();
-	}
-
-	/**
-	 * Implements manual lookup of the additional attributes.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class ManualMongoRepositoryConfiguration extends
-			ManualRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
-
-		/**
-		 * Creates a new {@link ManualMongoRepositoryConfiguration} for the given {@link Element} and parent.
-		 * 
-		 * @param element
-		 * @param parent
-		 */
-		public ManualMongoRepositoryConfiguration(Element element, SimpleMongoRepositoryConfiguration parent) {
-
-			super(element, parent);
-		}
-
-		/*
-		* (non-Javadoc)
-		*
-		* @see org.springframework.data.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getAttribute(MONGO_TEMPLATE_REF);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
-		 */
-		public boolean getCreateQueryIndexes() {
-
-			String attribute = getAttribute(CREATE_QUERY_INDEXES);
-			return attribute == null ? false : Boolean.parseBoolean(attribute);
-		}
-	}
-
-	/**
-	 * Implements the lookup of the additional attributes during automatic configuration.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class AutomaticMongoRepositoryConfiguration extends
-			AutomaticRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
-
-		/**
-		 * Creates a new {@link AutomaticMongoRepositoryConfiguration} for the given interface and parent.
-		 * 
-		 * @param interfaceName
-		 * @param parent
-		 */
-		public AutomaticMongoRepositoryConfiguration(String interfaceName, SimpleMongoRepositoryConfiguration parent) {
-
-			super(interfaceName, parent);
-		}
-
-		/*
-		* (non-Javadoc)
-		*
-		* @see org.springframework.data.mongodb.repository.config.
-		* SimpleMongoRepositoryConfiguration
-		* .MongoRepositoryConfiguration#getMongoTemplateRef()
-		*/
-		public String getMongoTemplateRef() {
-
-			return getParent().getMongoTemplateRef();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
-		 */
-		public boolean getCreateQueryIndexes() {
-			return getParent().getCreateQueryIndexes();
-		}
-	}
-}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
@@ -22,6 +22,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.Point;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.util.Assert;

@@ -110,6 +111,14 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return writer.convertToMongoType(value);
 	}

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue()
+	 */
+	public boolean hasBindableNullValue() {
+		return delegate.hasBindableNullValue();
+	}
+
 	/**
 	 * Custom {@link Iterator} to convert items before returning them.
 	 * 
@@ -129,37 +138,33 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		}

 		/*
-		   * (non-Javadoc)
-		   *
-		   * @see java.util.Iterator#hasNext()
-		   */
+		 * (non-Javadoc)
+		 * @see java.util.Iterator#hasNext()
+		 */
 		public boolean hasNext() {
 			return delegate.hasNext();
 		}

 		/*
-		   * (non-Javadoc)
-		   *
-		   * @see java.util.Iterator#next()
-		   */
+		 * (non-Javadoc)
+		 * @see java.util.Iterator#next()
+		 */
 		public Object next() {
-
 			return delegate.next();
 		}

-		/* (non-Javadoc)
+		/* 
+		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.repository.ConvertingParameterAccessor.PotentiallConvertingIterator#nextConverted()
 		 */
-		public Object nextConverted() {
-
-			return getConvertedValue(next());
+		public Object nextConverted(MongoPersistentProperty property) {
+			return property.isAssociation() ? writer.toDBRef(next(), property) : getConvertedValue(next());
 		}

 		/*
-		   * (non-Javadoc)
-		   *
-		   * @see java.util.Iterator#remove()
-		   */
+		 * (non-Javadoc)
+		 * @see java.util.Iterator#remove()
+		 */
 		public void remove() {
 			delegate.remove();
 		}
@@ -177,6 +182,6 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		 * 
 		 * @return
 		 */
-		Object nextConverted();
+		Object nextConverted(MongoPersistentProperty property);
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
 import java.util.Collection;
 import java.util.Iterator;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
 */
 class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {

-	private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
+	private static final Logger LOG = LoggerFactory.getLogger(MongoQueryCreator.class);
 	private final MongoParameterAccessor accessor;
 	private final boolean isGeoNearQuery;

@@ -87,9 +87,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	}

 	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	*/
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
+	 */
 	@Override
 	protected Criteria create(Part part, Iterator<Object> iterator) {

@@ -98,7 +98,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		}

 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
-		Criteria criteria = from(part.getType(),
+		MongoPersistentProperty property = path.getLeafProperty();
+		Criteria criteria = from(part.getType(), property,
 				where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);

@@ -106,9 +107,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	}

 	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
-	*/
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
+	 */
 	@Override
 	protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {

@@ -117,20 +118,17 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		}

 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
+		MongoPersistentProperty property = path.getLeafProperty();

-		return new Criteria().andOperator(
-				base,
-				from(part.getType(), where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
-						(PotentiallyConvertingIterator) iterator));
+		return from(part.getType(), property,
+				base.and(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
+				(PotentiallyConvertingIterator) iterator);
 	}

 	/*
-	* (non-Javadoc)
-	*
-	* @see
-	* org.springframework.data.repository.query.parser.AbstractQueryCreator
-	* #or(java.lang.Object, java.lang.Object)
-	*/
+	 * (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) {

@@ -139,12 +137,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	}

 	/*
-	* (non-Javadoc)
-	*
-	* @see
-	* org.springframework.data.repository.query.parser.AbstractQueryCreator
-	* #complete(java.lang.Object, org.springframework.data.domain.Sort)
-	*/
+	 * (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) {

@@ -163,37 +158,44 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	}

 	/**
-	 * Populates the given {@link CriteriaDefinition} depending on the {@link Type} given.
+	 * Populates the given {@link CriteriaDefinition} depending on the {@link Part} given.
 	 * 
-	 * @param type
+	 * @param part
+	 * @param property
 	 * @param criteria
 	 * @param parameters
 	 * @return
 	 */
-	private Criteria from(Type type, Criteria criteria, PotentiallyConvertingIterator parameters) {
+	private Criteria from(Type type, MongoPersistentProperty property, Criteria criteria,
+			PotentiallyConvertingIterator parameters) {

 		switch (type) {
+		case AFTER:
 		case GREATER_THAN:
-			return criteria.gt(parameters.nextConverted());
+			return criteria.gt(parameters.nextConverted(property));
 		case GREATER_THAN_EQUAL:
-			return criteria.gte(parameters.nextConverted());
+			return criteria.gte(parameters.nextConverted(property));
+		case BEFORE:
 		case LESS_THAN:
-			return criteria.lt(parameters.nextConverted());
+			return criteria.lt(parameters.nextConverted(property));
 		case LESS_THAN_EQUAL:
-			return criteria.lte(parameters.nextConverted());
+			return criteria.lte(parameters.nextConverted(property));
 		case BETWEEN:
-			return criteria.gt(parameters.nextConverted()).lt(parameters.nextConverted());
+			return criteria.gt(parameters.nextConverted(property)).lt(parameters.nextConverted(property));
 		case IS_NOT_NULL:
 			return criteria.ne(null);
 		case IS_NULL:
 			return criteria.is(null);
 		case NOT_IN:
-			return criteria.nin(nextAsArray(parameters));
+			return criteria.nin(nextAsArray(parameters, property));
 		case IN:
-			return criteria.in(nextAsArray(parameters));
+			return criteria.in(nextAsArray(parameters, property));
 		case LIKE:
+		case STARTING_WITH:
+		case ENDING_WITH:
+		case CONTAINING:
 			String value = parameters.next().toString();
-			return criteria.regex(toLikeRegex(value));
+			return criteria.regex(toLikeRegex(value, type));
 		case REGEX:
 			return criteria.regex(parameters.next().toString());
 		case EXISTS:
@@ -224,9 +226,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 			Object parameter = parameters.next();
 			return criteria.within((Shape) parameter);
 		case SIMPLE_PROPERTY:
-			return criteria.is(parameters.nextConverted());
+			return criteria.is(parameters.nextConverted(property));
 		case NEGATING_SIMPLE_PROPERTY:
-			return criteria.not().is(parameters.nextConverted());
+			return criteria.not().is(parameters.nextConverted(property));
 		}

 		throw new IllegalArgumentException("Unsupported keyword!");
@@ -252,8 +254,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 				parameter.getClass()));
 	}

-	private Object[] nextAsArray(PotentiallyConvertingIterator iterator) {
-		Object next = iterator.nextConverted();
+	private Object[] nextAsArray(PotentiallyConvertingIterator iterator, MongoPersistentProperty property) {
+		Object next = iterator.nextConverted(property);

 		if (next instanceof Collection) {
 			return ((Collection<?>) next).toArray();
@@ -264,7 +266,19 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		return new Object[] { next };
 	}

-	private String toLikeRegex(String source) {
+	private String toLikeRegex(String source, Type type) {
+
+		switch (type) {
+		case STARTING_WITH:
+			source = source + "*";
+			break;
+		case ENDING_WITH:
+			source = "*" + source;
+			break;
+		case CONTAINING:
+			source = "*" + source + "*";
+			break;
+		}

 		return source.replaceAll("\\*", ".*");
 	}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java
@@ -18,8 +18,8 @@ package org.springframework.data.mongodb.repository.query;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
@@ -34,7 +34,7 @@ import com.mongodb.util.JSON;
 public class StringBasedMongoQuery extends AbstractMongoQuery {

 	private static final Pattern PLACEHOLDER = Pattern.compile("\\?(\\d+)");
-	private static final Log LOG = LogFactory.getLog(StringBasedMongoQuery.class);
+	private static final Logger LOG = LoggerFactory.getLogger(StringBasedMongoQuery.class);

 	private final String query;
 	private final String fieldSpec;
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
@@ -19,8 +19,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.Index;
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
 class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTreeMongoQuery> {

 	private static final Set<Type> GEOSPATIAL_TYPES = new HashSet<Type>(Arrays.asList(Type.NEAR, Type.WITHIN));
-	private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class);
+	private static final Logger LOG = LoggerFactory.getLogger(IndexEnsuringQueryCreationListener.class);

 	private final MongoOperations operations;

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
@@ -81,7 +81,7 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 	protected Object getTargetRepository(RepositoryMetadata metadata) {

 		Class<?> repositoryInterface = metadata.getRepositoryInterface();
-		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainClass());
+		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType());

 		if (isQueryDslRepository(repositoryInterface)) {
 			return new QueryDslMongoRepository(entityInformation, mongoOperations);
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,21 +17,14 @@ package org.springframework.data.mongodb.repository.support;

 import java.io.Serializable;
 import java.util.List;
-import java.util.regex.Pattern;

-import org.apache.commons.collections15.Transformer;
 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.domain.Sort.Order;
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.QueryMapper;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.querydsl.EntityPathResolver;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
@@ -39,15 +32,10 @@ import org.springframework.data.querydsl.SimpleEntityPathResolver;
 import org.springframework.data.repository.core.EntityMetadata;
 import org.springframework.util.Assert;

-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
 import com.mysema.query.mongodb.MongodbQuery;
-import com.mysema.query.mongodb.MongodbSerializer;
 import com.mysema.query.types.EntityPath;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
 import com.mysema.query.types.Predicate;
 import com.mysema.query.types.path.PathBuilder;

@@ -59,7 +47,6 @@ import com.mysema.query.types.path.PathBuilder;
 public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleMongoRepository<T, ID> implements
 		QueryDslPredicateExecutor<T> {

-	private final MongodbSerializer serializer;
 	private final PathBuilder<T> builder;

 	/**
@@ -70,7 +57,6 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 	 * @param template
 	 */
 	public QueryDslMongoRepository(MongoEntityInformation<T, ID> entityInformation, MongoOperations mongoOperations) {
-
 		this(entityInformation, mongoOperations, SimpleEntityPathResolver.INSTANCE);
 	}

@@ -89,40 +75,27 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 		Assert.notNull(resolver);
 		EntityPath<T> path = resolver.createPath(entityInformation.getJavaType());
 		this.builder = new PathBuilder<T>(path.getType(), path.getMetadata());
-		this.serializer = new SpringDataMongodbSerializer(mongoOperations.getConverter());
 	}

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.mongodb.repository.QueryDslExecutor
-	 * #findOne(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.mysema.query.types.Predicate)
 	 */
 	public T findOne(Predicate predicate) {
-
 		return createQueryFor(predicate).uniqueResult();
 	}

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.mongodb.repository.QueryDslExecutor
-	 * #findAll(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate)
 	 */
 	public List<T> findAll(Predicate predicate) {
-
 		return createQueryFor(predicate).list();
 	}

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.mongodb.repository.QueryDslExecutor
-	 * #findAll(com.mysema.query.types.Predicate,
-	 * com.mysema.query.types.OrderSpecifier<?>[])
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate, com.mysema.query.types.OrderSpecifier<?>[])
 	 */
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {

@@ -131,11 +104,7 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.mongodb.repository.QueryDslExecutor
-	 * #findAll(com.mysema.query.types.Predicate,
-	 * org.springframework.data.domain.Pageable)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate, org.springframework.data.domain.Pageable)
 	 */
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {

@@ -147,13 +116,9 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM

 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.mongodb.repository.QueryDslExecutor
-	 * #count(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
 	 */
 	public long count(Predicate predicate) {
-
 		return createQueryFor(predicate).count();
 	}

@@ -165,13 +130,9 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 	 */
 	private MongodbQuery<T> createQueryFor(Predicate predicate) {

-		DBCollection collection = getMongoOperations().getCollection(getEntityInformation().getCollectionName());
-		MongodbQuery<T> query = new MongodbQuery<T>(collection, new Transformer<DBObject, T>() {
-			public T transform(DBObject input) {
-				Class<T> type = getEntityInformation().getJavaType();
-				return getMongoOperations().getConverter().read(type, input);
-			}
-		}, serializer);
+		Class<T> domainType = getEntityInformation().getJavaType();
+
+		MongodbQuery<T> query = new SpringDataMongodbQuery<T>(getMongoOperations(), domainType);
 		return query.where(predicate);
 	}

@@ -226,46 +187,4 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 		return new OrderSpecifier(order.isAscending() ? com.mysema.query.types.Order.ASC
 				: com.mysema.query.types.Order.DESC, property);
 	}
-
-	/**
-	 * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	static class SpringDataMongodbSerializer extends MongodbSerializer {
-
-		private final MongoConverter converter;
-		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-		private final QueryMapper mapper;
-
-		/**
-		 * Creates a new {@link SpringDataMongodbSerializer} for the given {@link MappingContext}.
-		 * 
-		 * @param mappingContext
-		 */
-		public SpringDataMongodbSerializer(MongoConverter converter) {
-			this.mappingContext = converter.getMappingContext();
-			this.converter = converter;
-			this.mapper = new QueryMapper(converter);
-		}
-
-		@Override
-		protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
-
-			Path<?> parent = metadata.getParent();
-			MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
-			MongoPersistentProperty property = entity.getPersistentProperty(metadata.getExpression().toString());
-			return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
-		}
-
-		@Override
-		protected DBObject asDBObject(String key, Object value) {
-
-			if ("_id".equals(key)) {
-				return super.asDBObject(key, mapper.convertId(value));
-			}
-
-			return super.asDBObject(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
-		}
-	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,16 +15,12 @@
 */
 package org.springframework.data.mongodb.repository.support;

-import org.apache.commons.collections15.Transformer;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.util.Assert;

-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
 import com.mysema.query.mongodb.MongodbQuery;
-import com.mysema.query.mongodb.MongodbSerializer;
 import com.mysema.query.types.EntityPath;

 /**
@@ -36,7 +32,6 @@ public abstract class QuerydslRepositorySupport {

 	private final MongoOperations template;
 	private final MappingContext<? extends MongoPersistentEntity<?>, ?> context;
-	private final MongodbSerializer serializer;

 	/**
 	 * Creates a new {@link QuerydslRepositorySupport} for the given {@link MongoOperations}.
@@ -44,10 +39,11 @@ public abstract class QuerydslRepositorySupport {
 	 * @param operations must not be {@literal null}
 	 */
 	public QuerydslRepositorySupport(MongoOperations operations) {
+
 		Assert.notNull(operations);
+
 		this.template = operations;
 		this.context = operations.getConverter().getMappingContext();
-		this.serializer = new MongodbSerializer();
 	}

 	/**
@@ -75,11 +71,6 @@ public abstract class QuerydslRepositorySupport {
 		Assert.notNull(path);
 		Assert.hasText(collection);

-		DBCollection dbCollection = template.getCollection(collection);
-		return new MongodbQuery<T>(dbCollection, new Transformer<DBObject, T>() {
-			public T transform(DBObject input) {
-				return template.getConverter().read(path.getType(), input);
-			}
-		}, serializer);
+		return new SpringDataMongodbQuery<T>(template, path.getType(), collection);
 	}
 }
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java
@@ -20,7 +20,9 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;

 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -30,9 +32,9 @@ import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.query.QueryUtils;
-import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.util.Assert;

 /**
@@ -40,7 +42,7 @@ import org.springframework.util.Assert;
 * 
 * @author Oliver Gierke
 */
-public class SimpleMongoRepository<T, ID extends Serializable> implements PagingAndSortingRepository<T, ID> {
+public class SimpleMongoRepository<T, ID extends Serializable> implements MongoRepository<T, ID> {

 	private final MongoOperations mongoOperations;
 	private final MongoEntityInformation<T, ID> entityInformation;
@@ -63,7 +65,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
 	 */
-	public T save(T entity) {
+	public <S extends T> S save(S entity) {

 		Assert.notNull(entity, "Entity must not be null!");

@@ -75,13 +77,13 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
 	 */
-	public List<T> save(Iterable<? extends T> entities) {
+	public <S extends T> List<S> save(Iterable<S> entities) {

 		Assert.notNull(entities, "The given Iterable of entities not be null!");

-		List<T> result = new ArrayList<T>();
+		List<S> result = new ArrayList<S>();

-		for (T entity : entities) {
+		for (S entity : entities) {
 			save(entity);
 			result.add(entity);
 		}
@@ -171,10 +173,23 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
 	public List<T> findAll() {
-
 		return findAll(new Query());
 	}

+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
+	 */
+	public Iterable<T> findAll(Iterable<ID> ids) {
+
+		Set<ID> parameters = new HashSet<ID>();
+		for (ID id : ids) {
+			parameters.add(id);
+		}
+
+		return findAll(new Query(new Criteria(entityInformation.getIdAttribute()).in(parameters)));
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.support;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+
+import com.google.common.base.Function;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mysema.query.mongodb.MongodbQuery;
+
+/**
+ * Spring Data specfic {@link MongodbQuery} implementation.
+ * 
+ * @author Oliver Gierke
+ */
+class SpringDataMongodbQuery<T> extends MongodbQuery<T> {
+
+	private final MongoOperations operations;
+
+	/**
+	 * Creates a new {@link SpringDataMongodbQuery}.
+	 * 
+	 * @param operations must not be {@literal null}.
+	 * @param type must not be {@literal null}.
+	 */
+	public SpringDataMongodbQuery(final MongoOperations operations, final Class<? extends T> type) {
+		this(operations, type, operations.getCollectionName(type));
+	}
+
+	/**
+	 * Creates a new {@link SpringDataMongodbQuery} to query the given collection.
+	 * 
+	 * @param operations must not be {@literal null}.
+	 * @param type must not be {@literal null}.
+	 * @param collectionName must not be {@literal null} or empty.
+	 */
+	public SpringDataMongodbQuery(final MongoOperations operations, final Class<? extends T> type, String collectionName) {
+
+		super(operations.getCollection(collectionName), new Function<DBObject, T>() {
+			public T apply(DBObject input) {
+				return operations.getConverter().read(type, input);
+			}
+		}, new SpringDataMongodbSerializer(operations.getConverter()));
+
+		this.operations = operations;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see com.mysema.query.mongodb.MongodbQuery#getCollection(java.lang.Class)
+	 */
+	@Override
+	protected DBCollection getCollection(Class<?> type) {
+		return operations.getCollection(operations.getCollectionName(type));
+	}
+}
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2011-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.support;
+
+import java.util.regex.Pattern;
+
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBObject;
+import com.mysema.query.mongodb.MongodbSerializer;
+import com.mysema.query.types.Path;
+import com.mysema.query.types.PathMetadata;
+
+/**
+ * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
+ * 
+ * @author Oliver Gierke
+ */
+class SpringDataMongodbSerializer extends MongodbSerializer {
+
+	private final MongoConverter converter;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final QueryMapper mapper;
+
+	/**
+	 * Creates a new {@link SpringDataMongodbSerializer} for the given {@link MappingContext}.
+	 * 
+	 * @param mappingContext
+	 */
+	public SpringDataMongodbSerializer(MongoConverter converter) {
+
+		Assert.notNull(converter, "MongoConverter must not be null!");
+
+		this.mappingContext = converter.getMappingContext();
+		this.converter = converter;
+		this.mapper = new QueryMapper(converter);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see com.mysema.query.mongodb.MongodbSerializer#getKeyForPath(com.mysema.query.types.Path, com.mysema.query.types.PathMetadata)
+	 */
+	@Override
+	protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
+
+		Path<?> parent = metadata.getParent();
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
+		MongoPersistentProperty property = entity.getPersistentProperty(metadata.getExpression().toString());
+		return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see com.mysema.query.mongodb.MongodbSerializer#asDBObject(java.lang.String, java.lang.Object)
+	 */
+	@Override
+	protected DBObject asDBObject(String key, Object value) {
+
+		if ("_id".equals(key)) {
+			return super.asDBObject(key, mapper.convertId(value));
+		}
+
+		return super.asDBObject(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
+	}
+}
--- a/spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -0,0 +1 @@
+org.springframework.data.mongodb.repository.cdi.MongoRepositoryExtension
--- a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
+++ b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,3 @@
+http\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd=org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
-http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
@@ -14,7 +14,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/context"
 				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
-				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />

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

 /**
- * Integration tests for {@link MongoParser}.
+ * Integration tests for {@link MappingMongoConverterParser}.
 * 
 * @author Oliver Gierke
 */
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.support.BeanDefinitionReader;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * Integration test for creation of instance of
+ * {@link org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener} by defining
+ * {@code <mongo:mapping-converter />} in context XML.
+ * 
+ * @see DATAMONGO-36
+ * @author Maciej Walkowiak
+ */
+public class MappingMongoConverterParserValidationIntegrationTests {
+
+	DefaultListableBeanFactory factory;
+	BeanDefinitionReader reader;
+
+	@Before
+	public void setUp() {
+		factory = new DefaultListableBeanFactory();
+		reader = new XmlBeanDefinitionReader(factory);
+	}
+
+	@Test
+	public void validatingEventListenerCreatedWithDefaultConfig() {
+
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-default.xml"));
+		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER), is(not(nullValue())));
+	}
+
+	@Test
+	public void validatingEventListenerCreatedWhenValidationEnabled() {
+
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-validation-enabled.xml"));
+		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER), is(not(nullValue())));
+	}
+
+	@Test(expected = NoSuchBeanDefinitionException.class)
+	public void validatingEventListenersIsNotCreatedWhenDisabled() {
+
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-validation-disabled.xml"));
+		factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER);
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DBObjectUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DBObjectUtils.java
@@ -1,81 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.DBObject;
-
-/**
- * Helper classes to ease assertions on {@link DBObject}s.
- * 
- * @author Oliver Gierke
- */
-public abstract class DBObjectUtils {
-
-	private DBObjectUtils() {
-
-	}
-
-	/**
-	 * Expects the field with the given key to be not {@literal null} and a {@link DBObject} in turn and returns it.
-	 * 
-	 * @param source the {@link DBObject} to lookup the nested one
-	 * @param key the key of the field to lokup the nested {@link DBObject}
-	 * @return
-	 */
-	public static DBObject getAsDBObject(DBObject source, String key) {
-		return getTypedValue(source, key, DBObject.class);
-	}
-
-	/**
-	 * Expects the field with the given key to be not {@literal null} and a {@link BasicDBList}.
-	 * 
-	 * @param source the {@link DBObject} to lookup the {@link BasicDBList} in
-	 * @param key the key of the field to find the {@link BasicDBList} in
-	 * @return
-	 */
-	public static BasicDBList getAsDBList(DBObject source, String key) {
-		return getTypedValue(source, key, BasicDBList.class);
-	}
-
-	/**
-	 * Expects the list element with the given index to be a non-{@literal null} {@link DBObject} and returns it.
-	 * 
-	 * @param source the {@link BasicDBList} to look up the {@link DBObject} element in
-	 * @param index the index of the element expected to contain a {@link DBObject}
-	 * @return
-	 */
-	public static DBObject getAsDBObject(BasicDBList source, int index) {
-
-		assertThat(source.size(), greaterThanOrEqualTo(index + 1));
-		Object value = source.get(index);
-		assertThat(value, is(instanceOf(DBObject.class)));
-		return (DBObject) value;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> T getTypedValue(DBObject source, String key, Class<T> type) {
-
-		Object value = source.get(key);
-		assertThat(value, is(notNullValue()));
-		assertThat(value, is(instanceOf(type)));
-
-		return (T) value;
-	}
-}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
@@ -37,6 +37,7 @@ import org.springframework.data.mongodb.core.query.NearQuery;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
+import com.mongodb.DBRef;

 /**
 * Abstract base class for unit tests to specify behaviour we expect from {@link MongoOperations}. Subclasses return
@@ -80,6 +81,10 @@ public abstract class MongoOperationsUnitTests {
 			public Object convertToMongoType(Object obj) {
 				return null;
 			}
+
+			public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
+				return null;
+			}
 		};
 	}

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -48,6 +48,7 @@ import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.Index.Duplicates;
+import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -82,6 +83,7 @@ public class MongoTemplateTests {
 	MongoTemplate template;
 	@Autowired
 	MongoDbFactory factory;
+
 	MongoTemplate mappingTemplate;

 	@Rule
@@ -101,7 +103,7 @@ public class MongoTemplateTests {
 				PersonWithIdPropertyOfPrimitiveInt.class, PersonWithIdPropertyOfTypeLong.class,
 				PersonWithIdPropertyOfPrimitiveLong.class)));
 		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
-		mappingContext.afterPropertiesSet();
+		mappingContext.initialize();

 		MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext);
 		mappingConverter.setCustomConversions(conversions);
@@ -304,8 +306,11 @@ public class MongoTemplateTests {
 		assertThat(ii.isUnique(), is(true));
 		assertThat(ii.isDropDuplicates(), is(true));
 		assertThat(ii.isSparse(), is(false));
-		assertThat(ii.getFieldSpec().containsKey("age"), is(true));
-		assertThat(ii.getFieldSpec().containsValue(Order.DESCENDING), is(true));
+
+		List<IndexField> indexFields = ii.getIndexFields();
+		IndexField field = indexFields.get(0);
+
+		assertThat(field, is(IndexField.create("age", Order.DESCENDING)));
 	}

 	@Test
@@ -1015,6 +1020,7 @@ public class MongoTemplateTests {
 		assertThat(lastMongoAction.getEntityClass().toString(), is(PersonWithIdPropertyOfTypeObjectId.class.toString()));
 		assertThat(lastMongoAction.getMongoActionOperation(), is(MongoActionOperation.UPDATE));
 		assertThat(lastMongoAction.getQuery(), equalTo(q.getQueryObject()));
+
 	}

 	private class FsyncSafeWriteConcernResolver implements WriteConcernResolver {
@@ -1226,24 +1232,6 @@ public class MongoTemplateTests {
 		template.remove(query(where("id").is(id)), TypeWithMyId.class);
 	}

-	/**
-	 * @see DATAMONGO-539
-	 */
-	@Test
-	public void removesObjectFromExplicitCollection() {
-
-		String collectionName = "explicit";
-		template.remove(new Query(), collectionName);
-
-		PersonWithConvertedId person = new PersonWithConvertedId();
-		person.name = "Dave";
-		template.save(person, collectionName);
-		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(false));
-
-		template.remove(person, collectionName);
-		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(true));
-	}
-
 	static class MyId {

 		String first;
@@ -1273,12 +1261,6 @@ public class MongoTemplateTests {
 		}
 	}

-	static class PersonWithConvertedId {
-
-		String id;
-		String name;
-	}
-
 	static enum DateTimeToDateConverter implements Converter<DateTime, Date> {

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

 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;

 import java.math.BigInteger;
+import java.util.Collections;
 import java.util.regex.Pattern;

 import org.bson.types.ObjectId;
@@ -30,10 +32,17 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.test.util.ReflectionTestUtils;

 import com.mongodb.DB;
@@ -52,20 +61,24 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {

 	MongoTemplate template;

+	@Mock
+	MongoDbFactory factory;
 	@Mock
 	Mongo mongo;
-
 	@Mock
 	DB db;
-
 	@Mock
 	DBCollection collection;

+	MappingMongoConverter converter;
+
 	@Before
 	public void setUp() {
-		this.template = new MongoTemplate(mongo, "database");

-		when(mongo.getDB("database")).thenReturn(db);
+		this.converter = new MappingMongoConverter(factory, new MongoMappingContext());
+		this.template = new MongoTemplate(factory, converter);
+
+		when(factory.getDb()).thenReturn(db);
 		when(db.getCollection(Mockito.any(String.class))).thenReturn(collection);
 	}

@@ -127,6 +140,8 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 	@Test
 	public void autogeneratesIdForEntityWithAutogeneratableId() {

+		this.converter.afterPropertiesSet();
+
 		MongoTemplate template = spy(this.template);
 		doReturn(new ObjectId()).when(template).saveDBObject(Mockito.any(String.class), Mockito.any(DBObject.class),
 				Mockito.any(Class.class));
@@ -137,6 +152,27 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		assertThat(entity.id, is(notNullValue()));
 	}

+	/**
+	 * @see DATAMONGO-374
+	 */
+	@Test
+	public void convertsUpdateConstraintsUsingConverters() {
+
+		CustomConversions conversions = new CustomConversions(Collections.singletonList(MyConverter.INSTANCE));
+		this.converter.setCustomConversions(conversions);
+		this.converter.afterPropertiesSet();
+
+		Query query = new Query();
+		Update update = new Update().set("foo", new AutogenerateableId());
+
+		template.updateFirst(query, update, Wrapper.class);
+
+		QueryMapper queryMapper = new QueryMapper(converter);
+		DBObject reference = queryMapper.getMappedObject(update.getUpdateObject(), null);
+
+		verify(collection, times(1)).update(Mockito.any(DBObject.class), eq(reference), anyBoolean(), anyBoolean());
+	}
+
 	/**
 	 * @see DATAMONGO-474
 	 */
@@ -178,6 +214,20 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		}
 	}

+	enum MyConverter implements Converter<AutogenerateableId, String> {
+
+		INSTANCE;
+
+		public String convert(AutogenerateableId source) {
+			return source.toString();
+		}
+	}
+
+	class Wrapper {
+
+		AutogenerateableId foo;
+	}
+
 	/**
 	 * Mocks out the {@link MongoTemplate#getDb()} method to return the {@link DB} mock instead of executing the actual
 	 * behaviour.
@@ -191,10 +241,9 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		return template;
 	}

-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperationsUnitTests#getOperationsForExceptionHandling()
-	 */
+	/* (non-Javadoc)
+	  * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations()
+	  */
 	@Override
 	protected MongoOperations getOperationsForExceptionHandling() {
 		MongoTemplate template = spy(this.template);
@@ -202,10 +251,9 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		return template;
 	}

-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperationsUnitTests#getOperations()
-	 */
+	/* (non-Javadoc)
+	  * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations()
+	  */
 	@Override
 	protected MongoOperations getOperations() {
 		return this.template;
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
@@ -17,13 +17,12 @@ package org.springframework.data.mongodb.core;

 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.SerializationUtils.*;

 import java.util.Arrays;

 import org.hamcrest.Matcher;
 import org.junit.Test;
-import org.springframework.data.mongodb.core.query.SerializationUtils;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
@@ -2,12 +2,14 @@ package org.springframework.data.mongodb.core;

 import java.util.ArrayList;
 import java.util.List;
-import com.mongodb.Mongo;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+import com.mongodb.Mongo;

 public class TestMongoConfiguration extends AbstractMongoConfiguration {

@@ -24,15 +26,15 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {

 	@Override
 	public String getMappingBasePackage() {
-		return "org.springframework.data.mongodb.core.core.mapping";
+		return MongoMappingContext.class.getPackage().getName();
 	}

 	@Override
-	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
+	public CustomConversions customConversions() {
+
 		List<Converter<?, ?>> converters = new ArrayList<Converter<?, ?>>();
 		converters.add(new org.springframework.data.mongodb.core.PersonReadConverter());
 		converters.add(new org.springframework.data.mongodb.core.PersonWriteConverter());
-		converter.setCustomConversions(new CustomConversions(converters));
+		return new CustomConversions(converters);
 	}
-
 }
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java
@@ -15,13 +15,12 @@
 */
 package org.springframework.data.mongodb.core.convert;

+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;

 import java.util.Arrays;
 import java.util.HashSet;

-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Before;
@@ -32,11 +31,12 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;

+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
 * Test case to verify correct usage of custom {@link Converter} implementations to be used.
 * 
@@ -71,7 +71,7 @@ public class CustomConvertersUnitTests {
 		context = new MongoMappingContext();
 		context.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(Foo.class, Bar.class)));
 		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
-		context.afterPropertiesSet();
+		context.initialize();

 		converter = new MappingMongoConverter(mongoDbFactory, context);
 		converter.setCustomConversions(conversions);
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java
@@ -46,8 +46,6 @@ public class DataMongo273Tests {
 	public void setupMongoConv() {

 		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.afterPropertiesSet();
-
 		MongoDbFactory factory = mock(MongoDbFactory.class);

 		converter = new MappingMongoConverter(factory, mappingContext);
@@ -186,4 +184,4 @@ public class DataMongo273Tests {
 			return boxes;
 		}
 	}
-}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappedConstructorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappedConstructorUnitTests.java
@@ -1,44 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-/**
- * Unit tests for {@link MappedConstructor}.
- * 
- * @author Oliver Gierke
- */
-@RunWith(MockitoJUnitRunner.class)
-public class MappedConstructorUnitTests {
-
-	@Mock
-	MongoPersistentEntity<?> entity;
-	@Mock
-	MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	@Test(expected = MappingException.class)
-	public void rejectsEntityWithoutPersistenceConstructor() {
-		new MappedConstructor(entity, mappingContext);
-	}
-}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,11 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package org.springframework.data.mongodb.core.convert;

 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;

 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -36,6 +36,7 @@ import java.util.Set;
 import java.util.SortedMap;

 import org.bson.types.ObjectId;
+import org.hamcrest.Matcher;
 import org.joda.time.LocalDate;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,19 +44,26 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.MappingInstantiationException;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.PersonPojoStringId;
+import org.springframework.test.util.ReflectionTestUtils;

 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
 import com.mongodb.DBObject;
+import com.mongodb.DBRef;

 /**
 * Unit tests for {@link MappingMongoConverter}.
@@ -69,12 +77,15 @@ public class MappingMongoConverterUnitTests {
 	MongoMappingContext mappingContext;
 	@Mock
 	MongoDbFactory factory;
+	@Mock
+	ApplicationContext context;

 	@Before
 	public void setUp() {

 		mappingContext = new MongoMappingContext();
-		mappingContext.afterPropertiesSet();
+		mappingContext.setApplicationContext(context);
+		mappingContext.onApplicationEvent(new ContextRefreshedEvent(context));

 		converter = new MappingMongoConverter(factory, mappingContext);
 		converter.afterPropertiesSet();
@@ -196,7 +207,6 @@ public class MappingMongoConverterUnitTests {
 	public void writesTypeDiscriminatorIntoRootObject() {

 		Person person = new Person();
-		person.birthDate = new LocalDate();

 		DBObject result = new BasicDBObject();
 		converter.write(person, result);
@@ -317,8 +327,8 @@ public class MappingMongoConverterUnitTests {
 	 */
 	@Test
 	public void writesCollectionWithInterfaceCorrectly() {
+
 		Person person = new Person();
-		person.birthDate = new LocalDate();
 		person.firstname = "Oliver";

 		CollectionWrapper wrapper = new CollectionWrapper();
@@ -353,7 +363,6 @@ public class MappingMongoConverterUnitTests {
 		Contact contact = result.contacts.get(0);
 		assertThat(contact, is(instanceOf(Person.class)));
 		assertThat(((Person) contact).firstname, is("Oliver"));
-
 	}

 	@Test
@@ -1036,29 +1045,156 @@ public class MappingMongoConverterUnitTests {
 	}

 	/**
-	 * @see DATAMONGO-462
+	 * @see DATAMONGO-402
 	 */
 	@Test
-	public void readsURLsAsStringsByDefault() throws Exception {
-		DBObject dbObject = new BasicDBObject("url", new URL("http://springsource.org"));
-		URLWrapper result = converter.read(URLWrapper.class, dbObject);
-		assertThat(result.url, is(new URL("http://springsource.org")));
+	public void readsMemberClassCorrectly() {
+
+		DBObject dbObject = new BasicDBObject("inner", new BasicDBObject("value", "FOO!"));
+
+		Outer outer = converter.read(Outer.class, dbObject);
+		assertThat(outer.inner, is(notNullValue()));
+		assertThat(outer.inner.value, is("FOO!"));
+		assertSyntheticFieldValueOf(outer.inner, outer);
+	}
+
+	/**
+	 * @see DATAMONGO-347
+	 */
+	@Test
+	public void createsSimpleDBRefCorrectly() {
+
+		Person person = new Person();
+		person.id = "foo";
+
+		DBRef dbRef = converter.toDBRef(person, null);
+		assertThat(dbRef.getId(), is((Object) "foo"));
+		assertThat(dbRef.getRef(), is("person"));
+	}
+
+	/**
+	 * @see DATAMONGO-347
+	 */
+	@Test
+	public void createsDBRefWithClientSpecCorrectly() {
+
+		PropertyPath path = PropertyPath.from("person", PersonClient.class);
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyPath(path).getLeafProperty();
+
+		Person person = new Person();
+		person.id = "foo";
+
+		DBRef dbRef = converter.toDBRef(person, property);
+		assertThat(dbRef.getId(), is((Object) "foo"));
+		assertThat(dbRef.getRef(), is("person"));
+	}
+
+	/**
+	 * @see DATAMONGO-458
+	 */
+	@Test
+	public void readEmptyCollectionIsModifiable() {
+
+		DBObject dbObject = new BasicDBObject("contactsSet", new BasicDBList());
+		CollectionWrapper wrapper = converter.read(CollectionWrapper.class, dbObject);
+
+		assertThat(wrapper.contactsSet, is(notNullValue()));
+		wrapper.contactsSet.add(new Contact() {
+		});
+	}
+
+	/**
+	 * @see DATAMONGO-424
+	 */
+	@Test
+	public void readsPlainDBRefObject() {
+
+		DBRef dbRef = new DBRef(mock(DB.class), "foo", 2);
+		DBObject dbObject = new BasicDBObject("ref", dbRef);
+
+		DBRefWrapper result = converter.read(DBRefWrapper.class, dbObject);
+		assertThat(result.ref, is(dbRef));
+	}
+
+	/**
+	 * @see DATAMONGO-424
+	 */
+	@Test
+	public void readsCollectionOfDBRefs() {
+
+		DBRef dbRef = new DBRef(mock(DB.class), "foo", 2);
+		BasicDBList refs = new BasicDBList();
+		refs.add(dbRef);
+
+		DBObject dbObject = new BasicDBObject("refs", refs);
+
+		DBRefWrapper result = converter.read(DBRefWrapper.class, dbObject);
+		assertThat(result.refs, hasSize(1));
+		assertThat(result.refs, hasItem(dbRef));
+	}
+
+	/**
+	 * @see DATAMONGO-424
+	 */
+	@Test
+	public void readsDBRefMap() {
+
+		DBRef dbRef = mock(DBRef.class);
+		BasicDBObject refMap = new BasicDBObject("foo", dbRef);
+		DBObject dbObject = new BasicDBObject("refMap", refMap);
+
+		DBRefWrapper result = converter.read(DBRefWrapper.class, dbObject);
+
+		assertThat(result.refMap.entrySet(), hasSize(1));
+		assertThat(result.refMap.values(), hasItem(dbRef));
+	}
+
+	/**
+	 * @see DATAMONGO-424
+	 */
+	@Test
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void resolvesDBRefMapValue() {
+
+		DBRef dbRef = mock(DBRef.class);
+		when(dbRef.fetch()).thenReturn(new BasicDBObject());
+
+		BasicDBObject refMap = new BasicDBObject("foo", dbRef);
+		DBObject dbObject = new BasicDBObject("personMap", refMap);
+
+		DBRefWrapper result = converter.read(DBRefWrapper.class, dbObject);
+
+		Matcher isPerson = instanceOf(Person.class);
+
+		assertThat(result.personMap.entrySet(), hasSize(1));
+		assertThat(result.personMap.values(), hasItem(isPerson));
 	}

 	/**
 	 * @see DATAMONGO-462
 	 */
 	@Test
-	public void writesURLsAsStringsByDefault() throws Exception {
+	public void writesURLsAsStringOutOfTheBox() throws Exception {

 		URLWrapper wrapper = new URLWrapper();
 		wrapper.url = new URL("http://springsource.org");
 		DBObject sink = new BasicDBObject();

 		converter.write(wrapper, sink);
+
 		assertThat(sink.get("url"), is((Object) "http://springsource.org"));
 	}

+	/**
+	 * @see DATAMONGO-462
+	 */
+	@Test
+	public void readsURLFromStringOutOfTheBox() throws Exception {
+		DBObject dbObject = new BasicDBObject("url", "http://springsource.org");
+		URLWrapper result = converter.read(URLWrapper.class, dbObject);
+		assertThat(result.url, is(new URL("http://springsource.org")));
+	}
+
 	/**
 	 * @see DATAMONGO-485
 	 */
@@ -1116,6 +1252,20 @@ public class MappingMongoConverterUnitTests {
 		assertThat(values, is(arrayWithSize(2)));
 	}

+	private static void assertSyntheticFieldValueOf(Object target, Object expected) {
+
+		for (int i = 0; i < 10; i++) {
+			try {
+				assertThat(ReflectionTestUtils.getField(target, "this$" + i), is(expected));
+				return;
+			} catch (IllegalArgumentException e) {
+				// Suppress and try next
+			}
+		}
+
+		fail(String.format("Didn't find synthetic field on %s!", target));
+	}
+
 	static class GenericType<T> {
 		T content;
 	}
@@ -1152,6 +1302,10 @@ public class MappingMongoConverterUnitTests {
 	}

 	static class Person implements Contact {
+
+		@Id
+		String id;
+
 		LocalDate birthDate;

 		@Field("foo")
@@ -1198,6 +1352,7 @@ public class MappingMongoConverterUnitTests {
 		List<Contact> contacts;
 		List<List<String>> strings;
 		List<Map<String, Locale>> listOfMaps;
+		Set<Contact> contactsSet;
 	}

 	static class LocaleWrapper {
@@ -1248,6 +1403,29 @@ public class MappingMongoConverterUnitTests {
 		Object value;
 	}

+	static class Outer {
+
+		class Inner {
+			String value;
+		}
+
+		Inner inner;
+	}
+
+	static class PersonClient {
+
+		@org.springframework.data.mongodb.core.mapping.DBRef
+		Person person;
+	}
+
+	static class DBRefWrapper {
+
+		DBRef ref;
+		List<DBRef> refs;
+		Map<String, DBRef> refMap;
+		Map<String, Person> personMap;
+	}
+
 	static class URLWrapper {
 		URL url;
 	}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,18 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.mongodb.core.query;
+package org.springframework.data.mongodb.core.convert;

 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
-import static org.springframework.data.mongodb.core.DBObjectUtils.*;

 import java.math.BigInteger;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;

 import org.bson.types.ObjectId;
 import org.junit.Before;
@@ -35,10 +32,11 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.Person;
-import org.springframework.data.mongodb.core.QueryMapper;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;

 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
@@ -51,6 +49,7 @@ import com.mongodb.QueryBuilder;
 * @author Oliver Gierke
 */
@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("unused")
 public class QueryMapperUnitTests {

 	QueryMapper mapper;
@@ -213,45 +212,6 @@ public class QueryMapperUnitTests {
 		assertThat(((DBObject) result.get("nested")).get("id"), is(instanceOf(String.class)));
 	}

-	/**
-	 * @see DATAMONGO-493
-	 */
-	@Test
-	public void doesNotTranslateNonIdPropertiesFor$NeCriteria() {
-
-		ObjectId accidentallyAnObjectId = new ObjectId();
-
-		Query query = Query.query(Criteria.where("id").is("id_value").and("publishers")
-				.ne(accidentallyAnObjectId.toString()));
-
-		DBObject dbObject = mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(UserEntity.class));
-		assertThat(dbObject.get("publishers"), is(instanceOf(DBObject.class)));
-
-		DBObject publishers = (DBObject) dbObject.get("publishers");
-		assertThat(publishers.containsField("$ne"), is(true));
-		assertThat(publishers.get("$ne"), is(instanceOf(String.class)));
-	}
-
-	/**
-	 * @see DATAMONGO-494
-	 */
-	@Test
-	public void usesEntityMetadataInOr() {
-
-		Query query = query(new Criteria().orOperator(where("foo").is("bar")));
-		DBObject result = mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(Sample.class));
-
-		assertThat(result.keySet(), hasSize(1));
-		assertThat(result.keySet(), hasItem("$or"));
-
-		BasicDBList ors = getAsDBList(result, "$or");
-		assertThat(ors, hasSize(1));
-		DBObject criterias = getAsDBObject(ors, 0);
-		assertThat(criterias.keySet(), hasSize(1));
-		assertThat(criterias.get("_id"), is(notNullValue()));
-		assertThat(criterias.get("foo"), is(nullValue()));
-	}
-
 	class IdWrapper {
 		Object id;
 	}
@@ -277,9 +237,4 @@ public class QueryMapperUnitTests {
 	enum Enum {
 		INSTANCE;
 	}
-
-	class UserEntity {
-		String id;
-		List<String> publishers = new ArrayList<String>();
-	}
 }
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.springframework.data.mongodb.core.query.Order;
+
+/**
+ * Unit tests for {@link IndexInfo}.
+ * 
+ * @author Oliver Gierke
+ */
+public class IndexInfoUnitTests {
+
+	@Test
+	public void isIndexForFieldsCorrectly() {
+
+		IndexField fooField = IndexField.create("foo", Order.ASCENDING);
+		IndexField barField = IndexField.create("bar", Order.DESCENDING);
+
+		IndexInfo info = new IndexInfo(Arrays.asList(fooField, barField), "myIndex", false, false, false);
+		assertThat(info.isIndexForFields(Arrays.asList("foo", "bar")), is(true));
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java
@@ -46,7 +46,7 @@ public class MongoPersistentEntityIndexCreatorUnitTests {

 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(Collections.singleton(Person.class));
-		mappingContext.afterPropertiesSet();
+		mappingContext.initialize();

 		DummyMongoPersistentEntityIndexCreator creator = new DummyMongoPersistentEntityIndexCreator(mappingContext, factory);

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java
@@ -15,18 +15,15 @@
 */
 package org.springframework.data.mongodb.core.mapping;

-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Field;

 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.util.ReflectionUtils;

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java
@@ -51,7 +51,7 @@ public class GenericMappingTests {
 	public void setUp() throws Exception {
 		context = new MongoMappingContext();
 		context.setInitialEntitySet(Collections.singleton(StringWrapper.class));
-		context.afterPropertiesSet();
+		context.initialize();

 		converter = new MappingMongoConverter(factory, context);
 	}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
@@ -20,7 +20,8 @@ import java.util.Collections;
 import java.util.Map;

 import org.junit.Test;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mapping.model.MappingException;

 /**
 * Unit tests for {@link MongoMappingContext}.
@@ -31,9 +32,26 @@ public class MongoMappingContextUnitTests {

 	@Test
 	public void addsSelfReferencingPersistentEntityCorrectly() throws Exception {
+
 		MongoMappingContext context = new MongoMappingContext();
+
 		context.setInitialEntitySet(Collections.singleton(SampleClass.class));
-		context.afterPropertiesSet();
+		context.initialize();
+	}
+
+	@Test(expected = MappingException.class)
+	public void rejectsEntityWithMultipleIdProperties() {
+
+		MongoMappingContext context = new MongoMappingContext();
+		context.getPersistentEntity(ClassWithMultipleIdProperties.class);
+	}
+
+	class ClassWithMultipleIdProperties {
+
+		@Id
+		String myId;
+
+		String id;
 	}

 	public class SampleClass {
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+/**
+ * Class used to test JSR-303 validation
+ * {@link org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener}
+ * 
+ * @see DATAMONGO-36
+ * @author Maciej Walkowiak
+ */
+public class User {
+
+	@Size(min = 10)
+	private String name;
+
+	@Min(18)
+	private Integer age;
+
+	public User(String name, Integer age) {
+		this.name = name;
+		this.age = age;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Integer getAge() {
+		return age;
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
+import static org.hamcrest.core.IsEqual.*;
+import static org.junit.Assert.*;
+
+import javax.validation.ConstraintViolationException;
+
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Integration test for {@link ValidatingMongoEventListener}.
+ * 
+ * @see DATAMONGO-36
+ * @author Maciej Walkowiak
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class ValidatingMongoEventListenerTest {
+
+	@Autowired
+	MongoTemplate mongoTemplate;
+
+	@Test
+	public void shouldThrowConstraintViolationException() {
+
+		User user = new User("john", 17);
+
+		try {
+			mongoTemplate.save(user);
+			fail();
+		} catch (ConstraintViolationException e) {
+			assertThat(e.getConstraintViolations().size(), equalTo(2));
+		}
+	}
+
+	@Test
+	public void shouldNotThrowAnyExceptions() {
+		mongoTemplate.save(new User("john smith", 18));
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java
@@ -15,6 +15,9 @@
 */
 package org.springframework.data.mongodb.core.mapreduce;

+import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
 import java.util.Arrays;
 import java.util.HashSet;

@@ -37,9 +40,6 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

-import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*;
-
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("classpath:infrastructure.xml")
 public class GroupByTests {
@@ -50,9 +50,6 @@ public class GroupByTests {
 	@Autowired
 	ApplicationContext applicationContext;

-	// @Autowired
-	// MongoTemplate mongoTemplate;
-
 	MongoTemplate mongoTemplate;

 	@Autowired
@@ -61,7 +58,7 @@ public class GroupByTests {

 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(XObject.class)));
-		mappingContext.afterPropertiesSet();
+		mappingContext.initialize();

 		MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext);
 		mappingConverter.afterPropertiesSet();
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
@@ -15,9 +15,9 @@
 */
 package org.springframework.data.mongodb.core.mapreduce;

-import static org.junit.Assert.assertEquals;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.options;
+import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,7 +69,7 @@ public class MapReduceTests {

 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(ValueObject.class)));
-		mappingContext.afterPropertiesSet();
+		mappingContext.initialize();

 		MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext);
 		mappingConverter.afterPropertiesSet();
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
@@ -15,10 +15,11 @@
 */
 package org.springframework.data.mongodb.core.query;

-import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-
+import static org.hamcrest.CoreMatchers.*;
 import org.junit.Test;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.core.query.Criteria;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -52,13 +53,9 @@ public class CriteriaTests {
 		assertEquals("{ \"name\" : \"Bubba\" , \"age\" : { \"$lt\" : 21}}", c.getCriteriaObject().toString());
 	}

-	@Test
-	public void equalIfCriteriaMatches() {
-
-		Criteria left = new Criteria("name").is("Foo").and("lastname").is("Bar");
-		Criteria right = new Criteria("name").is("Bar").and("lastname").is("Bar");
-
-		assertThat(left, is(not(right)));
-		assertThat(right, is(not(left)));
+	@Test(expected = InvalidMongoDbApiUsageException.class)
+	public void testCriteriaWithMultipleConditionsForSameKey() {
+		Criteria c = new Criteria("name").gte("M").and("name").ne("A");
+		c.getCriteriaObject();
 	}
 }
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java
@@ -0,0 +1,42 @@
+/*
+ * 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.gridfs;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.regex.Pattern;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link AntPath}.
+ * 
+ * @author Oliver Gierke
+ */
+public class AntPathUnitTests {
+
+	@Test
+	public void buildRegexCorrectly() {
+
+		AntPath path = new AntPath("**/foo/*-bar.xml");
+		String regex = path.toRegex();
+
+		assertThat(Pattern.matches(regex, "foo/bar/foo/foo-bar.xml"), is(true));
+		assertThat(Pattern.matches(regex, "foo/bar/foo/bar/foo-bar.xml"), is(false));
+		assertThat(regex, is(".*\\Q/foo/\\E[^/]*\\Q-bar.xml\\E"));
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIIntegrationTests.java
@@ -0,0 +1,127 @@
+/*
+ * 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.gridfs;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.springframework.data.mongodb.gridfs.GridFsCriteria.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.gridfs.GridFSDBFile;
+import com.mongodb.gridfs.GridFSFile;
+
+/**
+ * Integration tests for {@link GridFsTemplate}.
+ * 
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:gridfs/gridfs.xml")
+public class GridFsTemplateIIntegrationTests {
+
+	Resource resource = new ClassPathResource("gridfs/gridfs.xml");
+
+	@Autowired
+	GridFsOperations operations;
+
+	@Before
+	public void setUp() {
+		operations.delete(null);
+	}
+
+	@Test
+	public void storesAndFindsSimpleDocument() throws IOException {
+
+		GridFSFile reference = operations.store(resource.getInputStream(), "foo.xml");
+
+		List<GridFSDBFile> result = operations.find(null);
+		assertThat(result.size(), is(1));
+		assertSame(result.get(0), reference);
+	}
+
+	@Test
+	public void writesMetadataCorrectly() throws IOException {
+
+		DBObject metadata = new BasicDBObject("key", "value");
+		GridFSFile reference = operations.store(resource.getInputStream(), "foo.xml", metadata);
+
+		List<GridFSDBFile> result = operations.find(query(whereMetaData("key").is("value")));
+		assertThat(result.size(), is(1));
+		assertSame(result.get(0), reference);
+	}
+
+	@Test
+	public void marshalsComplexMetadata() throws IOException {
+
+		Metadata metadata = new Metadata();
+		metadata.version = "1.0";
+
+		GridFSFile reference = operations.store(resource.getInputStream(), "foo.xml", metadata);
+		List<GridFSDBFile> result = operations.find(query(whereFilename().is("foo.xml")));
+		assertThat(result.size(), is(1));
+		assertSame(result.get(0), reference);
+	}
+
+	@Test
+	public void findsFilesByResourcePattern() throws IOException {
+
+		GridFSFile reference = operations.store(resource.getInputStream(), "foo.xml");
+
+		GridFsResource[] resources = operations.getResources("*.xml");
+		assertThat(resources.length, is(1));
+		assertThat(resources[0].getId(), is(reference.getId()));
+		assertThat(resources[0].contentLength(), is(reference.getLength()));
+		assertThat(resources[0].getContentType(), is(reference.getContentType()));
+	}
+
+	@Test
+	public void findsFilesByResourceLocation() throws IOException {
+
+		GridFSFile reference = operations.store(resource.getInputStream(), "foo.xml");
+
+		GridFsResource[] resources = operations.getResources("foo.xml");
+		assertThat(resources.length, is(1));
+		assertThat(resources[0].getId(), is(reference.getId()));
+		assertThat(resources[0].contentLength(), is(reference.getLength()));
+		assertThat(resources[0].getContentType(), is(reference.getContentType()));
+	}
+
+	private static void assertSame(GridFSFile left, GridFSFile right) {
+
+		assertThat(left.getId(), is(right.getId()));
+		assertThat(left.getMD5(), is(right.getMD5()));
+		assertThat(left.getMetaData(), is(right.getMetaData()));
+	}
+
+	class Metadata {
+
+		String version;
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
@@ -0,0 +1,589 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.performance;
+
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.Constants;
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.util.Assert;
+import org.springframework.util.StopWatch;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+import com.mongodb.Mongo;
+import com.mongodb.WriteConcern;
+
+/**
+ * Test class to execute performance tests for plain MongoDB driver usage, {@link MongoTemplate} and the repositories
+ * abstraction.
+ * 
+ * @author Oliver Gierke
+ */
+public class PerformanceTests {
+
+	private static final String DATABASE_NAME = "performance";
+	private static final int NUMBER_OF_PERSONS = 30000;
+	private static final StopWatch watch = new StopWatch();
+	private static final Collection<String> IGNORED_WRITE_CONCERNS = Arrays.asList("MAJORITY", "REPLICAS_SAFE",
+			"FSYNC_SAFE", "JOURNAL_SAFE");
+	private static final int COLLECTION_SIZE = 1024 * 1024 * 256; // 256 MB
+	private static final Collection<String> COLLECTION_NAMES = Arrays.asList("template", "driver", "person");
+
+	Mongo mongo;
+	MongoTemplate operations;
+	PersonRepository repository;
+
+	@Before
+	public void setUp() throws Exception {
+
+		this.mongo = new Mongo();
+		this.operations = new MongoTemplate(new SimpleMongoDbFactory(this.mongo, DATABASE_NAME));
+
+		MongoRepositoryFactoryBean<PersonRepository, Person, ObjectId> factory = new MongoRepositoryFactoryBean<PersonRepository, Person, ObjectId>();
+		factory.setMongoOperations(operations);
+		factory.setRepositoryInterface(PersonRepository.class);
+		factory.afterPropertiesSet();
+
+		repository = factory.getObject();
+	}
+
+	@Test
+	public void writeWithWriteConcerns() {
+		executeWithWriteConcerns(new WriteConcernCallback() {
+			public void doWithWriteConcern(String constantName, WriteConcern concern) {
+				writeHeadline("WriteConcern: " + constantName);
+				writingObjectsUsingPlainDriver("Writing %s objects using plain driver");
+				writingObjectsUsingMongoTemplate("Writing %s objects using template");
+				writingObjectsUsingRepositories("Writing %s objects using repository");
+				writeFooter();
+			}
+		});
+	}
+
+	@Test
+	public void writeAndRead() {
+
+		mongo.setWriteConcern(WriteConcern.SAFE);
+
+		for (int i = 3; i > 0; i--) {
+
+			setupCollections();
+
+			writeHeadline("Plain driver");
+			writingObjectsUsingPlainDriver("Writing %s objects using plain driver");
+			readingUsingPlainDriver("Reading all objects using plain driver");
+			queryUsingPlainDriver("Executing query using plain driver");
+			writeFooter();
+
+			writeHeadline("Template");
+			writingObjectsUsingMongoTemplate("Writing %s objects using template");
+			readingUsingTemplate("Reading all objects using template");
+			queryUsingTemplate("Executing query using template");
+			writeFooter();
+
+			writeHeadline("Repositories");
+			writingObjectsUsingRepositories("Writing %s objects using repository");
+			readingUsingRepository("Reading all objects using repository");
+			queryUsingRepository("Executing query using repository");
+			writeFooter();
+
+			writeFooter();
+		}
+	}
+
+	private void writeHeadline(String headline) {
+		System.out.println(headline);
+		System.out.println("---------------------------------".substring(0, headline.length()));
+	}
+
+	private void writeFooter() {
+		System.out.println();
+	}
+
+	private void queryUsingTemplate(String template) {
+		executeWatchedWithTimeAndResultSize(template, new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				Query query = query(where("addresses.zipCode").regex(".*1.*"));
+				return operations.find(query, Person.class, "template");
+			}
+		});
+	}
+
+	private void queryUsingRepository(String template) {
+		executeWatchedWithTimeAndResultSize(template, new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				return repository.findByAddressesZipCodeContaining("1");
+			}
+		});
+	}
+
+	private void executeWithWriteConcerns(WriteConcernCallback callback) {
+
+		Constants constants = new Constants(WriteConcern.class);
+
+		for (String constantName : constants.getNames(null)) {
+
+			if (IGNORED_WRITE_CONCERNS.contains(constantName)) {
+				continue;
+			}
+
+			WriteConcern writeConcern = (WriteConcern) constants.asObject(constantName);
+			mongo.setWriteConcern(writeConcern);
+
+			setupCollections();
+
+			callback.doWithWriteConcern(constantName, writeConcern);
+		}
+	}
+
+	private void setupCollections() {
+
+		DB db = this.mongo.getDB(DATABASE_NAME);
+
+		for (String collectionName : COLLECTION_NAMES) {
+			DBCollection collection = db.getCollection(collectionName);
+			collection.drop();
+			db.command(getCreateCollectionCommand(collectionName));
+			collection.ensureIndex(new BasicDBObject("firstname", -1));
+			collection.ensureIndex(new BasicDBObject("lastname", -1));
+		}
+	}
+
+	private DBObject getCreateCollectionCommand(String name) {
+		BasicDBObject dbObject = new BasicDBObject();
+		dbObject.put("createCollection", name);
+		dbObject.put("capped", false);
+		dbObject.put("size", COLLECTION_SIZE);
+		return dbObject;
+	}
+
+	private void writingObjectsUsingPlainDriver(String template) {
+
+		final DBCollection collection = mongo.getDB(DATABASE_NAME).getCollection("driver");
+		final List<DBObject> persons = getPersonDBObjects();
+
+		executeWatchedWithTime(template, new WatchCallback<Void>() {
+			public Void doInWatch() {
+				for (DBObject person : persons) {
+					collection.save(person);
+				}
+				return null;
+			}
+		});
+	}
+
+	private void writingObjectsUsingRepositories(String template) {
+
+		final List<Person> persons = getPersonObjects();
+
+		executeWatchedWithTime(template, new WatchCallback<Void>() {
+			public Void doInWatch() {
+				repository.save(persons);
+				return null;
+			}
+		});
+	}
+
+	private void writingObjectsUsingMongoTemplate(String template) {
+
+		final List<Person> persons = getPersonObjects();
+
+		executeWatchedWithTime(template, new WatchCallback<Void>() {
+			public Void doInWatch() {
+				for (Person person : persons) {
+					operations.save(person, "template");
+				}
+				return null;
+			}
+		});
+	}
+
+	private void readingUsingPlainDriver(String template) {
+
+		final DBCollection collection = mongo.getDB(DATABASE_NAME).getCollection("driver");
+
+		executeWatchedWithTimeAndResultSize(String.format(template, NUMBER_OF_PERSONS), new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				return toPersons(collection.find());
+			}
+		});
+	}
+
+	private void readingUsingTemplate(String template) {
+		executeWatchedWithTimeAndResultSize(String.format(template, NUMBER_OF_PERSONS), new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				return operations.findAll(Person.class, "template");
+			}
+		});
+	}
+
+	private void readingUsingRepository(String template) {
+		executeWatchedWithTimeAndResultSize(String.format(template, NUMBER_OF_PERSONS), new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				return repository.findAll();
+			}
+		});
+	}
+
+	private void queryUsingPlainDriver(String template) {
+
+		final DBCollection collection = mongo.getDB(DATABASE_NAME).getCollection("driver");
+
+		executeWatchedWithTimeAndResultSize(template, new WatchCallback<List<Person>>() {
+			public List<Person> doInWatch() {
+				DBObject regex = new BasicDBObject("$regex", Pattern.compile(".*1.*"));
+				DBObject query = new BasicDBObject("addresses.zipCode", regex);
+				return toPersons(collection.find(query));
+			}
+		});
+	}
+
+	private List<DBObject> getPersonDBObjects() {
+
+		List<DBObject> result = new ArrayList<DBObject>(NUMBER_OF_PERSONS);
+
+		for (Person person : getPersonObjects()) {
+			result.add(person.toDBObject());
+		}
+
+		return result;
+	}
+
+	private List<Person> getPersonObjects() {
+
+		List<Person> result = new ArrayList<Person>(NUMBER_OF_PERSONS);
+
+		watch.start("Created " + NUMBER_OF_PERSONS + " Persons");
+
+		for (int i = 0; i < NUMBER_OF_PERSONS; i++) {
+
+			Address address = new Address("zip" + i, "city" + i);
+			Person person = new Person("Firstname" + i, "Lastname" + i, Arrays.asList(address));
+			person.orders.add(new Order(LineItem.generate()));
+			person.orders.add(new Order(LineItem.generate()));
+			result.add(person);
+		}
+
+		watch.stop();
+
+		return result;
+	}
+
+	private <T> T executeWatched(String template, WatchCallback<T> callback) {
+
+		watch.start(String.format(template, NUMBER_OF_PERSONS));
+
+		try {
+			return callback.doInWatch();
+		} finally {
+			watch.stop();
+		}
+	}
+
+	private <T> void executeWatchedWithTime(String template, WatchCallback<?> callback) {
+		executeWatched(template, callback);
+		printStatistics(null);
+	}
+
+	private <T> void executeWatchedWithTimeAndResultSize(String template, WatchCallback<List<T>> callback) {
+		printStatistics(executeWatched(template, callback));
+	}
+
+	private void printStatistics(Collection<?> result) {
+
+		long time = watch.getLastTaskTimeMillis();
+		StringBuilder builder = new StringBuilder(watch.getLastTaskName());
+
+		if (result != null) {
+			builder.append(" returned ").append(result.size()).append(" results and");
+		}
+
+		builder.append(" took ").append(time).append(" milliseconds");
+		System.out.println(builder);
+	}
+
+	private static List<Person> toPersons(DBCursor cursor) {
+
+		List<Person> persons = new ArrayList<Person>();
+
+		while (cursor.hasNext()) {
+			persons.add(Person.from(cursor.next()));
+		}
+
+		return persons;
+	}
+
+	static class Person {
+
+		ObjectId id;
+		@Indexed
+		final String firstname, lastname;
+		final List<Address> addresses;
+		final Set<Order> orders;
+
+		public Person(String firstname, String lastname, List<Address> addresses) {
+			this.firstname = firstname;
+			this.lastname = lastname;
+			this.addresses = addresses;
+			this.orders = new HashSet<Order>();
+		}
+
+		public static Person from(DBObject source) {
+
+			BasicDBList addressesSource = (BasicDBList) source.get("addresses");
+			List<Address> addresses = new ArrayList<Address>(addressesSource.size());
+			for (Object addressSource : addressesSource) {
+				addresses.add(Address.from((DBObject) addressSource));
+			}
+
+			BasicDBList ordersSource = (BasicDBList) source.get("orders");
+			Set<Order> orders = new HashSet<Order>(ordersSource.size());
+			for (Object orderSource : ordersSource) {
+				orders.add(Order.from((DBObject) orderSource));
+			}
+
+			Person person = new Person((String) source.get("firstname"), (String) source.get("lastname"), addresses);
+			person.orders.addAll(orders);
+			return person;
+		}
+
+		public DBObject toDBObject() {
+
+			DBObject dbObject = new BasicDBObject();
+			dbObject.put("firstname", firstname);
+			dbObject.put("lastname", lastname);
+			dbObject.put("addresses", writeAll(addresses));
+			dbObject.put("orders", writeAll(orders));
+			return dbObject;
+		}
+	}
+
+	static class Address implements Convertible {
+
+		final String zipCode;
+		final String city;
+		final Set<AddressType> types;
+
+		public Address(String zipCode, String city) {
+			this(zipCode, city, new HashSet<AddressType>(pickRandomNumerOfItemsFrom(Arrays.asList(AddressType.values()))));
+		}
+
+		@PersistenceConstructor
+		public Address(String zipCode, String city, Set<AddressType> types) {
+			this.zipCode = zipCode;
+			this.city = city;
+			this.types = types;
+		}
+
+		public static Address from(DBObject source) {
+			String zipCode = (String) source.get("zipCode");
+			String city = (String) source.get("city");
+			BasicDBList types = (BasicDBList) source.get("types");
+
+			return new Address(zipCode, city, new HashSet<AddressType>(readFromBasicDBList(types, AddressType.class)));
+		}
+
+		public DBObject toDBObject() {
+			BasicDBObject dbObject = new BasicDBObject();
+			dbObject.put("zipCode", zipCode);
+			dbObject.put("city", city);
+			dbObject.put("types", toBasicDBList(types));
+			return dbObject;
+		}
+	}
+
+	private static <T extends Enum<T>> List<T> readFromBasicDBList(BasicDBList source, Class<T> type) {
+
+		List<T> result = new ArrayList<T>(source.size());
+		for (Object object : source) {
+			result.add(Enum.valueOf(type, object.toString()));
+		}
+		return result;
+	}
+
+	private static <T extends Enum<T>> BasicDBList toBasicDBList(Collection<T> enums) {
+		BasicDBList result = new BasicDBList();
+		for (T element : enums) {
+			result.add(element.toString());
+		}
+
+		return result;
+	}
+
+	static class Order implements Convertible {
+
+		static enum Status {
+			ORDERED, PAYED, SHIPPED;
+		}
+
+		Date createdAt;
+		List<LineItem> lineItems;
+		Status status;
+
+		public Order(List<LineItem> lineItems, Date createdAt) {
+			this.lineItems = lineItems;
+			this.createdAt = createdAt;
+			this.status = Status.ORDERED;
+		}
+
+		@PersistenceConstructor
+		public Order(List<LineItem> lineItems, Date createdAt, Status status) {
+			this.lineItems = lineItems;
+			this.createdAt = createdAt;
+			this.status = status;
+		}
+
+		public static Order from(DBObject source) {
+
+			BasicDBList lineItemsSource = (BasicDBList) source.get("lineItems");
+			List<LineItem> lineItems = new ArrayList<PerformanceTests.LineItem>(lineItemsSource.size());
+			for (Object lineItemSource : lineItemsSource) {
+				lineItems.add(LineItem.from((DBObject) lineItemSource));
+			}
+
+			Date date = (Date) source.get("createdAt");
+			Status status = Status.valueOf((String) source.get("status"));
+			return new Order(lineItems, date, status);
+		}
+
+		public Order(List<LineItem> lineItems) {
+			this(lineItems, new Date());
+		}
+
+		public DBObject toDBObject() {
+			DBObject result = new BasicDBObject();
+			result.put("createdAt", createdAt);
+			result.put("lineItems", writeAll(lineItems));
+			result.put("status", status.toString());
+			return result;
+		}
+	}
+
+	static class LineItem implements Convertible {
+
+		String description;
+		double price;
+		int amount;
+
+		public LineItem(String description, int amount, double price) {
+			this.description = description;
+			this.amount = amount;
+			this.price = price;
+		}
+
+		public static List<LineItem> generate() {
+
+			LineItem iPad = new LineItem("iPad", 1, 649);
+			LineItem iPhone = new LineItem("iPhone", 1, 499);
+			LineItem macBook = new LineItem("MacBook", 2, 1299);
+
+			return pickRandomNumerOfItemsFrom(Arrays.asList(iPad, iPhone, macBook));
+		}
+
+		public static LineItem from(DBObject source) {
+
+			String description = (String) source.get("description");
+			double price = (Double) source.get("price");
+			int amount = (Integer) source.get("amount");
+
+			return new LineItem(description, amount, price);
+		}
+
+		public DBObject toDBObject() {
+
+			BasicDBObject dbObject = new BasicDBObject();
+			dbObject.put("description", description);
+			dbObject.put("price", price);
+			dbObject.put("amount", amount);
+			return dbObject;
+		}
+	}
+
+	private static <T> List<T> pickRandomNumerOfItemsFrom(List<T> source) {
+
+		Assert.isTrue(!source.isEmpty());
+
+		Random random = new Random();
+		int numberOfItems = random.nextInt(source.size());
+		numberOfItems = numberOfItems == 0 ? 1 : numberOfItems;
+
+		List<T> result = new ArrayList<T>(numberOfItems);
+		while (result.size() < numberOfItems) {
+			int index = random.nextInt(source.size());
+			T candidate = source.get(index);
+			if (!result.contains(candidate)) {
+				result.add(candidate);
+			}
+		}
+
+		return result;
+	}
+
+	static enum AddressType {
+		SHIPPING, BILLING;
+	}
+
+	private interface WriteConcernCallback {
+		void doWithWriteConcern(String constantName, WriteConcern concern);
+	}
+
+	private interface WatchCallback<T> {
+		T doInWatch();
+	}
+
+	private interface PersonRepository extends MongoRepository<Person, ObjectId> {
+
+		List<Person> findByAddressesZipCodeContaining(String parameter);
+	}
+
+	private interface Convertible {
+
+		DBObject toDBObject();
+	}
+
+	private static List<DBObject> writeAll(Collection<? extends Convertible> convertibles) {
+		List<DBObject> result = new ArrayList<DBObject>();
+		for (Convertible convertible : convertibles) {
+			result.add(convertible.toDBObject());
+		}
+		return result;
+	}
+}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
@@ -96,6 +96,14 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		assertThat(result.containsAll(all), is(true));
 	}

+	@Test
+	public void findsAllWithGivenIds() {
+
+		Iterable<Person> result = repository.findAll(Arrays.asList(dave.id, boyd.id));
+		assertThat(result, hasItems(dave, boyd));
+		assertThat(result, not(hasItems(oliver, carter, stefan, leroi, alicia)));
+	}
+
 	@Test
 	public void deletesPersonCorrectly() throws Exception {

@@ -413,14 +421,69 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		assertThat(result.get(6), is(stefan));
 	}

+	/**
+	 * @see DATAMONGO-347
+	 */
+	@Test
+	public void executesQueryWithDBRefReferenceCorrectly() {
+
+		operations.remove(new org.springframework.data.mongodb.core.query.Query(), User.class);
+
+		User user = new User();
+		user.username = "Oliver";
+
+		operations.save(user);
+
+		dave.creator = user;
+		repository.save(dave);
+
+		List<Person> result = repository.findByCreator(user);
+		assertThat(result.size(), is(1));
+		assertThat(result, hasItem(dave));
+	}
+
 	/**
 	 * @see DATAMONGO-425
 	 */
 	@Test
-	public void bindsDateParameterForDerivedQueryCorrectly() {
+	public void bindsDateParameterForLessThanPredicateCorrectly() {

 		List<Person> result = repository.findByCreatedAtLessThan(boyd.createdAt);
-		assertThat(result.isEmpty(), is(false));
+		assertThat(result.size(), is(3));
+		assertThat(result, hasItems(dave, oliver, carter));
+	}
+
+	/**
+	 * @see DATAMONGO-425
+	 */
+	@Test
+	public void bindsDateParameterForGreaterThanPredicateCorrectly() {
+
+		List<Person> result = repository.findByCreatedAtGreaterThan(carter.createdAt);
+		assertThat(result.size(), is(4));
+		assertThat(result, hasItems(boyd, stefan, leroi, alicia));
+	}
+
+	/**
+	 * @see DATAMONGO-427
+	 */
+	@Test
+	public void bindsDateParameterToBeforePredicateCorrectly() {
+
+		List<Person> result = repository.findByCreatedAtBefore(boyd.createdAt);
+		assertThat(result.size(), is(3));
+		assertThat(result, hasItems(dave, oliver, carter));
+	}
+
+	/**
+	 * @see DATAMONGO-427
+	 */
+	@Test
+	public void bindsDateParameterForAfterPredicateCorrectly() {
+
+		List<Person> result = repository.findByCreatedAtAfter(carter.createdAt);
+		assertThat(result.size(), is(4));
+		assertThat(result, hasItems(boyd, stefan, leroi, alicia));
 	}

 	/**
@@ -432,21 +495,4 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		List<Person> result = repository.findByCreatedAtLessThanManually(boyd.createdAt);
 		assertThat(result.isEmpty(), is(false));
 	}
-
-	/**
-	 * @see DATAMONGO-521
-	 */
-	@Test
-	public void executesAndQueryCorrectly() {
-
-		List<Person> result = repository.findByFirstnameAndLastname("Dave", "Matthews");
-
-		assertThat(result, hasSize(1));
-		assertThat(result, hasItem(dave));
-
-		result = repository.findByFirstnameAndLastname("Oliver August", "Matthews");
-
-		assertThat(result, hasSize(1));
-		assertThat(result, hasItem(oliver));
-	}
-}
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`org.springframework.data.mongodb.repository.cdi.MongoRepositoryExtension`