You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2022/01/07 15:23:15 UTC

[directory-ldap-api] branch master updated: Removed \t

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 5db89d2  Removed \t
5db89d2 is described below

commit 5db89d2abaa70739dfadd403b450ce679f154c63
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Jan 7 16:23:03 2022 +0100

    Removed \t
---
 .../main/release/licenses/xml-apis-README.dom.txt  |   6 +-
 .../request_with_0_abandonID_attribute.xml         |   4 +-
 .../abandonRequest/request_with_1_control.xml      |  10 +-
 .../request_with_1_control_base64_value.xml        |  10 +-
 .../request_with_1_control_empty_value.xml         |  10 +-
 .../abandonRequest/request_with_2_controls.xml     |  16 +-
 .../request_with_3_controls_without_value.xml      |  18 +-
 .../request_with_abandonID_attribute.xml           |   4 +-
 .../request_with_needed_requestID.xml              |   4 +-
 .../request_with_requestID_attribute.xml           |   4 +-
 .../request_with_requestID_below_0.xml             |   4 +-
 .../request_without_abandonID_attribute.xml        |   4 +-
 .../addRequest/request_with_1_attr_empty_value.xml |   6 +-
 .../request_with_1_attr_with_2_values.xml          |   6 +-
 .../request_with_1_attr_with_base64_value.xml      |  10 +-
 .../addRequest/request_with_1_attr_with_value.xml  |   6 +-
 .../request_with_1_attr_without_name_attribute.xml |   6 +-
 .../request_with_1_attr_without_value.xml          |   6 +-
 .../dsmlv2/addRequest/request_with_1_control.xml   |  10 +-
 .../request_with_1_control_base64_value.xml        |  10 +-
 .../request_with_1_control_empty_value.xml         |  10 +-
 .../addRequest/request_with_2_attr_with_value.xml  |   8 +-
 .../dsmlv2/addRequest/request_with_2_controls.xml  |  16 +-
 .../request_with_3_controls_without_value.xml      |  16 +-
 .../addRequest/request_with_dn_attribute.xml       |   4 +-
 .../addRequest/request_with_needed_requestID.xml   |   4 +-
 .../request_with_requestID_attribute.xml           |   4 +-
 .../addRequest/request_with_requestID_below_0.xml  |   4 +-
 .../addRequest/request_without_dn_attribute.xml    |   4 +-
 .../dsmlv2/addResponse/response_with_1_control.xml |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../addResponse/response_with_1_empty_referral.xml |   8 +-
 .../addResponse/response_with_1_referral.xml       |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../addResponse/response_with_2_controls.xml       |  18 +-
 .../addResponse/response_with_2_referrals.xml      |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../addResponse/response_with_error_message.xml    |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../addResponse/response_with_result_code.xml      |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../addResponse/response_with_wrong_descr.xml      |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../addResponse/response_without_result_code.xml   |   4 +-
 .../dsmlv2/authRequest/request_with_1_control.xml  |  10 +-
 .../request_with_1_control_base64_value.xml        |  10 +-
 .../request_with_1_control_empty_value.xml         |  10 +-
 .../dsmlv2/authRequest/request_with_2_controls.xml |  16 +-
 .../request_with_3_controls_without_value.xml      |  16 +-
 .../authRequest/request_with_needed_requestID.xml  |   4 +-
 .../request_with_principal_attribute.xml           |   4 +-
 .../request_with_requestID_attribute.xml           |   4 +-
 .../authRequest/request_with_requestID_below_0.xml |   4 +-
 .../request_without_principal_attribute.xml        |   4 +-
 .../authResponse/response_with_1_control.xml       |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../response_with_1_empty_referral.xml             |   8 +-
 .../authResponse/response_with_1_referral.xml      |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../authResponse/response_with_2_controls.xml      |  18 +-
 .../authResponse/response_with_2_referrals.xml     |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../authResponse/response_with_error_message.xml   |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../authResponse/response_with_result_code.xml     |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../authResponse/response_with_wrong_descr.xml     |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../authResponse/response_without_result_code.xml  |   4 +-
 .../batchRequest/request_with_1_AbandonRequest.xml |   4 +-
 .../batchRequest/request_with_1_AddRequest.xml     |  10 +-
 .../batchRequest/request_with_1_AuthRequest.xml    |   4 +-
 .../request_with_1_AuthRequest_1_AddRequest.xml    |  14 +-
 .../batchRequest/request_with_1_CompareRequest.xml |   6 +-
 .../batchRequest/request_with_1_DelRequest.xml     |   4 +-
 .../request_with_1_ExtendedRequest.xml             |   6 +-
 .../batchRequest/request_with_1_ModDNRequest.xml   |   6 +-
 .../batchRequest/request_with_1_ModifyRequest.xml  |  12 +-
 .../batchRequest/request_with_1_SearchRequest.xml  |  20 +-
 .../batchRequest/request_with_2_AbandonRequest.xml |   8 +-
 .../batchRequest/request_with_2_AddRequest.xml     |  20 +-
 .../batchRequest/request_with_2_CompareRequest.xml |  12 +-
 .../batchRequest/request_with_2_DelRequest.xml     |   8 +-
 .../request_with_2_ExtendedRequest.xml             |  12 +-
 .../batchRequest/request_with_2_ModDNRequest.xml   |  12 +-
 .../batchRequest/request_with_2_ModifyRequest.xml  |  24 +-
 .../batchRequest/request_with_2_SearchRequest.xml  |  40 +-
 .../request_with_wrong_placed_AuthRequest.xml      |  14 +-
 .../batchResponse/response_with_1_AddResponse.xml  |   6 +-
 .../batchResponse/response_with_1_AuthResponse.xml |   6 +-
 .../response_with_1_CompareResponse.xml            |   6 +-
 .../batchResponse/response_with_1_DelResponse.xml  |   6 +-
 .../response_with_1_ErrorResponse.xml              |   6 +-
 .../response_with_1_ExtendedResponse.xml           |  12 +-
 .../response_with_1_ModDNResponse.xml              |   6 +-
 .../response_with_1_ModifyResponse.xml             |   6 +-
 .../response_with_1_SearchResponse.xml             |  10 +-
 .../batchResponse/response_with_2_AddResponse.xml  |  12 +-
 .../batchResponse/response_with_2_AuthResponse.xml |  12 +-
 .../response_with_2_CompareResponse.xml            |  12 +-
 .../batchResponse/response_with_2_DelResponse.xml  |  12 +-
 .../response_with_2_ErrorResponse.xml              |  12 +-
 .../response_with_2_ExtendedResponse.xml           |  24 +-
 .../response_with_2_ModDNResponse.xml              |  12 +-
 .../response_with_2_ModifyResponse.xml             |  12 +-
 .../response_with_2_SearchResponse.xml             |  20 +-
 .../request_with_1_assertion_empty_value.xml       |   6 +-
 .../request_with_1_assertion_with_2_values.xml     |   8 +-
 ...est_with_1_assertion_without_name_attribute.xml |   6 +-
 .../request_with_1_assertion_without_value.xml     |   6 +-
 .../request_with_1_complete_assertion.xml          |   6 +-
 ...uest_with_1_complete_assertion_base64_value.xml |   6 +-
 .../compareRequest/request_with_1_control.xml      |  12 +-
 .../request_with_1_control_base64_value.xml        |  12 +-
 .../request_with_1_control_empty_value.xml         |  12 +-
 .../request_with_2_complete_assertions.xml         |   8 +-
 .../compareRequest/request_with_2_controls.xml     |  18 +-
 .../request_with_3_controls_without_value.xml      |  20 +-
 .../compareRequest/request_with_dn_attribute.xml   |   6 +-
 .../request_with_needed_requestID.xml              |   6 +-
 .../request_with_requestID_attribute.xml           |   6 +-
 .../request_with_requestID_below_0.xml             |   6 +-
 .../compareRequest/request_without_assertion.xml   |   4 +-
 .../request_without_dn_attribute.xml               |   6 +-
 .../compareResponse/response_with_1_control.xml    |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../response_with_1_empty_referral.xml             |   8 +-
 .../compareResponse/response_with_1_referral.xml   |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../compareResponse/response_with_2_controls.xml   |  18 +-
 .../compareResponse/response_with_2_referrals.xml  |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../response_with_error_message.xml                |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../compareResponse/response_with_result_code.xml  |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../compareResponse/response_with_wrong_descr.xml  |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../response_without_result_code.xml               |   4 +-
 .../dsmlv2/delRequest/request_with_1_control.xml   |  10 +-
 .../request_with_1_control_base64_value.xml        |  10 +-
 .../request_with_1_control_empty_value.xml         |  10 +-
 .../dsmlv2/delRequest/request_with_2_controls.xml  |  16 +-
 .../request_with_3_controls_without_value.xml      |  16 +-
 .../delRequest/request_with_dn_attribute.xml       |   4 +-
 .../delRequest/request_with_needed_requestID.xml   |   4 +-
 .../request_with_requestID_attribute.xml           |   4 +-
 .../delRequest/request_with_requestID_below_0.xml  |   4 +-
 .../delRequest/request_without_dn_attribute.xml    |   4 +-
 .../dsmlv2/delResponse/response_with_1_control.xml |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../delResponse/response_with_1_empty_referral.xml |   8 +-
 .../delResponse/response_with_1_referral.xml       |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../delResponse/response_with_2_controls.xml       |  18 +-
 .../delResponse/response_with_2_referrals.xml      |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../delResponse/response_with_error_message.xml    |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../delResponse/response_with_result_code.xml      |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../delResponse/response_with_wrong_descr.xml      |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../delResponse/response_without_result_code.xml   |   4 +-
 .../errorResponse/response_with_empty_message.xml  |   6 +-
 .../dsmlv2/errorResponse/response_with_message.xml |   6 +-
 .../response_with_requestID_attribute.xml          |   4 +-
 .../response_with_requestID_below_0.xml            |   4 +-
 .../response_with_type_authenticationFailed.xml    |   4 +-
 .../response_with_type_connectionClosed.xml        |   4 +-
 .../response_with_type_couldNotConnect.xml         |   4 +-
 .../response_with_type_gatewayInternalError.xml    |   4 +-
 .../errorResponse/response_with_type_inError.xml   |   4 +-
 .../response_with_type_malformedRequest.xml        |   4 +-
 .../response_with_type_notAttempted.xml            |   4 +-
 .../errorResponse/response_with_type_other.xml     |   4 +-
 .../response_with_type_unresolvableURI.xml         |   4 +-
 .../dsmlv2/errorResponse/response_without_type.xml |   4 +-
 .../extendedRequest/request_with_1_control.xml     |  12 +-
 .../request_with_1_control_base64_value.xml        |  12 +-
 .../request_with_1_control_empty_value.xml         |  12 +-
 .../extendedRequest/request_with_2_controls.xml    |  18 +-
 .../extendedRequest/request_with_2_requestName.xml |   8 +-
 .../request_with_2_requestValue.xml                |  10 +-
 .../request_with_3_controls_without_value.xml      |  18 +-
 .../request_with_base64_requestValue.xml           |   8 +-
 .../request_with_empty_requestName.xml             |   8 +-
 .../request_with_empty_requestValue.xml            |   8 +-
 .../request_with_needed_requestID.xml              |   6 +-
 .../request_with_requestID_attribute.xml           |   6 +-
 .../request_with_requestID_below_0.xml             |   6 +-
 .../extendedRequest/request_with_requestValue.xml  |   8 +-
 .../request_without_requestName.xml                |   4 +-
 .../extendedResponse/response_with_1_control.xml   |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../response_with_1_empty_referral.xml             |   8 +-
 .../extendedResponse/response_with_1_referral.xml  |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../extendedResponse/response_with_2_controls.xml  |  18 +-
 .../extendedResponse/response_with_2_referrals.xml |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_base64_response.xml              |   8 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../response_with_empty_response.xml               |   8 +-
 .../response_with_empty_responseName.xml           |   8 +-
 .../response_with_error_message.xml                |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../extendedResponse/response_with_response.xml    |   8 +-
 .../response_with_responseName.xml                 |   8 +-
 .../response_with_responseName_and_response.xml    |  10 +-
 .../extendedResponse/response_with_result_code.xml |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../extendedResponse/response_with_wrong_descr.xml |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../response_with_wrong_responseName.xml           |   8 +-
 .../response_without_result_code.xml               |   4 +-
 .../dsmlv2/modDNRequest/request_with_1_control.xml |  12 +-
 .../request_with_1_control_base64_value.xml        |  12 +-
 .../request_with_1_control_empty_value.xml         |  12 +-
 .../modDNRequest/request_with_2_controls.xml       |  18 +-
 .../request_with_3_controls_without_value.xml      |  18 +-
 .../modDNRequest/request_with_deleteoldrdn_0.xml   |   8 +-
 .../modDNRequest/request_with_deleteoldrdn_1.xml   |   8 +-
 .../request_with_deleteoldrdn_error.xml            |   8 +-
 .../request_with_deleteoldrdn_false.xml            |   8 +-
 .../request_with_deleteoldrdn_true.xml             |   8 +-
 .../request_with_dn_and_newrdn_attributes.xml      |   6 +-
 .../modDNRequest/request_with_needed_requestID.xml |   6 +-
 .../request_with_newSuperior_attribute.xml         |   8 +-
 .../request_with_requestID_attribute.xml           |   8 +-
 .../request_with_requestID_below_0.xml             |   8 +-
 .../modDNRequest/request_without_dn_attribute.xml  |   4 +-
 .../request_without_newrdn_attribute.xml           |   4 +-
 .../modDNResponse/response_with_1_control.xml      |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../response_with_1_empty_referral.xml             |   8 +-
 .../modDNResponse/response_with_1_referral.xml     |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../modDNResponse/response_with_2_controls.xml     |  18 +-
 .../modDNResponse/response_with_2_referrals.xml    |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../modDNResponse/response_with_error_message.xml  |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../modDNResponse/response_with_result_code.xml    |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../modDNResponse/response_with_wrong_descr.xml    |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../modDNResponse/response_without_result_code.xml |   4 +-
 .../modifyRequest/request_with_1_control.xml       |   8 +-
 .../request_with_1_control_base64_value.xml        |   8 +-
 .../request_with_1_control_empty_value.xml         |   8 +-
 .../modifyRequest/request_with_1_modification.xml  |  10 +-
 .../request_with_1_modification_base64_value.xml   |  10 +-
 .../request_with_1_modification_increment.xml      |  10 +-
 .../modifyRequest/request_with_2_controls.xml      |  16 +-
 .../modifyRequest/request_with_2_modifications.xml |  16 +-
 .../request_with_3_controls_without_value.xml      |  16 +-
 .../request_with_modification_with_2_values.xml    |  12 +-
 .../request_with_modification_with_empty_value.xml |  10 +-
 .../request_with_modification_without_value.xml    |   8 +-
 .../request_with_needed_requestID.xml              |   2 +-
 .../modifyRequest/request_with_operation_add.xml   |  10 +-
 .../request_with_operation_delete.xml              |  10 +-
 .../modifyRequest/request_with_operation_error.xml |  10 +-
 .../request_with_operation_replace.xml             |  10 +-
 .../request_with_requestID_attribute.xml           |   4 +-
 .../request_with_requestID_below_0.xml             |   4 +-
 .../modifyRequest/request_without_dn_attribute.xml |   4 +-
 .../request_without_name_attribute.xml             |  10 +-
 .../request_without_operation_attribute.xml        |  10 +-
 .../modifyResponse/response_with_1_control.xml     |  12 +-
 .../response_with_1_control_empty_value.xml        |  12 +-
 .../response_with_1_empty_referral.xml             |   8 +-
 .../modifyResponse/response_with_1_referral.xml    |   8 +-
 .../response_with_1_referral_and_error_message.xml |  10 +-
 .../modifyResponse/response_with_2_controls.xml    |  18 +-
 .../modifyResponse/response_with_2_referrals.xml   |  10 +-
 .../response_with_3_controls_without_value.xml     |  18 +-
 .../response_with_empty_error_message.xml          |   8 +-
 .../modifyResponse/response_with_error_message.xml |   8 +-
 .../response_with_matchedDN_attribute.xml          |   6 +-
 .../response_with_requestID_attribute.xml          |   6 +-
 .../response_with_requestID_below_0.xml            |   6 +-
 .../modifyResponse/response_with_result_code.xml   |   6 +-
 .../response_with_result_code_not_integer.xml      |   6 +-
 .../modifyResponse/response_with_wrong_descr.xml   |   6 +-
 .../response_with_wrong_matchedDN_attribute.xml    |   6 +-
 .../response_without_result_code.xml               |   4 +-
 .../searchRequest/filters/request_with_and.xml     |  28 +-
 .../filters/request_with_approxMatch.xml           |  18 +-
 .../request_with_approxMatch_base64_value.xml      |  18 +-
 .../request_with_approxMatch_with_2_values.xml     |  20 +-
 .../request_with_approxMatch_with_empty_value.xml  |  18 +-
 .../request_with_approxMatch_without_name.xml      |  18 +-
 .../request_with_approxMatch_without_value.xml     |  16 +-
 .../filters/request_with_equalityMatch.xml         |  18 +-
 .../request_with_equalityMatch_base64_value.xml    |  18 +-
 .../request_with_equalityMatch_with_2_values.xml   |  20 +-
 ...request_with_equalityMatch_with_empty_value.xml |  18 +-
 .../request_with_equalityMatch_without_name.xml    |  18 +-
 .../request_with_equalityMatch_without_value.xml   |  16 +-
 .../filters/request_with_extensibleMatch.xml       |  18 +-
 .../request_with_extensibleMatch_base64_value.xml  |  18 +-
 .../request_with_extensibleMatch_with_2_values.xml |  20 +-
 ...st_with_extensibleMatch_with_dnAttributes_0.xml |  18 +-
 ...st_with_extensibleMatch_with_dnAttributes_1.xml |  18 +-
 ...ith_extensibleMatch_with_dnAttributes_error.xml |  18 +-
 ...ith_extensibleMatch_with_dnAttributes_false.xml |  18 +-
 ...with_extensibleMatch_with_dnAttributes_true.xml |  16 +-
 ...quest_with_extensibleMatch_with_empty_value.xml |  18 +-
 ...uest_with_extensibleMatch_with_matchingRule.xml |  18 +-
 .../request_with_extensibleMatch_with_name.xml     |  18 +-
 .../request_with_extensibleMatch_without_value.xml |  16 +-
 .../filters/request_with_greaterOrEqual.xml        |  18 +-
 .../request_with_greaterOrEqual_base64_value.xml   |  18 +-
 .../request_with_greaterOrEqual_with_2_values.xml  |  20 +-
 ...equest_with_greaterOrEqual_with_empty_value.xml |  18 +-
 .../request_with_greaterOrEqual_without_name.xml   |  18 +-
 .../request_with_greaterOrEqual_without_value.xml  |  16 +-
 .../filters/request_with_lessOrEqual.xml           |  18 +-
 .../request_with_lessOrEqual_base64_value.xml      |  18 +-
 .../request_with_lessOrEqual_with_2_values.xml     |  20 +-
 .../request_with_lessOrEqual_with_empty_value.xml  |  18 +-
 .../request_with_lessOrEqual_without_name.xml      |  18 +-
 .../request_with_lessOrEqual_without_value.xml     |  16 +-
 .../request_with_nested_connector_nodes.xml        |  64 +--
 .../searchRequest/filters/request_with_not.xml     |  22 +-
 .../filters/request_with_not_with_2_children.xml   |  28 +-
 .../searchRequest/filters/request_with_or.xml      |  22 +-
 .../searchRequest/filters/request_with_present.xml |  16 +-
 .../filters/request_with_present_without_name.xml  |  16 +-
 .../filters/request_with_substrings.xml            |  16 +-
 .../filters/request_with_substrings_1_any.xml      |  18 +-
 .../request_with_substrings_1_any_1_final.xml      |  20 +-
 .../request_with_substrings_1_base64_any.xml       |  18 +-
 .../request_with_substrings_1_base64_final.xml     |  18 +-
 .../request_with_substrings_1_base64_initial.xml   |  18 +-
 .../request_with_substrings_1_empty_any.xml        |  18 +-
 .../request_with_substrings_1_empty_final.xml      |  18 +-
 .../request_with_substrings_1_empty_initial.xml    |  18 +-
 .../filters/request_with_substrings_1_final.xml    |  18 +-
 .../filters/request_with_substrings_1_initial.xml  |  18 +-
 .../request_with_substrings_1_initial_1_any.xml    |  20 +-
 .../request_with_substrings_1_initial_1_final.xml  |  20 +-
 .../filters/request_with_substrings_2_any.xml      |  20 +-
 .../request_with_substrings_without_name.xml       |  16 +-
 .../searchRequest/request_with_1_control.xml       |  24 +-
 .../request_with_1_control_base64_value.xml        |  24 +-
 .../request_with_1_control_empty_value.xml         |  24 +-
 .../request_with_2_attributes_elements.xml         |  30 +-
 .../searchRequest/request_with_2_controls.xml      |  28 +-
 .../searchRequest/request_with_2_filters.xml       |  26 +-
 .../request_with_3_controls_without_value.xml      |  30 +-
 ...quest_with_attribute_without_name_attribute.xml |  30 +-
 .../request_with_attributes_1_attribute.xml        |  30 +-
 .../request_with_attributes_2_attribute.xml        |  30 +-
 .../request_with_attributes_but_no_attribute.xml   |  28 +-
 .../request_with_derefAliases_derefAlways.xml      |  24 +-
 ...quest_with_derefAliases_derefFindingBaseObj.xml |  24 +-
 .../request_with_derefAliases_derefInSearching.xml |  24 +-
 .../request_with_derefAliases_error.xml            |  24 +-
 ...request_with_derefAliases_neverDerefAliases.xml |  24 +-
 .../searchRequest/request_with_dn_attribute.xml    |  18 +-
 .../searchRequest/request_with_empty_filter.xml    |  18 +-
 .../request_with_needed_requestID.xml              |  18 +-
 .../request_with_requestID_attribute.xml           |  20 +-
 .../request_with_requestID_below_0.xml             |  20 +-
 .../request_with_scope_baseObject.xml              |  24 +-
 .../searchRequest/request_with_scope_error.xml     |  24 +-
 .../request_with_scope_singleLevel.xml             |  24 +-
 .../request_with_scope_wholeSubtree.xml            |  24 +-
 .../request_with_sizeLimit_attribute.xml           |  20 +-
 .../searchRequest/request_with_sizeLimit_error.xml |  20 +-
 .../request_with_timeLimit_attribute.xml           |  20 +-
 .../searchRequest/request_with_timeLimit_error.xml |  20 +-
 .../searchRequest/request_with_typesOnly_0.xml     |  20 +-
 .../searchRequest/request_with_typesOnly_1.xml     |  20 +-
 .../searchRequest/request_with_typesOnly_error.xml |  20 +-
 .../searchRequest/request_with_typesOnly_false.xml |  20 +-
 .../searchRequest/request_with_typesOnly_true.xml  |  20 +-
 .../request_without_derefAliases_attribute.xml     |  22 +-
 .../searchRequest/request_without_dn_attribute.xml |  16 +-
 .../searchRequest/request_without_filter.xml       |  14 +-
 .../request_without_scope_attribute.xml            |  22 +-
 .../dsmlv2/searchResponse/response_with_0_SRD.xml  |   4 +-
 .../dsmlv2/searchResponse/response_with_1_SRD.xml  |  10 +-
 .../searchResponse/response_with_1_SRE_0_SRD.xml   |  24 +-
 .../searchResponse/response_with_1_SRE_1_SRD.xml   |  30 +-
 .../response_with_1_SRE_1_SRR_1_SRD.xml            |  36 +-
 .../searchResponse/response_with_1_SRR_0_SRD.xml   |  10 +-
 .../searchResponse/response_with_1_SRR_1_SRD.xml   |  16 +-
 .../searchResponse/response_with_2_SRE_1_SRD.xml   |  54 +-
 .../response_with_2_SRE_2_SRR_1_SRD.xml            |  66 +--
 .../searchResponse/response_with_2_SRR_1_SRD.xml   |  22 +-
 .../response_with_requestID_attribute.xml          |  10 +-
 .../response_with_requestID_below_0.xml            |  10 +-
 .../searchResultDone/response_with_1_control.xml   |  16 +-
 .../response_with_1_control_empty_value.xml        |  16 +-
 .../response_with_1_empty_referral.xml             |  12 +-
 .../searchResultDone/response_with_1_referral.xml  |  12 +-
 .../response_with_1_referral_and_error_message.xml |  14 +-
 .../searchResultDone/response_with_2_controls.xml  |  22 +-
 .../searchResultDone/response_with_2_referrals.xml |  14 +-
 .../response_with_3_controls_without_value.xml     |  22 +-
 .../response_with_empty_error_message.xml          |  12 +-
 .../response_with_error_message.xml                |  12 +-
 .../response_with_matchedDN_attribute.xml          |  10 +-
 .../response_with_requestID_attribute.xml          |  16 +-
 .../response_with_requestID_below_0.xml            |  16 +-
 .../searchResultDone/response_with_result_code.xml |  10 +-
 .../response_with_result_code_not_integer.xml      |  10 +-
 .../searchResultDone/response_with_wrong_descr.xml |  10 +-
 .../response_with_wrong_matchedDN_attribute.xml    |  10 +-
 .../response_without_result_code.xml               |   8 +-
 .../searchResultEntry/response_with_0_attr.xml     |  14 +-
 .../response_with_1_attr_0_value.xml               |  18 +-
 .../response_with_1_attr_1_base64_value.xml        |  20 +-
 .../response_with_1_attr_1_empty_value.xml         |  20 +-
 .../response_with_1_attr_1_value.xml               |  20 +-
 .../response_with_1_attr_2_value.xml               |  22 +-
 ...response_with_1_attr_without_name_attribute.xml |  18 +-
 .../searchResultEntry/response_with_1_control.xml  |  20 +-
 .../response_with_1_control_empty_value.xml        |  20 +-
 .../response_with_2_attr_1_value.xml               |  26 +-
 .../searchResultEntry/response_with_2_controls.xml |  26 +-
 .../response_with_3_controls_without_value.xml     |  26 +-
 .../response_with_dn_attribute.xml                 |  14 +-
 .../response_with_requestID_attribute.xml          |  14 +-
 .../response_with_requestID_below_0.xml            |  14 +-
 .../response_with_wrong_dn_attribute.xml           |  14 +-
 .../response_without_dn_attribute.xml              |  14 +-
 .../searchResultReference/response_with_0_ref.xml  |  14 +-
 .../response_with_1_control.xml                    |  22 +-
 .../response_with_1_control_empty_value.xml        |  22 +-
 .../response_with_1_empty_ref.xml                  |  16 +-
 .../searchResultReference/response_with_1_ref.xml  |  16 +-
 .../response_with_1_wrong_ref.xml                  |  16 +-
 .../response_with_2_controls.xml                   |  28 +-
 .../searchResultReference/response_with_2_ref.xml  |  18 +-
 .../response_with_3_controls_without_value.xml     |  28 +-
 .../response_with_requestID_attribute.xml          |  16 +-
 .../response_with_requestID_below_0.xml            |  16 +-
 .../soap/soap-dsml-multiple-operation-requests.xml |  42 +-
 .../api/dsmlv2/soap/soap-dsml-req-with-header.xml  |  42 +-
 .../dsmlv2/soap/soap-dsml-req-without-header.xml   |  26 +-
 .../ldap/client/api/QuirkySchemaTest.java          |  34 +-
 ldap/extras/aci/src/main/antlr/ACIItem.g           |   2 +-
 ldap/model/src/main/antlr/distinguishedName.g      |  14 +-
 .../ldap/model/schema/parsers/collective.schema    |  26 +-
 .../api/ldap/model/schema/parsers/core.schema      | 632 ++++++++++-----------
 .../api/ldap/model/schema/parsers/dyngroup.schema  |  38 +-
 .../ldap/model/schema/parsers/inetorgperson.schema | 110 ++--
 .../converter/src/main/antlr/schemaConverter.g     |  24 +-
 .../api/ldap/schema/converter/test.schema          | 216 +++----
 471 files changed, 3478 insertions(+), 3478 deletions(-)

diff --git a/distribution/src/main/release/licenses/xml-apis-README.dom.txt b/distribution/src/main/release/licenses/xml-apis-README.dom.txt
index 92ab7f6..bdb7404 100644
--- a/distribution/src/main/release/licenses/xml-apis-README.dom.txt
+++ b/distribution/src/main/release/licenses/xml-apis-README.dom.txt
@@ -28,6 +28,6 @@ The actual DOM Java Language Binding classes in xml-commons came from:
 The specification of DOM Level 2's various parts is at:
     http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/
     http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113/
-	http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/
-	http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/
-	http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113/
\ No newline at end of file
+    http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/
+    http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/
+    http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113/
\ No newline at end of file
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml
index e46f183..25e6e45 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="0" >
-	<abandonRequest abandonID="0">
-	</abandonRequest>
+  <abandonRequest abandonID="0">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control.xml
index f6f8149..c5597e8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_base64_value.xml
index 05a99b3..5eaf15e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<abandonRequest abandonID="123">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_empty_value.xml
index 7a03e9c..3da1877 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_1_control_empty_value.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_2_controls.xml
index 44f0643..32cf42e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_2_controls.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_3_controls_without_value.xml
index 74474c2..ceefd70 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_abandonID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_abandonID_attribute.xml
index 4f61cef..93547f9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_abandonID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_abandonID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_needed_requestID.xml
index 5b5a1c0..f8ede21 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_needed_requestID.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123">
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_attribute.xml
index 82aa9f7..0cf2aa5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123" requestID="456">
-	</abandonRequest>
+  <abandonRequest abandonID="123" requestID="456">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_below_0.xml
index c736992..273bc39 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest abandonID="123" requestID="-1">
-	</abandonRequest>
+  <abandonRequest abandonID="123" requestID="-1">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_without_abandonID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_without_abandonID_attribute.xml
index 2117934..9428b2a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_without_abandonID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/abandonRequest/request_without_abandonID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<abandonRequest>
-	</abandonRequest>
+  <abandonRequest>
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_empty_value.xml
index 6b28176..7fd455a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_empty_value.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass"><value></value></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass"><value></value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_2_values.xml
index b945a3c..b4a3641 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_2_values.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value><value>person</value></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value><value>person</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_base64_value.xml
index fce259c..ff3ae5a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass">
-			<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-		</attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass">
+      <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+    </attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_value.xml
index b597db9..4d60c48 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_with_value.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_name_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_name_attribute.xml
index 2c16a46..0d43c2d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_name_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_name_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr><value>top</value></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr><value>top</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_value.xml
index e1c5105..f6bedef 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_attr_without_value.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass"></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass"></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control.xml
index 909c7f6..6f27563 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_base64_value.xml
index 9d7914e..7e33493 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_empty_value.xml
index 6f8fede..154e2ff 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_1_control_empty_value.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_attr_with_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_attr_with_value.xml
index 6d6e223..8c7b54e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_attr_with_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_attr_with_value.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_controls.xml
index d0c4c6f..d3763f8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_2_controls.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_3_controls_without_value.xml
index 59dfe9b..80bd588 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_3_controls_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_dn_attribute.xml
index 0ec82ad..4bceeeb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_needed_requestID.xml
index 14e8570..488b954 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_needed_requestID.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</addRequest>
+  <addRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_attribute.xml
index 5386a3c..bd4b732 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest requestID="456" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</addRequest>
+  <addRequest requestID="456" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_below_0.xml
index bf5b92c..4dfbac0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</addRequest>
+  <addRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_without_dn_attribute.xml
index d67abaa..36b3ae8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addRequest/request_without_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addRequest>
-	</addRequest>
+  <addRequest>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control.xml
index 8f056b0..974aff4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control_empty_value.xml
index 2b9dad0..860be72 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_empty_referral.xml
index d7e1c31..04e4abd 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral.xml
index bd4db15..9b0f9dc 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral_and_error_message.xml
index 20613fa..e0a7973 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_controls.xml
index 2ade642..ed13a4e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_referrals.xml
index f62a86e..0c87263 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_3_controls_without_value.xml
index d34851d..479817a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_empty_error_message.xml
index 7c738ad..5567882 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+    <errorMessage></errorMessage>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_error_message.xml
index cadd625..2f9cf64 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+    <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_matchedDN_attribute.xml
index fd38595..1ab008b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_attribute.xml
index 81814cb..2f1a3ad 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</addResponse>	
+  <addResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </addResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_below_0.xml
index 563af50..4afb564 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</addResponse>	
+  <addResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </addResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code.xml
index bb5a6ac..890ceaf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code_not_integer.xml
index 1f2b4ae..b4dec51 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_descr.xml
index 1a96e16..05b4077 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_matchedDN_attribute.xml
index 6b0283e..69ffd11 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_without_result_code.xml
index 7191681..7725e82 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/addResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<addResponse requestID="10">
-	</addResponse>
+  <addResponse requestID="10">
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control.xml
index 7634067..d1103d4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_base64_value.xml
index b6534b5..fe4a901 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_empty_value.xml
index a97202e..78c488d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_1_control_empty_value.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_2_controls.xml
index c1f99a0..bcd3b41 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_2_controls.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_3_controls_without_value.xml
index 264e334..55fa29a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_3_controls_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_needed_requestID.xml
index ff60a4e..0084a3a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_needed_requestID.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_principal_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_principal_attribute.xml
index b62a9d9..1432279 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_principal_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_principal_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_attribute.xml
index 446049f..143ef7b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest requestID="456" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <authRequest requestID="456" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_below_0.xml
index ad213e9..8f39627 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest requestID="-1" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <authRequest requestID="-1" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_without_principal_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_without_principal_attribute.xml
index 6f57325..f30d0f5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_without_principal_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authRequest/request_without_principal_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authRequest>
-	</authRequest>
+  <authRequest>
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control.xml
index eb35812..1a5e71e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control_empty_value.xml
index 4ebebd1..b934153 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_empty_referral.xml
index cfe6b7d..ba62804 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral.xml
index b5c0490..900fcc1 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral_and_error_message.xml
index a02ecb4..9b3f132 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_controls.xml
index 3e5e51b..27ed2e0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_referrals.xml
index 763bcc0..517127b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_3_controls_without_value.xml
index 3b05714..10ac1f7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_empty_error_message.xml
index af28ad6..ba5d494 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_error_message.xml
index 33d6380..1458a37 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_matchedDN_attribute.xml
index 42e4551..c09a729 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_attribute.xml
index 4d1ab08..1d22cc0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</authResponse>	
+  <authResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </authResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_below_0.xml
index 1a5fb6e..251380d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</authResponse>	
+  <authResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </authResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code.xml
index b87bb83..3720a11 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code_not_integer.xml
index a9f8381..fe350ff 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_descr.xml
index fc3c400..ba8483c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</authResponse>
+  <authResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_matchedDN_attribute.xml
index 66002db..ba79a7c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_without_result_code.xml
index 071896a..8649721 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/authResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<authResponse requestID="10">
-	</authResponse>
+  <authResponse requestID="10">
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AbandonRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AbandonRequest.xml
index cb657ef..c75d42f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AbandonRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AbandonRequest.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<abandonRequest abandonID="123">
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AddRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AddRequest.xml
index 4ec5201..2cb9151 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AddRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AddRequest.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-		<attr name="sn"><value>snvalue</value></attr>
-	</addRequest>
+  <addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+    <attr name="sn"><value>snvalue</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest.xml
index e1e245a..1299aed 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest_1_AddRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest_1_AddRequest.xml
index a047d64..e8a4896 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest_1_AddRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_AuthRequest_1_AddRequest.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
-	<addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-		<attr name="sn"><value>snvalue</value></attr>
-	</addRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
+  <addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+    <attr name="sn"><value>snvalue</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_CompareRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_CompareRequest.xml
index c981717..b8dbbf4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_CompareRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_CompareRequest.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
-	</compareRequest>
+  <compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_DelRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_DelRequest.xml
index 232d62a..caf179c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_DelRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_DelRequest.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ExtendedRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ExtendedRequest.xml
index 96b4bdb..c5db87e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ExtendedRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ExtendedRequest.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<extendedRequest requestID="12">
-		<requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
-	</extendedRequest>
+  <extendedRequest requestID="12">
+    <requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModDNRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModDNRequest.xml
index a882296..d0e3c8c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModDNRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModDNRequest.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush">
-	</modDNRequest>
+  <modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModifyRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModifyRequest.xml
index ce440d6..619227a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModifyRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_ModifyRequest.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<modification name="sn" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-			<value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <modification name="sn" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+      <value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_SearchRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_SearchRequest.xml
index ee5b29c..71f871f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_SearchRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_1_SearchRequest.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<searchRequest requestID="14" 
-				   dn="dc=example,dc=com"
-				   scope="wholeSubtree"
-				   derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="objectclass">
-				<any>o</any>
-			</substrings>		
-		</filter>
-	</searchRequest>
+  <searchRequest requestID="14" 
+           dn="dc=example,dc=com"
+           scope="wholeSubtree"
+           derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="objectclass">
+        <any>o</any>
+      </substrings>    
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AbandonRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AbandonRequest.xml
index 827aeac..0987a01 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AbandonRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AbandonRequest.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<abandonRequest abandonID="123">
-	</abandonRequest>
-	<abandonRequest abandonID="123">
-	</abandonRequest>
+  <abandonRequest abandonID="123">
+  </abandonRequest>
+  <abandonRequest abandonID="123">
+  </abandonRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AddRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AddRequest.xml
index b52614b..c63a1a6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AddRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_AddRequest.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-		<attr name="sn"><value>snvalue</value></attr>
-	</addRequest>
-	<addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-		<attr name="sn"><value>snvalue</value></attr>
-	</addRequest>
+  <addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+    <attr name="sn"><value>snvalue</value></attr>
+  </addRequest>
+  <addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+    <attr name="sn"><value>snvalue</value></attr>
+  </addRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_CompareRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_CompareRequest.xml
index e14f1b1..d7eadf6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_CompareRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_CompareRequest.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
-	</compareRequest>
-	<compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
-	</compareRequest>
+  <compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
+  </compareRequest>
+  <compareRequest requestID="9" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <assertion name="sn"><value>CN=Michael Scofield, DC=prisonbreak, Dc=com</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_DelRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_DelRequest.xml
index 320a764..5d4f8ed 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_DelRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_DelRequest.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
-	</delRequest>
-	<delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
+  </delRequest>
+  <delRequest requestID="7" dn="CN=Bob Rush,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ExtendedRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ExtendedRequest.xml
index fcccad1..e53193c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ExtendedRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ExtendedRequest.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<extendedRequest requestID="12">
-		<requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
-	</extendedRequest>
-	<extendedRequest requestID="12">
-		<requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
-	</extendedRequest>
+  <extendedRequest requestID="12">
+    <requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
+  </extendedRequest>
+  <extendedRequest requestID="12">
+    <requestName>1.2.6.1.4.1.18060.1.1.1.100.2</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModDNRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModDNRequest.xml
index 7f15f1d..c353da5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModDNRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModDNRequest.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush">
-	</modDNRequest>
-	<modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush">
-	</modDNRequest>
+  <modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush">
+  </modDNRequest>
+  <modDNRequest requestID="10" dn="CN=Bobby Rush,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModifyRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModifyRequest.xml
index 6fff05c..dd47539 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModifyRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_ModifyRequest.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<modification name="sn" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-			<value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
-		</modification>
-	</modifyRequest>
-	<modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<modification name="sn" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-			<value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <modification name="sn" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+      <value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
+    </modification>
+  </modifyRequest>
+  <modifyRequest requestID="13" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <modification name="sn" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+      <value>CN=Michael Scofield, DC=prisonbreak, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_SearchRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_SearchRequest.xml
index 7a687fa..b3f3c86 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_SearchRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_2_SearchRequest.xml
@@ -18,24 +18,24 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<searchRequest requestID="14" 
-				   dn="dc=example,dc=com"
-				   scope="wholeSubtree"
-				   derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="objectclass">
-				<any>o</any>
-			</substrings>		
-		</filter>
-	</searchRequest>
-	<searchRequest requestID="15" 
-				   dn="dc=example,dc=com"
-				   scope="wholeSubtree"
-				   derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="objectclass">
-				<any>o</any>
-			</substrings>		
-		</filter>
-	</searchRequest>
+  <searchRequest requestID="14" 
+           dn="dc=example,dc=com"
+           scope="wholeSubtree"
+           derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="objectclass">
+        <any>o</any>
+      </substrings>    
+    </filter>
+  </searchRequest>
+  <searchRequest requestID="15" 
+           dn="dc=example,dc=com"
+           scope="wholeSubtree"
+           derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="objectclass">
+        <any>o</any>
+      </substrings>    
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_wrong_placed_AuthRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_wrong_placed_AuthRequest.xml
index 33d2cfa..925b5b2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_wrong_placed_AuthRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchRequest/request_with_wrong_placed_AuthRequest.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="1234567890">
-	<addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
-		<attr name="objectclass"><value>top</value></attr>
-		<attr name="objectclass"><value>person</value></attr>
-		<attr name="sn"><value>snvalue</value></attr>
-	</addRequest>
-	<authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</authRequest>
+  <addRequest requestID="5" dn="CN=Bob Rush,DC=Example,DC=COM">
+    <attr name="objectclass"><value>top</value></attr>
+    <attr name="objectclass"><value>person</value></attr>
+    <attr name="sn"><value>snvalue</value></attr>
+  </addRequest>
+  <authRequest principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </authRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AddResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AddResponse.xml
index 064106b..4bf7e97 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AddResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AddResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AuthResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AuthResponse.xml
index aafcfb3..5956a71 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AuthResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_AuthResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authResponse requestID="20">
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="20">
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_CompareResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_CompareResponse.xml
index d45bb57..0df53a9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_CompareResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_CompareResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareResponse requestID="30">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="30">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_DelResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_DelResponse.xml
index ccb9db3..d58dc79 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_DelResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_DelResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delResponse requestID="40">
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="40">
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ErrorResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ErrorResponse.xml
index 3dc9482..9b36999 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ErrorResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ErrorResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<errorResponse type="couldNotConnect" requestID="80">
-		<message>Connection refused</message>
-	</errorResponse>
+  <errorResponse type="couldNotConnect" requestID="80">
+    <message>Connection refused</message>
+  </errorResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ExtendedResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ExtendedResponse.xml
index 41c0bcc..2c93c7d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ExtendedResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ExtendedResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedResponse requestID="70">
-    	<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<responseName>1.2.3.4.5.6.7.8.9.0</responseName>
-		<response>A response</response>
-	</extendedResponse>
+  <extendedResponse requestID="70">
+      <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <responseName>1.2.3.4.5.6.7.8.9.0</responseName>
+    <response>A response</response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModDNResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModDNResponse.xml
index 47dc1f0..08f7ba5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModDNResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModDNResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNResponse requestID="60">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="60">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModifyResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModifyResponse.xml
index f21ed58..a875de6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModifyResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_ModifyResponse.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyResponse requestID="50">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="50">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_SearchResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_SearchResponse.xml
index 4194ba9..6c055c0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_SearchResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_1_SearchResponse.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<searchResponse requestID="90">
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse requestID="90">
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AddResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AddResponse.xml
index 3225a1f..512ea1f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AddResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AddResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<addResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-	</addResponse>
-	<addResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-	</addResponse>
+  <addResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+  </addResponse>
+  <addResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+  </addResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AuthResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AuthResponse.xml
index 142b756..e8f21cf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AuthResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_AuthResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<authResponse requestID="20">
-		<resultCode code="0" descr="success"/>
-	</authResponse>
-	<authResponse requestID="20">
-		<resultCode code="0" descr="success"/>
-	</authResponse>
+  <authResponse requestID="20">
+    <resultCode code="0" descr="success"/>
+  </authResponse>
+  <authResponse requestID="20">
+    <resultCode code="0" descr="success"/>
+  </authResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_CompareResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_CompareResponse.xml
index 12308e4..626f5c1 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_CompareResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_CompareResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareResponse requestID="30">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
-	<compareResponse requestID="30">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="30">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
+  <compareResponse requestID="30">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_DelResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_DelResponse.xml
index 01198fe..53ed42f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_DelResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_DelResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delResponse requestID="40">
-		<resultCode code="0" descr="success"/>
-	</delResponse>
-	<delResponse requestID="40">
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="40">
+    <resultCode code="0" descr="success"/>
+  </delResponse>
+  <delResponse requestID="40">
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ErrorResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ErrorResponse.xml
index 2cc21e4..c7825b6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ErrorResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ErrorResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<errorResponse type="couldNotConnect" requestID="80">
-		<message>Connection refused</message>
-	</errorResponse>
-	<errorResponse type="couldNotConnect" requestID="80">
-		<message>Connection refused</message>
-	</errorResponse>
+  <errorResponse type="couldNotConnect" requestID="80">
+    <message>Connection refused</message>
+  </errorResponse>
+  <errorResponse type="couldNotConnect" requestID="80">
+    <message>Connection refused</message>
+  </errorResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ExtendedResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ExtendedResponse.xml
index 4ab5bda..5a3fa9a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ExtendedResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ExtendedResponse.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedResponse requestID="70">
-    	<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<responseName>1.2.3.4.5.6.7.8.9.0</responseName>
-		<response>A response</response>
-	</extendedResponse>
-	<extendedResponse requestID="70">
-    	<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<responseName>1.2.3.4.5.6.7.8.9.0</responseName>
-		<response>A response</response>
-	</extendedResponse>
+  <extendedResponse requestID="70">
+      <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <responseName>1.2.3.4.5.6.7.8.9.0</responseName>
+    <response>A response</response>
+  </extendedResponse>
+  <extendedResponse requestID="70">
+      <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <responseName>1.2.3.4.5.6.7.8.9.0</responseName>
+    <response>A response</response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModDNResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModDNResponse.xml
index f742ee5..288d319 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModDNResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModDNResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNResponse requestID="60">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
-	<modDNResponse requestID="60">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="60">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
+  <modDNResponse requestID="60">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModifyResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModifyResponse.xml
index 48db5e4..b119c47 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModifyResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_ModifyResponse.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyResponse requestID="50">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
-	<modifyResponse requestID="50">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="50">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
+  <modifyResponse requestID="50">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_SearchResponse.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_SearchResponse.xml
index 2a5a967..304ebcf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_SearchResponse.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/batchResponse/response_with_2_SearchResponse.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<searchResponse requestID="90">
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
-	<searchResponse requestID="90">
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse requestID="90">
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
+  <searchResponse requestID="90">
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_empty_value.xml
index a5532ac..4f4551a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_empty_value.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value></value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value></value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_with_2_values.xml
index e2706a9..a2ad9ec 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_with_2_values.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value>Johnson</value></assertion>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value>Johnson</value></assertion>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_name_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_name_attribute.xml
index 42cd613..77e1308 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_name_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_name_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_value.xml
index eb88eb9..343e7c2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_assertion_without_value.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"/>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"/>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion.xml
index a9ad5aa..709a648 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion_base64_value.xml
index 3fdb914..fb848bf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_complete_assertion_base64_value.xml
@@ -20,7 +20,7 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control.xml
index 10a8b31..705546e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_base64_value.xml
index cc9cda0..d996e5d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_base64_value.xml
@@ -20,10 +20,10 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_empty_value.xml
index d1f990a..68b3a26 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_complete_assertions.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_complete_assertions.xml
index 806476d..6a4528b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_complete_assertions.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_complete_assertions.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value>Johnson</value></assertion>
-		<assertion name="sn"><value>Thomson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value>Johnson</value></assertion>
+    <assertion name="sn"><value>Thomson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_controls.xml
index 18ff595..9a07e41 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_3_controls_without_value.xml
index 2b4e385..298e968 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_3_controls_without_value.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_dn_attribute.xml
index a9ad5aa..709a648 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_dn_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_needed_requestID.xml
index 6415944..84f0559 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_needed_requestID.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_attribute.xml
index e6ea23a..5c6361b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="456">
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="456">
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_below_0.xml
index cc84557..e9b6474 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_assertion.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_assertion.xml
index 0fccf84..7b20985 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_assertion.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_assertion.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</compareRequest>
+  <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_dn_attribute.xml
index 7a30697..4db37f2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareRequest/request_without_dn_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<compareRequest>
-		<assertion name="sn"><value>Johnson</value></assertion>
-	</compareRequest>
+  <compareRequest>
+    <assertion name="sn"><value>Johnson</value></assertion>
+  </compareRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control.xml
index 4aabcbb..95e3b93 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control_empty_value.xml
index 1fb4759..70668db 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_empty_referral.xml
index 397f077..5145a39 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral.xml
index d411196..7394281 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral_and_error_message.xml
index 3e0bc77..b94471f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_controls.xml
index b9f2121..1febf63 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_referrals.xml
index 663f2f9..1bb2245 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_3_controls_without_value.xml
index 9fa333d..dee4a0c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_empty_error_message.xml
index d900796..e90cc49 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_error_message.xml
index cfd0a3a..359acbf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_matchedDN_attribute.xml
index eda5b4c..ba9117e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_attribute.xml
index 84c4c5e..d8899b0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>	
+  <compareResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_below_0.xml
index aa71d6a..b99c6ea 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>	
+  <compareResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code.xml
index ac68d37..7d01e52 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code_not_integer.xml
index f17b43e..7268e1a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_descr.xml
index 897b8da..e4d6233 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</compareResponse>
+  <compareResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_matchedDN_attribute.xml
index 1f2746c..fd93b12 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</compareResponse>
+  <compareResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_without_result_code.xml
index 5f4d896..5bc7ae8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/compareResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<compareResponse requestID="10">
-	</compareResponse>
+  <compareResponse requestID="10">
+  </compareResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control.xml
index 856f4ad..bd75de0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_base64_value.xml
index 10b610a..0583081 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_empty_value.xml
index 5daaa1a..de74d45 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_1_control_empty_value.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_2_controls.xml
index 1016afc..5bac93e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_2_controls.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_3_controls_without_value.xml
index 37e3946..4cd89db 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_3_controls_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_dn_attribute.xml
index 9d12bb5..da42481 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_needed_requestID.xml
index 06e8580..fc2351e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_needed_requestID.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_attribute.xml
index 746feb0..48f5701 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest requestID="456" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest requestID="456" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_below_0.xml
index 8fe3548..1581abe 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</delRequest>
+  <delRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_without_dn_attribute.xml
index cae29f7..90ee258 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delRequest/request_without_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<delRequest>
-	</delRequest>
+  <delRequest>
+  </delRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control.xml
index 0087d33..cdb60fa 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control_empty_value.xml
index 3ad6af8..ecc40ed 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_empty_referral.xml
index f4c44fc..0083c4f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral.xml
index 2ebe62b..1f81129 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral_and_error_message.xml
index 0e1ae26..b360ae6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_controls.xml
index 40b0f08..b6a9dc5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_referrals.xml
index 2906a3e..749130c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_3_controls_without_value.xml
index 1e6aae9..31ae8f2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_empty_error_message.xml
index ddcb021..f44e6f9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_error_message.xml
index 2056bee..5654b5c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_matchedDN_attribute.xml
index 250e1f8..8ea2c30 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_attribute.xml
index 603c8ae..dc2a092 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</delResponse>	
+  <delResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </delResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_below_0.xml
index 43597ae..9bf3c5f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</delResponse>	
+  <delResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </delResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code.xml
index 4911492..8c04307 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code_not_integer.xml
index bb957c9..af10711 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_descr.xml
index 5bd5624..3bfd2ee 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</delResponse>
+  <delResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_matchedDN_attribute.xml
index 0ecd63d..93bb375 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</delResponse>
+  <delResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_without_result_code.xml
index 2e8bb10..0dd540c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/delResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<delResponse requestID="10">
-	</delResponse>
+  <delResponse requestID="10">
+  </delResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_empty_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_empty_message.xml
index f817172..052263d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_empty_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_empty_message.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="couldNotConnect">
-		<message></message>
-	</errorResponse>	
+  <errorResponse requestID="456" type="couldNotConnect">
+    <message></message>
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_message.xml
index 3d4645d..30ae1a0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_message.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="couldNotConnect">
-		<message>Connection refused</message>
-	</errorResponse>	
+  <errorResponse requestID="456" type="couldNotConnect">
+    <message>Connection refused</message>
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_attribute.xml
index d5e2e17..53f7b5c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="couldNotConnect">
-	</errorResponse>	
+  <errorResponse requestID="456" type="couldNotConnect">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_below_0.xml
index 92c4cc6..4963588 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="-1">
-	<errorResponse requestID="-1" type="couldNotConnect">
-	</errorResponse>	
+  <errorResponse requestID="-1" type="couldNotConnect">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_authenticationFailed.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_authenticationFailed.xml
index 9cbbf79..2f8255c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_authenticationFailed.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_authenticationFailed.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="authenticationFailed">
-	</errorResponse>	
+  <errorResponse requestID="456" type="authenticationFailed">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_connectionClosed.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_connectionClosed.xml
index 9e36c44..b04395b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_connectionClosed.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_connectionClosed.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="connectionClosed">
-	</errorResponse>	
+  <errorResponse requestID="456" type="connectionClosed">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_couldNotConnect.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_couldNotConnect.xml
index d5e2e17..53f7b5c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_couldNotConnect.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_couldNotConnect.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="couldNotConnect">
-	</errorResponse>	
+  <errorResponse requestID="456" type="couldNotConnect">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_gatewayInternalError.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_gatewayInternalError.xml
index 66e36cd..f80a317 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_gatewayInternalError.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_gatewayInternalError.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="gatewayInternalError">
-	</errorResponse>	
+  <errorResponse requestID="456" type="gatewayInternalError">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_inError.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_inError.xml
index 93e1ae8..e244cf5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_inError.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_inError.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="error">
-	</errorResponse>	
+  <errorResponse requestID="456" type="error">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_malformedRequest.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_malformedRequest.xml
index e156e9d..af1c9ed 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_malformedRequest.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_malformedRequest.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="malformedRequest">
-	</errorResponse>	
+  <errorResponse requestID="456" type="malformedRequest">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_notAttempted.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_notAttempted.xml
index a973f55..785adc7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_notAttempted.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_notAttempted.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="notAttempted">
-	</errorResponse>	
+  <errorResponse requestID="456" type="notAttempted">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_other.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_other.xml
index f710270..a4dc230 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_other.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_other.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="other">
-	</errorResponse>	
+  <errorResponse requestID="456" type="other">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_unresolvableURI.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_unresolvableURI.xml
index 1432e43..a01507d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_unresolvableURI.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_with_type_unresolvableURI.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456" type="unresolvableURI">
-	</errorResponse>	
+  <errorResponse requestID="456" type="unresolvableURI">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_without_type.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_without_type.xml
index 532a3d7..8605181 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_without_type.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/errorResponse/response_without_type.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<errorResponse requestID="456">
-	</errorResponse>	
+  <errorResponse requestID="456">
+  </errorResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control.xml
index 9c24222..5832ed4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_base64_value.xml
index 5adb778..f0df47e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_base64_value.xml
@@ -20,10 +20,10 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<extendedRequest>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_empty_value.xml
index cde621a..8d7a523 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_controls.xml
index 32208d0..660b99f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestName.xml
index ff2c680..ec4712e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestName.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestValue.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestValue.xml
index 10ebd2b..af3cd97 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestValue.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_2_requestValue.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-		<requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
-		<requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+    <requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
+    <requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_3_controls_without_value.xml
index 0037eb5..8a5cfcd 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_base64_requestValue.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_base64_requestValue.xml
index b8daead..f12906d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_base64_requestValue.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_base64_requestValue.xml
@@ -20,8 +20,8 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-		<requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+    <requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestName.xml
index 61b6180..ad515a6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestName.xml
@@ -20,8 +20,8 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3c.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3c.org/2001/XMLSchema">
-	<extendedRequest>
-		<requestName></requestName>
-		<requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName></requestName>
+    <requestValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</requestValue>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestValue.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestValue.xml
index 0566df2..27a35fc 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestValue.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_empty_requestValue.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-		<requestValue></requestValue>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+    <requestValue></requestValue>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_needed_requestID.xml
index e5f36cc..677085b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_needed_requestID.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_attribute.xml
index de71ecf..9d42d3c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest requestID="456">
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest requestID="456">
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_below_0.xml
index e92c65e..dbac88a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest requestID="-1">
-		<requestName>1.3.563.52.425</requestName>
-	</extendedRequest>
+  <extendedRequest requestID="-1">
+    <requestName>1.3.563.52.425</requestName>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestValue.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestValue.xml
index 4e4a1f7..6e9ce8c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestValue.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_with_requestValue.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-		<requestName>1.3.563.52.425</requestName>
-		<requestValue>foobar</requestValue>
-	</extendedRequest>
+  <extendedRequest>
+    <requestName>1.3.563.52.425</requestName>
+    <requestValue>foobar</requestValue>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_without_requestName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_without_requestName.xml
index 231fe0e..b53e665 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_without_requestName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedRequest/request_without_requestName.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<extendedRequest>
-	</extendedRequest>
+  <extendedRequest>
+  </extendedRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control.xml
index 2fdcd40..19c06e8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control_empty_value.xml
index 9fa5356..0663b14 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_empty_referral.xml
index 28282cb..0ca1741 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral.xml
index bca3be6..90fd49b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral_and_error_message.xml
index 94119a8..e306acf 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_controls.xml
index 47efee1..145679a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_referrals.xml
index 6d38af6..dd0bc28 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_3_controls_without_value.xml
index 299549c..aeba505 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_base64_response.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_base64_response.xml
index 91793fb..8912f75 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_base64_response.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_base64_response.xml
@@ -20,8 +20,8 @@
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<response xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</response>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <response xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_error_message.xml
index a67e188..9296351 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_response.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_response.xml
index e393e3e..32cd04d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_response.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_response.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<response></response>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <response></response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_responseName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_responseName.xml
index 13c09d1..e141155 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_responseName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_empty_responseName.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<responseName></responseName>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <responseName></responseName>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_error_message.xml
index b7b99f4..085710e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_matchedDN_attribute.xml
index f7c6863..3057edb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_attribute.xml
index ee86fa5..34a9fd7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>	
+  <extendedResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_below_0.xml
index 2914ad0..1c85688 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>	
+  <extendedResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_response.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_response.xml
index df6599d..f2860f2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_response.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_response.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<response>This is a response</response>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <response>This is a response</response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName.xml
index 29f97a1..ebfc957 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<responseName>1.2.3.4.5.6.7.8.9.0</responseName>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <responseName>1.2.3.4.5.6.7.8.9.0</responseName>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName_and_response.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName_and_response.xml
index 90d043e..6b1a60b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName_and_response.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_responseName_and_response.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<responseName>1.2.3.4.5.6.7.8.9.0</responseName>
-		<response>This is a response</response>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <responseName>1.2.3.4.5.6.7.8.9.0</responseName>
+    <response>This is a response</response>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code.xml
index fe2ff2c..a4287c5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code_not_integer.xml
index a8d039b..76bd777 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_descr.xml
index 700c985..034174d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_matchedDN_attribute.xml
index 3dc7482..f47d39c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</extendedResponse>
+  <extendedResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_responseName.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_responseName.xml
index 0f4aa02..e684d66 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_responseName.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_with_wrong_responseName.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-		<resultCode code="0" descr="success"/>
-		<responseName>Wrong ResponseName</responseName>
-	</extendedResponse>
+  <extendedResponse requestID="10">
+    <resultCode code="0" descr="success"/>
+    <responseName>Wrong ResponseName</responseName>
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_without_result_code.xml
index 5d0fb57..22870e4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/extendedResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<extendedResponse requestID="10">
-	</extendedResponse>
+  <extendedResponse requestID="10">
+  </extendedResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control.xml
index 5d08c1f..d2c1d72 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_base64_value.xml
index bb8a00b..baea35f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_base64_value.xml
@@ -20,10 +20,10 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_empty_value.xml
index 05e4912..673e3b9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_2_controls.xml
index 5902a02..7366935 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_3_controls_without_value.xml
index 8489a96..2a446a1 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_0.xml
index ae75e91..a682326 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_0.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				deleteoldrdn="0">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        deleteoldrdn="0">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_1.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_1.xml
index d35e1e3..6695d26 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_1.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_1.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				deleteoldrdn="1">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        deleteoldrdn="1">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_error.xml
index d4bdcfc..c5a6e45 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_error.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				deleteoldrdn="error">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        deleteoldrdn="error">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_false.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_false.xml
index 9e69706..4ebc84f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_false.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_false.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				deleteoldrdn="false">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        deleteoldrdn="false">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_true.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_true.xml
index d1fcd6a..46f903b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_true.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_deleteoldrdn_true.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				deleteoldrdn="true">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        deleteoldrdn="true">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_dn_and_newrdn_attributes.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_dn_and_newrdn_attributes.xml
index 838ddae..0495df9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_dn_and_newrdn_attributes.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_dn_and_newrdn_attributes.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Steve Jobs">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Steve Jobs">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_needed_requestID.xml
index 1269f6c..0b23dba 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_needed_requestID.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-								newrdn="CN=Bob Rush2">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+                newrdn="CN=Bob Rush2">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_newSuperior_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_newSuperior_attribute.xml
index 5f624e2..798ba69 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_newSuperior_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_newSuperior_attribute.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-				newrdn="CN=Bob Rush2"
-				newSuperior="CN=Steve Jobs,OU=Dev,DC=apple,DC=com">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+        newrdn="CN=Bob Rush2"
+        newSuperior="CN=Steve Jobs,OU=Dev,DC=apple,DC=com">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_attribute.xml
index 375f00b..e27e2dc 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_attribute.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-					newrdn="CN=Bob Rush2"
-					requestID="456">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+          newrdn="CN=Bob Rush2"
+          requestID="456">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_below_0.xml
index 1d8842f..4b30789 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_with_requestID_below_0.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
-					newrdn="CN=Bob Rush2"
-					requestID="-1">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
+          newrdn="CN=Bob Rush2"
+          requestID="-1">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_dn_attribute.xml
index b6e2478..2b354ce 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest newrdn="CN=Bob Rush2">
-	</modDNRequest>
+  <modDNRequest newrdn="CN=Bob Rush2">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_newrdn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_newrdn_attribute.xml
index 9a29ea0d..ae3d460 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_newrdn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNRequest/request_without_newrdn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</modDNRequest>
+  <modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+  </modDNRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control.xml
index c9391ba..665bcb4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control_empty_value.xml
index 40ce7b2..c128976 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_empty_referral.xml
index 0ba86c3..75a62ec 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral.xml
index 5e9d858..cbc4e9f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral_and_error_message.xml
index 0258d00..997fc2b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_controls.xml
index 8e59f69..3eac32a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_referrals.xml
index 38d6f2d..1fed908 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_3_controls_without_value.xml
index 0e82c26..a57e554 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_empty_error_message.xml
index 79e7744..faa5e4e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_error_message.xml
index af034b4..792b73f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_matchedDN_attribute.xml
index b4a990f..54ed32d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_attribute.xml
index 59323b2..8893157 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>	
+  <modDNResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_below_0.xml
index 401567e..fe1dfc9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>	
+  <modDNResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code.xml
index 8893734..38553e3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code_not_integer.xml
index ef0696d..3091eea 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_descr.xml
index 160b2aa..6320e80 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</modDNResponse>
+  <modDNResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_matchedDN_attribute.xml
index 00162eb..7f10f8b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</modDNResponse>
+  <modDNResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_without_result_code.xml
index 093c198..30362a8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modDNResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modDNResponse requestID="10">
-	</modDNResponse>
+  <modDNResponse requestID="10">
+  </modDNResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control.xml
index 091b6f8..bccc360 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control.xml
@@ -19,8 +19,8 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</modifyRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_base64_value.xml
index 5a2ad8b..a84eb41 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_base64_value.xml
@@ -21,8 +21,8 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-	</modifyRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_empty_value.xml
index 0670c18..5056e38 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_control_empty_value.xml
@@ -19,8 +19,8 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-	</modifyRequest>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification.xml
index f0dc30e..b9d53e4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_base64_value.xml
index 3074980..d64c9a6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_base64_value.xml
@@ -20,9 +20,9 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value xsi:type="xsd:base64Binary">Y249RW1tYW51ZWwgTMOpY2hhcm55LCBvdT1wZW9wbGUsIGRjPWV4YW1wbGUsIGRjPWNvbQ==</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value xsi:type="xsd:base64Binary">Y249RW1tYW51ZWwgTMOpY2hhcm55LCBvdT1wZW9wbGUsIGRjPWV4YW1wbGUsIGRjPWNvbQ==</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_increment.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_increment.xml
index d3045a1..be8b9ad 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_increment.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_1_modification_increment.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="uidNumber" operation="increment">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="uidNumber" operation="increment">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_controls.xml
index 362d6cf..59a4047 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_controls.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_modifications.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_modifications.xml
index bd74c09..006ef06 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_modifications.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_2_modifications.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-		<modification name="sn" operation="replace">
-			<value>CN=Steve Jobs, DC=apple, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+    <modification name="sn" operation="replace">
+      <value>CN=Steve Jobs, DC=apple, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_3_controls_without_value.xml
index 6a8e2a2..973449d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_3_controls_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_2_values.xml
index 66d29bb..fa50d47 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_2_values.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-			<value>CN=Steve Jobs, DC=apple, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+      <value>CN=Steve Jobs, DC=apple, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_empty_value.xml
index 1281bcf..4dd5639 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_with_empty_value.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value></value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value></value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_without_value.xml
index 256926f..8b82d75 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_modification_without_value.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_needed_requestID.xml
index 5b75734..335ca62 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_needed_requestID.xml
@@ -19,5 +19,5 @@
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-	</modifyRequest>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_add.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_add.xml
index f0dc30e..b9d53e4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_add.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_add.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_delete.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_delete.xml
index 5a80e64..1aa4d89 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_delete.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_delete.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="delete">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="delete">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_error.xml
index 78f5dba..e1194e3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_error.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="error">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="error">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_replace.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_replace.xml
index c3e54d0..827ca88 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_replace.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_operation_replace.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport" operation="replace">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport" operation="replace">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_attribute.xml
index d7279a3..8f2d22d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="456">
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="456">
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_below_0.xml
index 80a2a1c..6968a71 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_with_requestID_below_0.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_dn_attribute.xml
index 5bab760..bf98639 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_dn_attribute.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest>
-	</modifyRequest>
+  <modifyRequest>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_name_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_name_attribute.xml
index 249eac7..2b65502 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_name_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_name_attribute.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification operation="add">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification operation="add">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_operation_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_operation_attribute.xml
index ed31ecf..1b87f34 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_operation_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyRequest/request_without_operation_attribute.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
-		<modification name="directReport">
-			<value>CN=John Smith, DC=microsoft, DC=com</value>
-		</modification>
-	</modifyRequest>
+  <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+    <modification name="directReport">
+      <value>CN=John Smith, DC=microsoft, DC=com</value>
+    </modification>
+  </modifyRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control.xml
index 041f9c5..77ef6e9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control_empty_value.xml
index 91b6af4..f9792d6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_control_empty_value.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_empty_referral.xml
index 59402b3..3a8e5a5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_empty_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral></referral>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral></referral>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral.xml
index 8b8b90d..f95f9b5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral_and_error_message.xml
index a78df81..da02dd7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_1_referral_and_error_message.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		<referral>ldap://www.apache.org</referral>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    <referral>ldap://www.apache.org</referral>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_controls.xml
index 2af8c0b..f57829b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_controls.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse>
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse>
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_referrals.xml
index 317b738..f69f046 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_2_referrals.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<referral>ldap://www.apache.org</referral>
-    	<referral>ldap://www.apple.com</referral>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <referral>ldap://www.apache.org</referral>
+      <referral>ldap://www.apple.com</referral>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_3_controls_without_value.xml
index 9e8f2ff..96c7a44 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_3_controls_without_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_empty_error_message.xml
index 64cdfc8..2095c66 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_empty_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage></errorMessage>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage></errorMessage>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_error_message.xml
index ef25f0c..8dabee7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_error_message.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-    	<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+      <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_matchedDN_attribute.xml
index 9ccfe50..2d3fa79 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="10" matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_attribute.xml
index 198ff59..89ca9cb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="456">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>	
+  <modifyResponse requestID="456">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_below_0.xml
index 5235931..f422391 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_requestID_below_0.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="-1">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>	
+  <modifyResponse requestID="-1">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>  
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code.xml
index 128a85e..b166aac 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="2" descr="protocolError"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="2" descr="protocolError"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code_not_integer.xml
index 29d7361..cb62e32 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_result_code_not_integer.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="error" descr="protocolError"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="error" descr="protocolError"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_descr.xml
index 298125e..613235b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_descr.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-		<resultCode code="0" descr="succes"/>
-	</modifyResponse>
+  <modifyResponse requestID="10">
+    <resultCode code="0" descr="succes"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_matchedDN_attribute.xml
index 1e2e83d..1afec6f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_with_wrong_matchedDN_attribute.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10" matchedDN="This is a wrong matchedDN">
-		<resultCode code="0" descr="success"/>
-	</modifyResponse>
+  <modifyResponse requestID="10" matchedDN="This is a wrong matchedDN">
+    <resultCode code="0" descr="success"/>
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_without_result_code.xml
index 7022cc9..830117b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/modifyResponse/response_without_result_code.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<modifyResponse requestID="10">
-	</modifyResponse>
+  <modifyResponse requestID="10">
+  </modifyResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_and.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_and.xml
index 0b6ec57..595b591 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_and.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_and.xml
@@ -18,18 +18,18 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<and>
-				<approxMatch name="sn">
-					<value>foobar</value>
-				</approxMatch>
-				<approxMatch name="sn">
-					<value>foobar</value>
-				</approxMatch>
-			</and>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <and>
+        <approxMatch name="sn">
+          <value>foobar</value>
+        </approxMatch>
+        <approxMatch name="sn">
+          <value>foobar</value>
+        </approxMatch>
+      </and>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch.xml
index ba67ae2..69dab11 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>foobar</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>foobar</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_base64_value.xml
index 27f8d3c..2d75a11 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_base64_value.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_2_values.xml
index af117f9..fa281ae 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_2_values.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>foobar</value>
-				<value>foobar</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>foobar</value>
+        <value>foobar</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_empty_value.xml
index 39eede3..842c5dd 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_with_empty_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value></value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value></value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_name.xml
index 1558953..71b2973 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_name.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch>
-				<value>foobar</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch>
+        <value>foobar</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_value.xml
index ae95580..35ca449 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_approxMatch_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch.xml
index 6a54a9e..0b9f878 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch name="sn">
-				<value>foobar</value>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch name="sn">
+        <value>foobar</value>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_base64_value.xml
index 3f53d17..eae4b50 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_base64_value.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch name="sn">
-				<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch name="sn">
+        <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_2_values.xml
index 2551e96..2ccbfbe 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_2_values.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch name="sn">
-				<value>foobar</value>
-				<value>foobar</value>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch name="sn">
+        <value>foobar</value>
+        <value>foobar</value>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_empty_value.xml
index cccb38a..c95db5f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_empty_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch name="sn">
-				<value></value>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch name="sn">
+        <value></value>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_name.xml
index a84cb21..8e64cf2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_name.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch>
-				<value>foobar</value>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+    <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch>
+        <value>foobar</value>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_value.xml
index 897a779..613cad3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_equalityMatch_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<equalityMatch>
-			</equalityMatch>
-		</filter>
-	</searchRequest>
+    <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <equalityMatch>
+      </equalityMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch.xml
index e0e9177..b2022f6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch>
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch>
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_base64_value.xml
index 450f899..2a36cca 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_base64_value.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch>
-				<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch>
+        <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_2_values.xml
index d1ada2f..0047a23 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_2_values.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch>
-				<value>A Value</value>
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch>
+        <value>A Value</value>
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_0.xml
index 9d75011..cf83f5e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_0.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch dnAttributes="0">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch dnAttributes="0">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_1.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_1.xml
index 6a9d979..b994b1f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_1.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_1.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch dnAttributes="1">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch dnAttributes="1">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_error.xml
index b2443ca..692ba6c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_error.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch dnAttributes="error">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch dnAttributes="error">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_false.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_false.xml
index ff9306e..801953f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_false.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_false.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch dnAttributes="false">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch dnAttributes="false">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_true.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_true.xml
index 99cf4b8..c3df454 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_true.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_dnAttributes_true.xml
@@ -19,12 +19,12 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch dnAttributes="true">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch dnAttributes="true">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_empty_value.xml
index 7b05270..063e7f4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_empty_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch name="givenName">
-				<value></value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch name="givenName">
+        <value></value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_matchingRule.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_matchingRule.xml
index e6978fe..754c79c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_matchingRule.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_matchingRule.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch matchingRule="AMatchingRuleName">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch matchingRule="AMatchingRuleName">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_name.xml
index fed9b72..0f23add 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_name.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch name="givenName">
-				<value>A Value</value>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch name="givenName">
+        <value>A Value</value>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_without_value.xml
index dd14829..8a43158 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_extensibleMatch_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<extensibleMatch>
-			</extensibleMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <extensibleMatch>
+      </extensibleMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual.xml
index 313c578..24b2d3d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual name="sn">
-				<value>foobar</value>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual name="sn">
+        <value>foobar</value>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_base64_value.xml
index a75e30b..b8a1698 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_base64_value.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual name="sn">
-				<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual name="sn">
+        <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_2_values.xml
index ed64618..a97e960 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_2_values.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual name="sn">
-				<value>foobar</value>
-				<value>foobar</value>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual name="sn">
+        <value>foobar</value>
+        <value>foobar</value>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_empty_value.xml
index 7c5b0fb..20bbf96 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_empty_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual name="sn">
-				<value></value>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual name="sn">
+        <value></value>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_name.xml
index 4c1d55b..367ccb3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_name.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual>
-				<value>foobar</value>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual>
+        <value>foobar</value>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_value.xml
index 0d2d38f..178beb4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<greaterOrEqual>
-			</greaterOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <greaterOrEqual>
+      </greaterOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual.xml
index a0f1960..b4b4e0e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual name="sn">
-				<value>foobar</value>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual name="sn">
+        <value>foobar</value>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_base64_value.xml
index b50d7c7..34ab832 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_base64_value.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual name="sn">
-				<value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual name="sn">
+        <value xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</value>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_2_values.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_2_values.xml
index b5a24e6..2534d24 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_2_values.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_2_values.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual name="sn">
-				<value>foobar</value>
-				<value>foobar</value>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual name="sn">
+        <value>foobar</value>
+        <value>foobar</value>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_empty_value.xml
index f7f74a1..9424f30 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_empty_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual name="sn">
-				<value></value>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual name="sn">
+        <value></value>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_name.xml
index 480797c..fffc67e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_name.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual>
-				<value>foobar</value>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual>
+        <value>foobar</value>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_value.xml
index b8e8083..007be17 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_lessOrEqual_without_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<lessOrEqual>
-			</lessOrEqual>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <lessOrEqual>
+      </lessOrEqual>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_nested_connector_nodes.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_nested_connector_nodes.xml
index 4246038..1d22d02 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_nested_connector_nodes.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_nested_connector_nodes.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you 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 https://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. -->
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  you 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 https://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. -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-	<searchRequest dn="dc=example,dc=com"
-		scope="baseObject" derefAliases="neverDerefAliases">
-		<filter>
-			<and>
-				<or>
-					<substrings name="sn">
-						<any>foo</any>
-					</substrings>
-					<substrings name="cn">
-						<any>foo</any>
-					</substrings>
-				</or>
-				<or>
-					<substrings name="ou">
-						<any>josopuram</any>
-					</substrings>
-					<substrings name="o">
-						<any>k</any>
-					</substrings>
-				</or>
-			</and>
-		</filter>
-	</searchRequest>
+    <searchRequest dn="dc=example,dc=com"
+    scope="baseObject" derefAliases="neverDerefAliases">
+    <filter>
+      <and>
+        <or>
+          <substrings name="sn">
+            <any>foo</any>
+          </substrings>
+          <substrings name="cn">
+            <any>foo</any>
+          </substrings>
+        </or>
+        <or>
+          <substrings name="ou">
+            <any>josopuram</any>
+          </substrings>
+          <substrings name="o">
+            <any>k</any>
+          </substrings>
+        </or>
+      </and>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not.xml
index 63fbdce..c81cbc5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<not>
-				<approxMatch name="sn">
-					<value>foobar</value>
-				</approxMatch>
-			</not>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <not>
+        <approxMatch name="sn">
+          <value>foobar</value>
+        </approxMatch>
+      </not>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not_with_2_children.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not_with_2_children.xml
index b0a5193..cd9f092 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not_with_2_children.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_not_with_2_children.xml
@@ -18,18 +18,18 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<not>
-				<approxMatch>
-					<value name="sn">foobar</value>
-				</approxMatch>
-				<approxMatch>
-					<value name="sn">foobar</value>
-				</approxMatch>
-			</not>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <not>
+        <approxMatch>
+          <value name="sn">foobar</value>
+        </approxMatch>
+        <approxMatch>
+          <value name="sn">foobar</value>
+        </approxMatch>
+      </not>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_or.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_or.xml
index 19d3715..037e68d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_or.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_or.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<or>
-				<approxMatch name="sn">
-					<value>foobar</value>
-				</approxMatch>
-			</or>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <or>
+        <approxMatch name="sn">
+          <value>foobar</value>
+        </approxMatch>
+      </or>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present.xml
index 3b74310..9a842ee 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<present name="givenName">
-			</present>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <present name="givenName">
+      </present>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present_without_name.xml
index 625b192..f4d68a7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_present_without_name.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<present>
-			</present>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <present>
+      </present>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings.xml
index 2a43dbf..233e355 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any.xml
index 9f7ea6d..1bde89c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<any>kate</any>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <any>kate</any>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any_1_final.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any_1_final.xml
index 3e6a204..d345592 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any_1_final.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_any_1_final.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<any>kate</any>
-				<final>john</final>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <any>kate</any>
+        <final>john</final>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_any.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_any.xml
index eaf9e21..ddb1d39 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_any.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_any.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<any xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</any>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <any xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</any>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_final.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_final.xml
index 737b78c..21d6482 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_final.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_final.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<final xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</final>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <final xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</final>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_initial.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_initial.xml
index eb03f37..6f210ab 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_initial.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_base64_initial.xml
@@ -20,13 +20,13 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<initial xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</initial>
-			</substrings>
-		</filter>
-	</searchRequest>
+    <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <initial xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</initial>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_any.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_any.xml
index 87af4b5..8ba174c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_any.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_any.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<any></any>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <any></any>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_final.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_final.xml
index 0d4be3f..ddf79a6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_final.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_final.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<final></final>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <final></final>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_initial.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_initial.xml
index 06eed8d..0462c5b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_initial.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_initial.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<initial></initial>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <initial></initial>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_final.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_final.xml
index 4fad5c3..a5bb797 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_final.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_final.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<final>john</final>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <final>john</final>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial.xml
index 1af94a0..a7070f6 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<initial>jack</initial>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <initial>jack</initial>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_any.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_any.xml
index 7ed1e60..e8d34ce 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_any.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_any.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<initial>jack</initial>
-				<any>kate</any>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <initial>jack</initial>
+        <any>kate</any>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_final.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_final.xml
index 5562804..21f08af 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_final.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_1_initial_1_final.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<initial>jack</initial>
-				<final>john</final>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <initial>jack</initial>
+        <final>john</final>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_2_any.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_2_any.xml
index 676ad7d..1a21f7e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_2_any.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_2_any.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings name="sn">
-				<any>kate</any>
-				<any>sawyer</any>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings name="sn">
+        <any>kate</any>
+        <any>sawyer</any>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_without_name.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_without_name.xml
index 7015b7e..4eaf721 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_without_name.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/filters/request_with_substrings_without_name.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<substrings>
-			</substrings>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <substrings>
+      </substrings>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control.xml
index 557a585..77048f0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
index 13de88c..33e6346 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
@@ -20,16 +20,16 @@
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue xsi:type="xsd:base64Binary">RFNNTHYyLjAgcm9ja3MhIQ==</controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
index e114c11..ac37c85 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_attributes_elements.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
index e078b16..2bf6f6f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
@@ -19,19 +19,19 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<attributes>
-		</attributes>
-		<attributes>
-		</attributes>
-	</searchRequest>
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <attributes>
+    </attributes>
+    <attributes>
+    </attributes>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_controls.xml
index 53578e8..35d6f28 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_controls.xml
@@ -19,18 +19,18 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-			<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+      <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_filters.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_filters.xml
index 2bc1f1e..c513fbb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_filters.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_2_filters.xml
@@ -19,17 +19,17 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
index ffe9073..5c9864c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
@@ -18,19 +18,19 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-		</control>
-		<control type="1.2.840.113556.1.4.789" criticality="false">
-		</control>
-		<control type="1.2.840.113556.1.4.456" criticality="true">
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+    </control>
+    <control type="1.2.840.113556.1.4.789" criticality="false">
+    </control>
+    <control type="1.2.840.113556.1.4.456" criticality="true">
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
index 7a42153..8521a5d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
@@ -18,19 +18,19 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<attributes>
-			<attribute />
-		</attributes>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <attributes>
+      <attribute />
+    </attributes>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
index 235a1b1..71f5995 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
@@ -18,19 +18,19 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<attributes>
-			<attribute name="sn"/>
-		</attributes>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <attributes>
+      <attribute name="sn"/>
+    </attributes>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
index cbdc9aa..0cb5709 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
@@ -19,19 +19,19 @@
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
 <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<attributes>
-			<attribute name="sn"/>
-			<attribute name="givenName"/>
-		</attributes>
-	</searchRequest>
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <attributes>
+      <attribute name="sn"/>
+      <attribute name="givenName"/>
+    </attributes>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
index 9ba4d56..7ac70d8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
@@ -18,18 +18,18 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-		<attributes>
-		</attributes>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+    <attributes>
+    </attributes>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
index 6bdaa14..2819806 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="derefAlways">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="derefAlways">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
index 42140bc..51aed81 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="derefFindingBaseObj">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="derefFindingBaseObj">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
index b935981..cdffd58 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="derefInSearching">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="derefInSearching">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_error.xml
index 7420d03..ecc9da5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_error.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="error">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="error">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
index 557a585..77048f0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_dn_attribute.xml
index 46b3438..444d1c7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_dn_attribute.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_empty_filter.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_empty_filter.xml
index 565c54e..206f3ba 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_empty_filter.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_empty_filter.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_needed_requestID.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_needed_requestID.xml
index 972ef0a..a2b89fe 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_needed_requestID.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_needed_requestID.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchRequest processing="parallel" responseOrder="unordered" xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_attribute.xml
index d069282..00bd6b1 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_attribute.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest requestID="456"
-				dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest requestID="456"
+        dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_below_0.xml
index 22c2883..80926ef 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_requestID_below_0.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest requestID="-1"
-				dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest requestID="-1"
+        dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_baseObject.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_baseObject.xml
index 557a585..77048f0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_baseObject.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_baseObject.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_error.xml
index 0cbde39..141e8e1 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_error.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="error"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="error"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_singleLevel.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
index bec6b95..5f28a2d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
index df71a16..b7d042f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="wholeSubtree"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="wholeSubtree"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
index 5c7df8d..0253e75 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases"
-				sizeLimit="1000">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases"
+        sizeLimit="1000">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
index 330ccb2..cbefccc 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases"
-				sizeLimit="error">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases"
+        sizeLimit="error">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
index dba4da3..e94e246 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases"
-				timeLimit="60">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases"
+        timeLimit="60">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_error.xml
index 50689c7..f8590f7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_timeLimit_error.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases"
-				timeLimit="error">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases"
+        timeLimit="error">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_0.xml
index bb7a24f..e90265b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_0.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases"
-				typesOnly="0">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases"
+        typesOnly="0">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_1.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_1.xml
index d810206..31c64c8 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_1.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_1.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases"
-				typesOnly="1">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases"
+        typesOnly="1">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_error.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_error.xml
index f00b648..c67bac2 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_error.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_error.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases"
-				typesOnly="error">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases"
+        typesOnly="error">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_false.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_false.xml
index cb10a0d..603ebc4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_false.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_false.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases"
-				typesOnly="false">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases"
+        typesOnly="false">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_true.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_true.xml
index 38bbbc8..243c1d3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_true.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_with_typesOnly_true.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject"
-				derefAliases="neverDerefAliases"
-				typesOnly="true">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject"
+        derefAliases="neverDerefAliases"
+        typesOnly="true">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
index d09ec7f..5d6ab2b 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="baseObject">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="baseObject">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_dn_attribute.xml
index 9b4f6cb..53fbfe5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_dn_attribute.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_filter.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_filter.xml
index d3072eb..79b9529 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_filter.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_filter.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				scope="singleLevel"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        scope="singleLevel"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_scope_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_scope_attribute.xml
index b8a4952..438e997 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_scope_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchRequest/request_without_scope_attribute.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest dn="ou=marketing,dc=microsoft,dc=com"
-				derefAliases="neverDerefAliases">
-		<control type="1.2.840.113556.1.4.643" criticality="true">
-			<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-		</control>
-		<filter>
-			<approxMatch name="sn">
-				<value>toto</value>
-			</approxMatch>
-		</filter>
-	</searchRequest>
+  <searchRequest dn="ou=marketing,dc=microsoft,dc=com"
+        derefAliases="neverDerefAliases">
+    <control type="1.2.840.113556.1.4.643" criticality="true">
+      <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+    </control>
+    <filter>
+      <approxMatch name="sn">
+        <value>toto</value>
+      </approxMatch>
+    </filter>
+  </searchRequest>
 </batchRequest>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_0_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_0_SRD.xml
index f95dc5d..cdc5377 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_0_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_0_SRD.xml
@@ -18,6 +18,6 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-	</searchResponse>
+  <searchResponse>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRD.xml
index ff1626e..3d819fb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRD.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
index 9ad75e1..a8f0f07 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
@@ -18,16 +18,16 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-				<value>extensibleObject</value>
-			</attr>
-      	</searchResultEntry>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+        <value>extensibleObject</value>
+      </attr>
+        </searchResultEntry>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
index 65bf943..74a82ba 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
@@ -18,19 +18,19 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-				<value>extensibleObject</value>
-			</attr>
-      	</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+        <value>extensibleObject</value>
+      </attr>
+        </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml
index 65d51fc..d9b8789 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml
@@ -18,22 +18,22 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-				<value>extensibleObject</value>
-			</attr>
-      	</searchResultEntry>
-		<searchResultReference>
-			<ref>ldap://localhost</ref>
-		</searchResultReference>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+        <value>extensibleObject</value>
+      </attr>
+        </searchResultEntry>
+    <searchResultReference>
+      <ref>ldap://localhost</ref>
+    </searchResultReference>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
index 28482d3..dc60258 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultReference>
-			<ref>ldap://localhost</ref>
-		</searchResultReference>
-	</searchResponse>
+  <searchResponse>
+    <searchResultReference>
+      <ref>ldap://localhost</ref>
+    </searchResultReference>
+  </searchResponse> 
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
index efa2ff9..49bb5cb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultReference>
-			<ref>ldap://localhost</ref>
-		</searchResultReference>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultReference>
+      <ref>ldap://localhost</ref>
+    </searchResultReference>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
index 7360b46..23abcdb 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
@@ -18,31 +18,31 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-				<value>extensibleObject</value>
-			</attr>
-      	</searchResultEntry>
-		<searchResultEntry dn="cn=Bob Rush,dc=Example,dc=COM">
-			<attr name="objectclass">
-				<value>person</value>
-				<value>top</value>
-			</attr>
-			<attr name="sn">
-				<value>snvalue</value>
-			</attr>
-			<attr name="cn">
-				<value>Bob Rush</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+        <value>extensibleObject</value>
+      </attr>
+        </searchResultEntry>
+    <searchResultEntry dn="cn=Bob Rush,dc=Example,dc=COM">
+      <attr name="objectclass">
+        <value>person</value>
+        <value>top</value>
+      </attr>
+      <attr name="sn">
+        <value>snvalue</value>
+      </attr>
+      <attr name="cn">
+        <value>Bob Rush</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml
index 0872e3a..4257d0e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml
@@ -18,37 +18,37 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-				<value>extensibleObject</value>
-			</attr>
-      	</searchResultEntry>
-      	<searchResultEntry dn="cn=Bob Rush,dc=Example,dc=COM">
-			<attr name="objectclass">
-				<value>person</value>
-				<value>top</value>
-			</attr>
-			<attr name="sn">
-				<value>snvalue</value>
-			</attr>
-			<attr name="cn">
-				<value>Bob Rush</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultReference>
-			<ref>ldap://localhost</ref>
-		</searchResultReference>
-		<searchResultReference>
-			<ref>ldap://ldap.apache.org</ref>
-		</searchResultReference>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+        <value>extensibleObject</value>
+      </attr>
+        </searchResultEntry>
+        <searchResultEntry dn="cn=Bob Rush,dc=Example,dc=COM">
+      <attr name="objectclass">
+        <value>person</value>
+        <value>top</value>
+      </attr>
+      <attr name="sn">
+        <value>snvalue</value>
+      </attr>
+      <attr name="cn">
+        <value>Bob Rush</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultReference>
+      <ref>ldap://localhost</ref>
+    </searchResultReference>
+    <searchResultReference>
+      <ref>ldap://ldap.apache.org</ref>
+    </searchResultReference>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
index 1217f11..5949fa3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultReference>
-			<ref>ldap://localhost</ref>
-		</searchResultReference>
-		<searchResultReference>
-			<ref>ldap://ldap.apache.org</ref>
-		</searchResultReference>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultReference>
+      <ref>ldap://localhost</ref>
+    </searchResultReference>
+    <searchResultReference>
+      <ref>ldap://ldap.apache.org</ref>
+    </searchResultReference>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_attribute.xml
index 4552fda..5f5e1f9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_attribute.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse requestID="456">
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse requestID="456">
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_below_0.xml
index 10fc203..3406aaa 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/response_with_requestID_below_0.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse requestID="-1">
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse requestID="-1">
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control.xml
index 7b19bf7..25cfa6e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control_empty_value.xml
index b182df5..bd06b6f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_control_empty_value.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue></controlValue>
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue></controlValue>
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_empty_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_empty_referral.xml
index b5d3057..c675627 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_empty_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_empty_referral.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="2" descr="protocolError"/>
-    		<referral></referral>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <referral></referral>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral.xml
index 5c897a1..25d93ef 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="2" descr="protocolError"/>
-    		<referral>ldap://www.apache.org</referral>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <referral>ldap://www.apache.org</referral>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral_and_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral_and_error_message.xml
index efed228..b50da41 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral_and_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_1_referral_and_error_message.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="2" descr="protocolError"/>
-    		<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-			<referral>ldap://www.apache.org</referral>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+      <referral>ldap://www.apache.org</referral>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_controls.xml
index f987128..c67dc16 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_controls.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-			<control type="1.2.840.113556.1.4.789" criticality="false">
-				<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+      <control type="1.2.840.113556.1.4.789" criticality="false">
+        <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_referrals.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_referrals.xml
index 1207d50..8a65f43 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_referrals.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_2_referrals.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="2" descr="protocolError"/>
-    		<referral>ldap://www.apache.org</referral>
-    		<referral>ldap://www.apple.com</referral>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <referral>ldap://www.apache.org</referral>
+        <referral>ldap://www.apple.com</referral>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_3_controls_without_value.xml
index 822a066..b572f36 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_3_controls_without_value.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-			</control>
-			<control type="1.2.840.113556.1.4.789" criticality="false">
-			</control>
-			<control type="1.2.840.113556.1.4.456" criticality="true">
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+      </control>
+      <control type="1.2.840.113556.1.4.789" criticality="false">
+      </control>
+      <control type="1.2.840.113556.1.4.456" criticality="true">
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_empty_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_empty_error_message.xml
index 3abf823..2e2b9e5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_empty_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_empty_error_message.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>	
-			<resultCode code="2" descr="protocolError"/>
-    		<errorMessage></errorMessage>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <errorMessage></errorMessage>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_error_message.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_error_message.xml
index 4f1af35..a2d31e7 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_error_message.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_error_message.xml
@@ -18,10 +18,10 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>	
-			<resultCode code="2" descr="protocolError"/>
-    		<errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+        <errorMessage>Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2</errorMessage>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_matchedDN_attribute.xml
index 7bf1cb7..995ab16 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_matchedDN_attribute.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone matchedDN="CN=Bob Rush, OU=Dev, DC=Example, DC=COM">
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_attribute.xml
index 43a7f21..f2e4e16 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_attribute.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone requestID="456">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone requestID="456">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml
index 9f02056..5ce66d9 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml
@@ -18,12 +18,12 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone requestID="-1">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone requestID="-1">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code.xml
index 21d2835..09b0247 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>	
-			<resultCode code="2" descr="protocolError"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="2" descr="protocolError"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code_not_integer.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code_not_integer.xml
index 6c5ee7a..d0f069d 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code_not_integer.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_result_code_not_integer.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>	
-			<resultCode code="error" descr="protocolError"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="error" descr="protocolError"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_descr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_descr.xml
index cc0a480..7a3f7d5 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_descr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_descr.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-			<resultCode code="0" descr="succes"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+      <resultCode code="0" descr="succes"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_matchedDN_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_matchedDN_attribute.xml
index 90b0149..8e967d0 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_matchedDN_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_with_wrong_matchedDN_attribute.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone matchedDN="This is a wrong matchedDN">
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone matchedDN="This is a wrong matchedDN">
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_without_result_code.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_without_result_code.xml
index 2106fd7..2aaeb3a 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_without_result_code.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/response_without_result_code.xml
@@ -18,8 +18,8 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultDone>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultDone>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_0_attr.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_0_attr.xml
index fed1ead..04e78da 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_0_attr.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_0_attr.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_0_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_0_value.xml
index ed72102..7b29cfc 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_0_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_0_value.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc" >
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc" >
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_base64_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_base64_value.xml
index ceae9ba..d7d629f 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_base64_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_base64_value.xml
@@ -20,14 +20,14 @@
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<searchResponse>
-		<searchResultEntry dn="uid=elecharny,dc=example,dc=com">
-			<attr name="cn">
-				<value xsi:type="xsd:base64Binary">RW1tYW51ZWwgTMOpY2hhcm55</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="uid=elecharny,dc=example,dc=com">
+      <attr name="cn">
+        <value xsi:type="xsd:base64Binary">RW1tYW51ZWwgTMOpY2hhcm55</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_empty_value.xml
index 1af997b..3717e0e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_empty_value.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value></value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value></value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_value.xml
index ce91935..5ad1820 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_1_value.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_2_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_2_value.xml
index 2270180..5aebd3e 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_2_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_2_value.xml
@@ -18,15 +18,15 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="objectclass">
-	            <value>top</value>
-				<value>domain</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="objectclass">
+              <value>top</value>
+        <value>domain</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_without_name_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_without_name_attribute.xml
index c9d565f..b394ba4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_without_name_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_attr_without_name_attribute.xml
@@ -18,13 +18,13 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control.xml
index 92448b3..8765fa4 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control_empty_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control_empty_value.xml
index 7e34c68..8bb9a75 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control_empty_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_1_control_empty_value.xml
@@ -18,14 +18,14 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue></controlValue>
-			</control>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue></controlValue>
+      </control>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_attr_1_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_attr_1_value.xml
index 11c1caf..89ac0e3 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_attr_1_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_attr_1_value.xml
@@ -18,17 +18,17 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<attr name="dc">
-				<value>example</value>
-			</attr>
-			<attr name="objectclass">
-	            <value>top</value>
-			</attr>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <attr name="dc">
+        <value>example</value>
+      </attr>
+      <attr name="objectclass">
+              <value>top</value>
+      </attr>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_controls.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_controls.xml
index 227aa1d..d65f359 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_controls.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_2_controls.xml
@@ -18,17 +18,17 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-				<controlValue><!-- comment -->Some text<!-- another --></controlValue>
-			</control>
-			<control type="1.2.840.113556.1.4.789" criticality="false">
-				<controlValue><!-- comment -->Some other text<!-- another --></controlValue>
-			</control>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+        <controlValue><!-- comment -->Some text<!-- another --></controlValue>
+      </control>
+      <control type="1.2.840.113556.1.4.789" criticality="false">
+        <controlValue><!-- comment -->Some other text<!-- another --></controlValue>
+      </control>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_3_controls_without_value.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_3_controls_without_value.xml
index 333bdc3..f545235 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_3_controls_without_value.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_3_controls_without_value.xml
@@ -18,17 +18,17 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-			<control type="1.2.840.113556.1.4.643" criticality="true">
-			</control>
-			<control type="1.2.840.113556.1.4.789" criticality="false">
-			</control>
-			<control type="1.2.840.113556.1.4.456" criticality="true">
-			</control>
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>		
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+      <control type="1.2.840.113556.1.4.643" criticality="true">
+      </control>
+      <control type="1.2.840.113556.1.4.789" criticality="false">
+      </control>
+      <control type="1.2.840.113556.1.4.456" criticality="true">
+      </control>
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>    
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_dn_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_dn_attribute.xml
index fed1ead..04e78da 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_dn_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_dn_attribute.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com">
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com">
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_attribute.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_attribute.xml
index 34b35ce..607ac01 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_attribute.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_attribute.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com" requestID="456">
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
+  <searchResponse>
+    <searchResultEntry dn="dc=example,dc=com" requestID="456">
+    </searchResultEntry>
+    <searchResultDone>
+      <resultCode code="0" descr="success"/>
+    </searchResultDone>
+  </searchResponse>
 </batchResponse>
diff --git a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml
index a98084e..8a4e05c 100644
--- a/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml
+++ b/dsml/parser/src/test/resources/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml
@@ -18,11 +18,11 @@
   under the License.
 -->
 <batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
-	<searchResponse>
-		<searchResultEntry dn="dc=example,dc=com" requestID="-1">
-		</searchResultEntry>
-		<searchResultDone>
-			<resultCode code="0" descr="success"/>
-		</searchResultDone>
-	</searchResponse>
... 2157 lines suppressed ...