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 2010/10/30 03:51:55 UTC
svn commit: r1028966 [1/9] - in /directory/shared/branches/shared-config:
all/ dsml-engine/ dsml-parser/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml-parser/src...
Author: elecharny
Date: Sat Oct 30 01:51:50 2010
New Revision: 1028966
URL: http://svn.apache.org/viewvc?rev=1028966&view=rev
Log:
Merged the trunk modifications into the branch
Added:
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/cursor/SearchCursor.java
- copied unchanged from r1028955, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/cursor/SearchCursor.java
directory/shared/branches/shared-config/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
- copied, changed from r1028955, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
Removed:
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IStates.java
Modified:
directory/shared/branches/shared-config/all/ (props changed)
directory/shared/branches/shared-config/dsml-engine/ (props changed)
directory/shared/branches/shared-config/dsml-parser/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java (contents, props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/ (props changed)
directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/ (props changed)
directory/shared/branches/shared-config/i18n/ (props changed)
directory/shared/branches/shared-config/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
directory/shared/branches/shared-config/ldap/ (props changed)
directory/shared/branches/shared-config/ldap-jndi/ (props changed)
directory/shared/branches/shared-config/ldap-schema/ (props changed)
directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/ (props changed)
directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java (props changed)
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Container.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java (props changed)
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java
directory/shared/branches/shared-config/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java
directory/shared/branches/shared-config/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java
directory/shared/branches/shared-config/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java
directory/shared/branches/shared-config/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java
Propchange: directory/shared/branches/shared-config/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -1,3 +1,4 @@
/directory/shared/branches/shared-codec-merge/all:982370-987558
/directory/shared/branches/shared-dnfactory-experiment/all:980352-980933
/directory/shared/branches-dnfactory-experiment/all:980350-980351
+/directory/shared/trunk/all:1023442-1028955
Propchange: directory/shared/branches/shared-config/dsml-engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -0,0 +1,6 @@
+/directory/shared/branches/shared-codec-merge/dsml-engine:982370-987558
+/directory/shared/branches/shared-replication/dsml-engine:749791-764113
+/directory/shared/branches/shared-schema/dsml-engine:806622-896441
+/directory/shared/branches/shared-subtree/dsml-engine:965208-965686
+/directory/shared/branches/xdbm-refactoring/dsml-engine:945830-946347
+/directory/shared/trunk/dsml-engine:1023442-1028955
Propchange: directory/shared/branches/shared-config/dsml-parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -1,3 +1,4 @@
/directory/shared/branches/shared-codec-merge/dsml-parser:982370-987558
/directory/shared/branches/shared-dnfactory-experiment/dsml-parser:980352-980933
/directory/shared/branches-dnfactory-experiment/dsml-parser:980350-980351
+/directory/shared/trunk/dsml-parser:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java Sat Oct 30 01:51:50 2010
@@ -49,7 +49,7 @@ public abstract class AbstractGrammar im
protected String name;
/** The grammar's states */
- protected IStates statesEnum;
+ protected Enum<Dsmlv2StatesEnum>[] statesEnum;
/**
@@ -84,9 +84,9 @@ public abstract class AbstractGrammar im
* The current tag
* @return A valid transition if any, or null.
*/
- public GrammarTransition getTransition( int state, Tag tag )
+ public GrammarTransition getTransition( Enum<Dsmlv2StatesEnum> state, Tag tag )
{
- return transitions[state].get( tag );
+ return transitions[state.ordinal()].get( tag );
}
@@ -96,9 +96,9 @@ public abstract class AbstractGrammar im
* @return
* Returns the statesEnum.
*/
- public IStates getStatesEnum()
+ public Enum<Dsmlv2StatesEnum>[] getStatesEnum()
{
- return statesEnum;
+ return Dsmlv2StatesEnum.values();
}
@@ -108,7 +108,7 @@ public abstract class AbstractGrammar im
* @param statesEnum
* The statesEnum to set.
*/
- public void setStatesEnum( IStates statesEnum )
+ public void setStatesEnum( Enum<Dsmlv2StatesEnum>[] statesEnum )
{
this.statesEnum = statesEnum;
}
@@ -131,7 +131,7 @@ public abstract class AbstractGrammar im
}
else if ( eventType == XmlPullParser.END_DOCUMENT )
{
- container.setState( Dsmlv2StatesEnum.END_STATE );
+ container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
}
else if ( eventType == XmlPullParser.START_TAG )
{
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java Sat Oct 30 01:51:50 2010
@@ -33,7 +33,7 @@ public interface Container
*
* @return Returns the current grammar state
*/
- int getState();
+ Enum<Dsmlv2StatesEnum> getState();
/**
@@ -42,7 +42,7 @@ public interface Container
* @param state
* The new state
*/
- void setState( int state );
+ void setState( Enum<Dsmlv2StatesEnum> state );
/**
@@ -50,7 +50,7 @@ public interface Container
*
* @return Returns the transition from the previous state to the new state
*/
- int getTransition();
+ Enum<Dsmlv2StatesEnum> getTransition();
/**
@@ -59,12 +59,12 @@ public interface Container
* @param transition
* The transition to set
*/
- void setTransition( int transition );
+ void setTransition( Enum<Dsmlv2StatesEnum> transition );
/**
* @return Returns the states.
*/
- IStates getStates();
+ Enum<Dsmlv2StatesEnum>[] getStates();
}
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:1023442-1028955
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java Sat Oct 30 01:51:50 2010
@@ -35,13 +35,13 @@ import org.xmlpull.v1.XmlPullParser;
public class Dsmlv2Container implements Container
{
/** The current state of the decoding */
- private int state;
+ private Enum<Dsmlv2StatesEnum> state;
/** The current transition */
- private int transition;
+ private Enum<Dsmlv2StatesEnum> transition;
/** Store the different states for debug purpose */
- private IStates states;
+ private Enum<Dsmlv2StatesEnum>[] states;
/** The pool parser */
private XmlPullParser parser;
@@ -134,7 +134,7 @@ public class Dsmlv2Container implements
* @return
* the current grammar state
*/
- public int getState()
+ public Enum<Dsmlv2StatesEnum> getState()
{
return state;
}
@@ -146,7 +146,7 @@ public class Dsmlv2Container implements
* @param state
* the new state
*/
- public void setState( int state )
+ public void setState( Enum<Dsmlv2StatesEnum> state )
{
this.state = state;
}
@@ -158,7 +158,7 @@ public class Dsmlv2Container implements
* @return
* the transition from the previous state to the new state
*/
- public int getTransition()
+ public Enum<Dsmlv2StatesEnum> getTransition()
{
return transition;
}
@@ -170,7 +170,7 @@ public class Dsmlv2Container implements
* @param transition
* the transition to set
*/
- public void setTransition( int transition )
+ public void setTransition( Enum<Dsmlv2StatesEnum> transition )
{
this.transition = transition;
}
@@ -184,7 +184,7 @@ public class Dsmlv2Container implements
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UWF_UNWRITTEN_FIELD",
justification="it exists a setter for 'states'")
- public IStates getStates()
+ public Enum<Dsmlv2StatesEnum>[] getStates()
{
return states;
}
@@ -224,7 +224,7 @@ public class Dsmlv2Container implements
* @return
* a valid transition if any, or null.
*/
- public GrammarTransition getTransition( int currentState, Tag currentTag )
+ public GrammarTransition getTransition( Enum<Dsmlv2StatesEnum> currentState, Tag currentTag )
{
return grammar.getTransition( currentState, currentTag );
}
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java Sat Oct 30 01:51:50 2010
@@ -151,7 +151,7 @@ public class Dsmlv2Parser
}
else if ( eventType == XmlPullParser.END_DOCUMENT )
{
- container.setState( Dsmlv2StatesEnum.END_STATE );
+ container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
}
else if ( eventType == XmlPullParser.START_TAG )
{
@@ -258,7 +258,7 @@ public class Dsmlv2Parser
}
else if ( eventType == XmlPullParser.END_DOCUMENT )
{
- container.setState( Dsmlv2StatesEnum.END_STATE );
+ container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
return null;
}
else if ( eventType == XmlPullParser.START_TAG )
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java Sat Oct 30 01:51:50 2010
@@ -151,7 +151,7 @@ public class Dsmlv2ResponseParser
}
else if ( eventType == XmlPullParser.END_DOCUMENT )
{
- container.setState( Dsmlv2StatesEnum.END_STATE );
+ container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
}
else if ( eventType == XmlPullParser.START_TAG )
{
@@ -258,7 +258,7 @@ public class Dsmlv2ResponseParser
}
else if ( eventType == XmlPullParser.END_DOCUMENT )
{
- container.setState( Dsmlv2StatesEnum.END_STATE );
+ container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
return null;
}
else if ( eventType == XmlPullParser.START_TAG )
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:1023442-1028955
Modified: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java?rev=1028966&r1=1028965&r2=1028966&view=diff
==============================================================================
--- directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java (original)
+++ directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java Sat Oct 30 01:51:50 2010
@@ -24,790 +24,473 @@ package org.apache.directory.shared.dsml
/**
* This class store the Dsml grammar's constants. It is also used for debugging
* purpose.
- *
- * TODO: Should this class be an enum?
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class Dsmlv2StatesEnum implements IStates
+public enum Dsmlv2StatesEnum
{
+ /** The initial state of every grammar */
+ INIT_GRAMMAR_STATE,
+
+ /** The ending state for every grammars */
+ GRAMMAR_END,
+
//====================================================
// <batchRequest> ... </batchRequest>
//====================================================
/** The <batchRequest> tag */
- public static final int BATCHREQUEST_START_TAG = 104;
+ BATCHREQUEST_START_TAG,
- public static final int BATCHREQUEST_LOOP = 105;
+ BATCHREQUEST_LOOP,
/** The </batchRequest> tag */
- public static final int BATCHREQUEST_END_TAG = 1;
+ BATCHREQUEST_END_TAG,
//====================================================
// <abandonRequest> ... </abandonRequest>
//====================================================
/** The <abandonRequest> tag */
- public static final int ABANDON_REQUEST_START_TAG = 2;
+ ABANDON_REQUEST_START_TAG,
/** The <control> tag */
- public static final int ABANDON_REQUEST_CONTROL_START_TAG = 4;
+ ABANDON_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int ABANDON_REQUEST_CONTROL_END_TAG = 5;
+ ABANDON_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int ABANDON_REQUEST_CONTROLVALUE_START_TAG = 6;
+ ABANDON_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int ABANDON_REQUEST_CONTROLVALUE_END_TAG = 7;
+ ABANDON_REQUEST_CONTROLVALUE_END_TAG,
//====================================================
// <addRequest> ... </addRequest>
//====================================================
/** The <addRequest> tag */
- public static final int ADD_REQUEST_START_TAG = 8;
+ ADD_REQUEST_START_TAG,
/** The <control> tag */
- public static final int ADD_REQUEST_CONTROL_START_TAG = 10;
+ ADD_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int ADD_REQUEST_CONTROL_END_TAG = 11;
+ ADD_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int ADD_REQUEST_CONTROLVALUE_START_TAG = 12;
+ ADD_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int ADD_REQUEST_CONTROLVALUE_END_TAG = 13;
+ ADD_REQUEST_CONTROLVALUE_END_TAG,
/** The <attr> tag */
- public static final int ADD_REQUEST_ATTR_START_TAG = 14;
+ ADD_REQUEST_ATTR_START_TAG,
/** The </attr> tag */
- public static final int ADD_REQUEST_ATTR_END_TAG = 15;
+ ADD_REQUEST_ATTR_END_TAG,
/** The <value> tag */
- public static final int ADD_REQUEST_VALUE_START_TAG = 16;
+ ADD_REQUEST_VALUE_START_TAG,
/** The </value> tag */
- public static final int ADD_REQUEST_VALUE_END_TAG = 17;
+ ADD_REQUEST_VALUE_END_TAG,
//====================================================
// <authRequest> ... </authRequest>
//====================================================
/** The <authRequest> tag */
- public static final int AUTH_REQUEST_START_TAG = 18;
+ AUTH_REQUEST_START_TAG,
/** The <control> tag */
- public static final int AUTH_REQUEST_CONTROL_START_TAG = 20;
+ AUTH_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int AUTH_REQUEST_CONTROL_END_TAG = 21;
+ AUTH_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int AUTH_REQUEST_CONTROLVALUE_START_TAG = 22;
+ AUTH_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int AUTH_REQUEST_CONTROLVALUE_END_TAG = 23;
+ AUTH_REQUEST_CONTROLVALUE_END_TAG,
//====================================================
// <compareRequest> ... </compareRequest>
//====================================================
/** The <compareRequest> tag */
- public static final int COMPARE_REQUEST_START_TAG = 24;
+ COMPARE_REQUEST_START_TAG,
/** The <control> tag */
- public static final int COMPARE_REQUEST_CONTROL_START_TAG = 26;
+ COMPARE_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int COMPARE_REQUEST_CONTROL_END_TAG = 27;
+ COMPARE_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int COMPARE_REQUEST_CONTROLVALUE_START_TAG = 28;
+ COMPARE_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int COMPARE_REQUEST_CONTROLVALUE_END_TAG = 29;
+ COMPARE_REQUEST_CONTROLVALUE_END_TAG,
/** The <assertion> tag */
- public static final int COMPARE_REQUEST_ASSERTION_START_TAG = 30;
+ COMPARE_REQUEST_ASSERTION_START_TAG,
/** The </assertion> tag */
- public static final int COMPARE_REQUEST_ASSERTION_END_TAG = 31;
+ COMPARE_REQUEST_ASSERTION_END_TAG,
/** The <value> tag */
- public static final int COMPARE_REQUEST_VALUE_START_TAG = 32;
+ COMPARE_REQUEST_VALUE_START_TAG,
/** The </value> tag */
- public static final int COMPARE_REQUEST_VALUE_END_TAG = 33;
+ COMPARE_REQUEST_VALUE_END_TAG,
//====================================================
// <delRequest> ... </delRequest>
//====================================================
/** The <delRequest> tag */
- public static final int DEL_REQUEST_START_TAG = 34;
+ DEL_REQUEST_START_TAG,
/** The <control> tag */
- public static final int DEL_REQUEST_CONTROL_START_TAG = 36;
+ DEL_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int DEL_REQUEST_CONTROL_END_TAG = 37;
+ DEL_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int DEL_REQUEST_CONTROLVALUE_START_TAG = 38;
+ DEL_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int DEL_REQUEST_CONTROLVALUE_END_TAG = 39;
+ DEL_REQUEST_CONTROLVALUE_END_TAG,
//====================================================
// <extendedRequest> ... </extendedRequest>
//====================================================
/** The <extendedRequest> tag */
- public static final int EXTENDED_REQUEST_START_TAG = 40;
+ EXTENDED_REQUEST_START_TAG,
/** The <control> tag */
- public static final int EXTENDED_REQUEST_CONTROL_START_TAG = 42;
+ EXTENDED_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int EXTENDED_REQUEST_CONTROL_END_TAG = 43;
+ EXTENDED_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int EXTENDED_REQUEST_CONTROLVALUE_START_TAG = 44;
+ EXTENDED_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int EXTENDED_REQUEST_CONTROLVALUE_END_TAG = 45;
+ EXTENDED_REQUEST_CONTROLVALUE_END_TAG,
/** The <requestName> tag */
- public static final int EXTENDED_REQUEST_REQUESTNAME_START_TAG = 46;
+ EXTENDED_REQUEST_REQUESTNAME_START_TAG,
/** The </requestName> tag */
- public static final int EXTENDED_REQUEST_REQUESTNAME_END_TAG = 47;
+ EXTENDED_REQUEST_REQUESTNAME_END_TAG,
/** The <requestValue> tag */
- public static final int EXTENDED_REQUEST_REQUESTVALUE_START_TAG = 48;
+ EXTENDED_REQUEST_REQUESTVALUE_START_TAG,
/** The </requestValue> tag */
- public static final int EXTENDED_REQUEST_REQUESTVALUE_END_TAG = 49;
+ EXTENDED_REQUEST_REQUESTVALUE_END_TAG,
//====================================================
// <modDNRequest> ... </modDNRequest>
//====================================================
/** The <modDNRequest> tag */
- public static final int MODIFY_DN_REQUEST_START_TAG = 50;
+ MODIFY_DN_REQUEST_START_TAG,
/** The <control> tag */
- public static final int MODIFY_DN_REQUEST_CONTROL_START_TAG = 52;
+ MODIFY_DN_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int MODIFY_DN_REQUEST_CONTROL_END_TAG = 53;
+ MODIFY_DN_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int MODIFY_DN_REQUEST_CONTROLVALUE_START_TAG = 54;
+ MODIFY_DN_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG = 55;
+ MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG,
//====================================================
// <modifyRequest> ... </modifyRequest>
//====================================================
/** The <modifyRequest> tag */
- public static final int MODIFY_REQUEST_START_TAG = 56;
+ MODIFY_REQUEST_START_TAG,
/** The <control> tag */
- public static final int MODIFY_REQUEST_CONTROL_START_TAG = 58;
+ MODIFY_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int MODIFY_REQUEST_CONTROL_END_TAG = 59;
+ MODIFY_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int MODIFY_REQUEST_CONTROLVALUE_START_TAG = 60;
+ MODIFY_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int MODIFY_REQUEST_CONTROLVALUE_END_TAG = 61;
+ MODIFY_REQUEST_CONTROLVALUE_END_TAG,
/** The <modification> tag */
- public static final int MODIFY_REQUEST_MODIFICATION_START_TAG = 62;
+ MODIFY_REQUEST_MODIFICATION_START_TAG,
/** The </modification> tag */
- public static final int MODIFY_REQUEST_MODIFICATION_END_TAG = 63;
+ MODIFY_REQUEST_MODIFICATION_END_TAG,
/** The <value> tag */
- public static final int MODIFY_REQUEST_VALUE_START_TAG = 64;
+ MODIFY_REQUEST_VALUE_START_TAG,
/** The </value> tag */
- public static final int MODIFY_REQUEST_VALUE_END_TAG = 65;
+ MODIFY_REQUEST_VALUE_END_TAG,
//====================================================
// <searchRequest> ... </searchRequest>
//====================================================
/** The <searchRequest> tag */
- public static final int SEARCH_REQUEST_START_TAG = 66;
+ SEARCH_REQUEST_START_TAG,
/** The <control> tag */
- public static final int SEARCH_REQUEST_CONTROL_START_TAG = 68;
+ SEARCH_REQUEST_CONTROL_START_TAG,
/** The </control> tag */
- public static final int SEARCH_REQUEST_CONTROL_END_TAG = 69;
+ SEARCH_REQUEST_CONTROL_END_TAG,
/** The <controlValue> tag */
- public static final int SEARCH_REQUEST_CONTROLVALUE_START_TAG = 70;
+ SEARCH_REQUEST_CONTROLVALUE_START_TAG,
/** The </controlValue> tag */
- public static final int SEARCH_REQUEST_CONTROLVALUE_END_TAG = 71;
+ SEARCH_REQUEST_CONTROLVALUE_END_TAG,
/** The <filter> tag */
- public static final int SEARCH_REQUEST_FILTER_START_TAG = 72;
+ SEARCH_REQUEST_FILTER_START_TAG,
/** The </filter> tag */
- public static final int SEARCH_REQUEST_FILTER_END_TAG = 73;
+ SEARCH_REQUEST_FILTER_END_TAG,
/** The <attributes> tag */
- public static final int SEARCH_REQUEST_ATTRIBUTES_START_TAG = 74;
+ SEARCH_REQUEST_ATTRIBUTES_START_TAG,
/** The </attributes> tag */
- public static final int SEARCH_REQUEST_ATTRIBUTES_END_TAG = 75;
+ SEARCH_REQUEST_ATTRIBUTES_END_TAG,
/** The <attribute> tag */
- public static final int SEARCH_REQUEST_ATTRIBUTE_START_TAG = 76;
+ SEARCH_REQUEST_ATTRIBUTE_START_TAG,
/** The </attribute> tag */
- public static final int SEARCH_REQUEST_ATTRIBUTE_END_TAG = 77;
+ SEARCH_REQUEST_ATTRIBUTE_END_TAG,
/** The <equalityMatch> tag */
- public static final int SEARCH_REQUEST_EQUALITYMATCH_START_TAG = 84;
+ SEARCH_REQUEST_EQUALITYMATCH_START_TAG,
/** The <subStrings> tag */
- public static final int SEARCH_REQUEST_SUBSTRINGS_START_TAG = 86;
+ SEARCH_REQUEST_SUBSTRINGS_START_TAG,
/** The </subStrings> tag */
- public static final int SEARCH_REQUEST_SUBSTRINGS_END_TAG = 87;
+ SEARCH_REQUEST_SUBSTRINGS_END_TAG,
/** The <greaterOrEqual> tag */
- public static final int SEARCH_REQUEST_GREATEROREQUAL_START_TAG = 88;
+ SEARCH_REQUEST_GREATEROREQUAL_START_TAG,
/** The <lessOrEqual> tag */
- public static final int SEARCH_REQUEST_LESSOREQUAL_START_TAG = 90;
+ SEARCH_REQUEST_LESSOREQUAL_START_TAG,
/** The <present> tag */
- public static final int SEARCH_REQUEST_PRESENT_START_TAG = 92;
+ SEARCH_REQUEST_PRESENT_START_TAG,
/** The <approxMatch> tag */
- public static final int SEARCH_REQUEST_APPROXMATCH_START_TAG = 94;
+ SEARCH_REQUEST_APPROXMATCH_START_TAG,
/** The <extensibleMatch> tag */
- public static final int SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG = 96;
+ SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG,
/** The <value> tag */
- public static final int SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_START_TAG = 109;
+ SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_START_TAG,
/** The </value> tag */
- public static final int SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_END_TAG = 110;
+ SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_END_TAG,
/** The <initial> tag */
- public static final int SEARCH_REQUEST_INITIAL_START_TAG = 98;
+ SEARCH_REQUEST_INITIAL_START_TAG,
/** The </initial> tag */
- public static final int SEARCH_REQUEST_INITIAL_END_TAG = 99;
+ SEARCH_REQUEST_INITIAL_END_TAG,
/** The <any> tag */
- public static final int SEARCH_REQUEST_ANY_START_TAG = 100;
+ SEARCH_REQUEST_ANY_START_TAG,
/** The </any> tag */
- public static final int SEARCH_REQUEST_ANY_END_TAG = 101;
+ SEARCH_REQUEST_ANY_END_TAG,
/** The <final> tag */
- public static final int SEARCH_REQUEST_FINAL_START_TAG = 102;
+ SEARCH_REQUEST_FINAL_START_TAG,
/** The </final> tag */
- public static final int SEARCH_REQUEST_FINAL_END_TAG = 103;
+ SEARCH_REQUEST_FINAL_END_TAG,
/** The <value> tag */
- public static final int SEARCH_REQUEST_VALUE_START_TAG = 107;
+ SEARCH_REQUEST_VALUE_START_TAG,
/** The </value> tag */
- public static final int SEARCH_REQUEST_VALUE_END_TAG = 108;
+ SEARCH_REQUEST_VALUE_END_TAG,
/** The Filter Loop state */
- public static final int SEARCH_REQUEST_FILTER_LOOP = 106;
+ SEARCH_REQUEST_FILTER_LOOP,
//****************
// DSML Response
//****************
/** The Batch Response Loop state */
- public static final int BATCH_RESPONSE_LOOP = 200;
+ BATCH_RESPONSE_LOOP,
/** The Error Response Loop state */
- public static final int ERROR_RESPONSE = 201;
+ ERROR_RESPONSE,
/** The Message Start state */
- public static final int MESSAGE_START = 202;
+ MESSAGE_START,
/** The Message End state */
- public static final int MESSAGE_END = 203;
+ MESSAGE_END,
/** The Detail Start state */
- public static final int DETAIL_START = 204;
+ DETAIL_START,
/** The Detail End state */
- public static final int DETAIL_END = 205;
+ DETAIL_END,
/** The Extended Response state */
- public static final int EXTENDED_RESPONSE = 206;
+ EXTENDED_RESPONSE,
/** The Extended Response Control Start state */
- public static final int EXTENDED_RESPONSE_CONTROL_START = 207;
+ EXTENDED_RESPONSE_CONTROL_START,
/** The Extended Response Control End state */
- public static final int EXTENDED_RESPONSE_CONTROL_END = 208;
+ EXTENDED_RESPONSE_CONTROL_END,
/** The Extended Response Control Value Start state */
- public static final int EXTENDED_RESPONSE_CONTROL_VALUE_START = 245;
+ EXTENDED_RESPONSE_CONTROL_VALUE_START,
/** The Extended Response Control Value End state */
- public static final int EXTENDED_RESPONSE_CONTROL_VALUE_END = 246;
+ EXTENDED_RESPONSE_CONTROL_VALUE_END,
/** The Extended Response Result Code Start state */
- public static final int EXTENDED_RESPONSE_RESULT_CODE_START = 209;
+ EXTENDED_RESPONSE_RESULT_CODE_START,
/** The Extended Response Result Code End state */
- public static final int EXTENDED_RESPONSE_RESULT_CODE_END = 210;
+ EXTENDED_RESPONSE_RESULT_CODE_END,
/** The Extended Response Error Message Start state */
- public static final int EXTENDED_RESPONSE_ERROR_MESSAGE_START = 211;
+ EXTENDED_RESPONSE_ERROR_MESSAGE_START,
/** The Extended Response Error Message End state */
- public static final int EXTENDED_RESPONSE_ERROR_MESSAGE_END = 212;
+ EXTENDED_RESPONSE_ERROR_MESSAGE_END,
/** The Extended Response Referral Start state */
- public static final int EXTENDED_RESPONSE_REFERRAL_START = 213;
+ EXTENDED_RESPONSE_REFERRAL_START,
/** The Extended Response Referral End state */
- public static final int EXTENDED_RESPONSE_REFERRAL_END = 214;
+ EXTENDED_RESPONSE_REFERRAL_END,
/** The Response Name Start state */
- public static final int RESPONSE_NAME_START = 215;
+ RESPONSE_NAME_START,
/** The Response Name End state */
- public static final int RESPONSE_NAME_END = 216;
+ RESPONSE_NAME_END,
/** The Response Start state */
- public static final int RESPONSE_START = 217;
+ RESPONSE_START,
/** The Response End state */
- public static final int RESPONSE_END = 218;
+ RESPONSE_END,
/** The LDAP Result state */
- public static final int LDAP_RESULT = 219;
+ LDAP_RESULT,
/** The LDAP Result Control Start state */
- public static final int LDAP_RESULT_CONTROL_START = 220;
+ LDAP_RESULT_CONTROL_START,
/** The LDAP Result Control End state */
- public static final int LDAP_RESULT_CONTROL_END = 221;
+ LDAP_RESULT_CONTROL_END,
/** The LDAP Result Control Value Start state */
- public static final int LDAP_RESULT_CONTROL_VALUE_START = 247;
+ LDAP_RESULT_CONTROL_VALUE_START,
/** The LDAP Result Control Value End state */
- public static final int LDAP_RESULT_CONTROL_VALUE_END = 248;
+ LDAP_RESULT_CONTROL_VALUE_END,
/** The LDAP Result Result Code Start state */
- public static final int LDAP_RESULT_RESULT_CODE_START = 222;
+ LDAP_RESULT_RESULT_CODE_START,
/** The LDAP Result Result Code End state */
- public static final int LDAP_RESULT_RESULT_CODE_END = 223;
+ LDAP_RESULT_RESULT_CODE_END,
/** The LDAP Result Error Message Start state */
- public static final int LDAP_RESULT_ERROR_MESSAGE_START = 224;
+ LDAP_RESULT_ERROR_MESSAGE_START,
/** The LDAP Result Error Message End state */
- public static final int LDAP_RESULT_ERROR_MESSAGE_END = 225;
+ LDAP_RESULT_ERROR_MESSAGE_END,
/** The LDAP Result Referral Start state */
- public static final int LDAP_RESULT_REFERRAL_START = 226;
+ LDAP_RESULT_REFERRAL_START,
/** The LDAP Result Referral End state */
- public static final int LDAP_RESULT_REFERRAL_END = 227;
+ LDAP_RESULT_REFERRAL_END,
/** The LDAP Result End state */
- public static final int LDAP_RESULT_END = 228;
+ LDAP_RESULT_END,
/** The Search Response state */
- public static final int SEARCH_RESPONSE = 229;
+ SEARCH_RESPONSE,
/** The Search Result Entry state */
- public static final int SEARCH_RESULT_ENTRY = 230;
+ SEARCH_RESULT_ENTRY,
/** The Search Result Entry Control Start state */
- public static final int SEARCH_RESULT_ENTRY_CONTROL_START = 231;
+ SEARCH_RESULT_ENTRY_CONTROL_START,
/** The Search Result Entry Control End state */
- public static final int SEARCH_RESULT_ENTRY_CONTROL_END = 232;
+ SEARCH_RESULT_ENTRY_CONTROL_END,
/** The Search Result Entry Control Value Start state */
- public static final int SEARCH_RESULT_ENTRY_CONTROL_VALUE_START = 249;
+ SEARCH_RESULT_ENTRY_CONTROL_VALUE_START,
/** The Search Result Entry Control Value End state */
- public static final int SEARCH_RESULT_ENTRY_CONTROL_VALUE_END = 250;
+ SEARCH_RESULT_ENTRY_CONTROL_VALUE_END,
/** The Search Result Entry Attr Start state */
- public static final int SEARCH_RESULT_ENTRY_ATTR_START = 233;
+ SEARCH_RESULT_ENTRY_ATTR_START,
/** The Search Result Entry Attr End state */
- public static final int SEARCH_RESULT_ENTRY_ATTR_END = 234;
+ SEARCH_RESULT_ENTRY_ATTR_END,
/** The Search Result Entry Value Start state */
- public static final int SEARCH_RESULT_ENTRY_VALUE_START = 235;
+ SEARCH_RESULT_ENTRY_VALUE_START,
/** The Search Result Entry Value End state */
- public static final int SEARCH_RESULT_ENTRY_VALUE_END = 236;
+ SEARCH_RESULT_ENTRY_VALUE_END,
/** The Search Result Entry Loop state */
- public static final int SEARCH_RESULT_ENTRY_LOOP = 237;
+ SEARCH_RESULT_ENTRY_LOOP,
/** The Search Result Reference state */
- public static final int SEARCH_RESULT_REFERENCE = 238;
+ SEARCH_RESULT_REFERENCE,
/** The Search Result Reference Control Start state */
- public static final int SEARCH_RESULT_REFERENCE_CONTROL_START = 239;
+ SEARCH_RESULT_REFERENCE_CONTROL_START,
/** The Search Result Reference Control End state */
- public static final int SEARCH_RESULT_REFERENCE_CONTROL_END = 240;
+ SEARCH_RESULT_REFERENCE_CONTROL_END,
/** The Search Result Reference Control Value Start state */
- public static final int SEARCH_RESULT_REFERENCE_CONTROL_VALUE_START = 251;
+ SEARCH_RESULT_REFERENCE_CONTROL_VALUE_START,
/** The Search Result Reference Control Value End state */
- public static final int SEARCH_RESULT_REFERENCE_CONTROL_VALUE_END = 252;
+ SEARCH_RESULT_REFERENCE_CONTROL_VALUE_END,
/** The Search Result Reference Ref Start state */
- public static final int SEARCH_RESULT_REFERENCE_REF_START = 241;
+ SEARCH_RESULT_REFERENCE_REF_START,
/** The Search Result Reference Ref End state */
- public static final int SEARCH_RESULT_REFERENCE_REF_END = 242;
+ SEARCH_RESULT_REFERENCE_REF_END,
/** The Search Result Reference Loop state */
- public static final int SEARCH_RESULT_REFERENCE_LOOP = 243;
+ SEARCH_RESULT_REFERENCE_LOOP,
/** The Search Result Done End state */
- public static final int SEARCH_RESULT_DONE_END = 244;
-
- /** The instance */
- private static Dsmlv2StatesEnum instance = new Dsmlv2StatesEnum();
-
-
- private Dsmlv2StatesEnum()
- {
- }
-
-
- /**
- * Get an instance of this class
- *
- * @return An instance on this class
- */
- public static Dsmlv2StatesEnum getInstance()
- {
- return instance;
- }
-
-
- /**
- * Get the current state for a specified grammar.
- *
- * @param state the state
- * @return the state
- */
- public String getState( int state )
- {
- switch ( state )
- {
- case BATCHREQUEST_START_TAG:
- return "BATCHREQUEST_START_TAG";
- case BATCHREQUEST_LOOP:
- return "BATCHREQUEST_LOOP";
- case BATCHREQUEST_END_TAG:
- return "BATCHREQUEST_END_TAG";
- case ABANDON_REQUEST_START_TAG:
- return "ABANDON_REQUEST_START_TAG";
- case ABANDON_REQUEST_CONTROL_START_TAG:
- return "ABANDON_REQUEST_CONTROL_START_TAG";
- case ABANDON_REQUEST_CONTROL_END_TAG:
- return "ABANDON_REQUEST_CONTROL_END_TAG";
- case ABANDON_REQUEST_CONTROLVALUE_START_TAG:
- return "ABANDON_REQUEST_CONTROLVALUE_START_TAG";
- case ABANDON_REQUEST_CONTROLVALUE_END_TAG:
- return "ABANDON_REQUEST_CONTROLVALUE_END_TAG";
- case ADD_REQUEST_START_TAG:
- return "ADD_REQUEST_START_TAG";
- case ADD_REQUEST_CONTROL_START_TAG:
- return "ADD_REQUEST_CONTROL_START_TAG";
- case ADD_REQUEST_CONTROL_END_TAG:
- return "ADD_REQUEST_CONTROL_END_TAG";
- case ADD_REQUEST_CONTROLVALUE_START_TAG:
- return "ADD_REQUEST_CONTROLVALUE_START_TAG";
- case ADD_REQUEST_CONTROLVALUE_END_TAG:
- return "ADD_REQUEST_CONTROLVALUE_END_TAG";
- case ADD_REQUEST_ATTR_START_TAG:
- return "ADD_REQUEST_ATTR_START_TAG";
- case ADD_REQUEST_ATTR_END_TAG:
- return "ADD_REQUEST_ATTR_END_TAG";
- case ADD_REQUEST_VALUE_START_TAG:
- return "ADD_REQUEST_VALUE_START_TAG";
- case ADD_REQUEST_VALUE_END_TAG:
- return "ADD_REQUEST_VALUE_END_TAG";
- case AUTH_REQUEST_START_TAG:
- return "AUTH_REQUEST_START_TAG";
- case AUTH_REQUEST_CONTROL_START_TAG:
- return "AUTH_REQUEST_CONTROL_START_TAG";
- case AUTH_REQUEST_CONTROL_END_TAG:
- return "AUTH_REQUEST_CONTROL_END_TAG";
- case AUTH_REQUEST_CONTROLVALUE_START_TAG:
- return "AUTH_REQUEST_CONTROLVALUE_START_TAG";
- case AUTH_REQUEST_CONTROLVALUE_END_TAG:
- return "AUTH_REQUEST_CONTROLVALUE_END_TAG";
- case COMPARE_REQUEST_START_TAG:
- return "COMPARE_REQUEST_START_TAG";
- case COMPARE_REQUEST_CONTROL_START_TAG:
- return "COMPARE_REQUEST_CONTROL_START_TAG";
- case COMPARE_REQUEST_CONTROL_END_TAG:
- return "COMPARE_REQUEST_CONTROL_END_TAG";
- case COMPARE_REQUEST_CONTROLVALUE_START_TAG:
- return "COMPARE_REQUEST_CONTROLVALUE_START_TAG";
- case COMPARE_REQUEST_CONTROLVALUE_END_TAG:
- return "COMPARE_REQUEST_CONTROLVALUE_END_TAG";
- case COMPARE_REQUEST_ASSERTION_START_TAG:
- return "COMPARE_REQUEST_ASSERTION_START_TAG";
- case COMPARE_REQUEST_ASSERTION_END_TAG:
- return "COMPARE_REQUEST_ASSERTION_END_TAG";
- case COMPARE_REQUEST_VALUE_START_TAG:
- return "COMPARE_REQUEST_VALUE_START_TAG";
- case COMPARE_REQUEST_VALUE_END_TAG:
- return "COMPARE_REQUEST_VALUE_END_TAG";
- case DEL_REQUEST_START_TAG:
- return "DEL_REQUEST_START_TAG";
- case DEL_REQUEST_CONTROL_START_TAG:
- return "DEL_REQUEST_CONTROL_START_TAG";
- case DEL_REQUEST_CONTROL_END_TAG:
- return "DEL_REQUEST_CONTROL_END_TAG";
- case DEL_REQUEST_CONTROLVALUE_START_TAG:
- return "DEL_REQUEST_CONTROLVALUE_START_TAG";
- case DEL_REQUEST_CONTROLVALUE_END_TAG:
- return "DEL_REQUEST_CONTROLVALUE_END_TAG";
- case EXTENDED_REQUEST_START_TAG:
- return "EXTENDED_REQUEST_START_TAG";
- case EXTENDED_REQUEST_CONTROL_START_TAG:
- return "EXTENDED_REQUEST_CONTROL_START_TAG";
- case EXTENDED_REQUEST_CONTROL_END_TAG:
- return "EXTENDED_REQUEST_CONTROL_END_TAG";
- case EXTENDED_REQUEST_CONTROLVALUE_START_TAG:
- return "EXTENDED_REQUEST_CONTROLVALUE_START_TAG";
- case EXTENDED_REQUEST_CONTROLVALUE_END_TAG:
- return "EXTENDED_REQUEST_CONTROLVALUE_END_TAG";
- case EXTENDED_REQUEST_REQUESTNAME_START_TAG:
- return "EXTENDED_REQUEST_REQUESTNAME_START_TAG";
- case EXTENDED_REQUEST_REQUESTNAME_END_TAG:
- return "EXTENDED_REQUEST_REQUESTNAME_END_TAG";
- case EXTENDED_REQUEST_REQUESTVALUE_START_TAG:
- return "EXTENDED_REQUEST_REQUESTVALUE_START_TAG";
- case EXTENDED_REQUEST_REQUESTVALUE_END_TAG:
- return "EXTENDED_REQUEST_REQUESTVALUE_END_TAG";
- case MODIFY_DN_REQUEST_START_TAG:
- return "MODIFY_DN_REQUEST_START_TAG";
- case MODIFY_DN_REQUEST_CONTROL_START_TAG:
- return "MODIFY_DN_REQUEST_CONTROL_START_TAG";
- case MODIFY_DN_REQUEST_CONTROL_END_TAG:
- return "MODIFY_DN_REQUEST_CONTROL_END_TAG";
- case MODIFY_DN_REQUEST_CONTROLVALUE_START_TAG:
- return "MODIFY_DN_REQUEST_CONTROLVALUE_START_TAG";
- case MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG:
- return "MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG";
- case MODIFY_REQUEST_START_TAG:
- return "MODIFY_REQUEST_START_TAG";
- case MODIFY_REQUEST_CONTROL_START_TAG:
- return "MODIFY_REQUEST_CONTROL_START_TAG";
- case MODIFY_REQUEST_CONTROL_END_TAG:
- return "MODIFY_REQUEST_CONTROL_END_TAG";
- case MODIFY_REQUEST_CONTROLVALUE_START_TAG:
- return "MODIFY_REQUEST_CONTROLVALUE_START_TAG";
- case MODIFY_REQUEST_CONTROLVALUE_END_TAG:
- return "MODIFY_REQUEST_CONTROLVALUE_END_TAG";
- case MODIFY_REQUEST_MODIFICATION_START_TAG:
- return "MODIFY_REQUEST_MODIFICATION_START_TAG";
- case MODIFY_REQUEST_MODIFICATION_END_TAG:
- return "MODIFY_REQUEST_MODIFICATION_END_TAG";
- case MODIFY_REQUEST_VALUE_START_TAG:
- return "MODIFY_REQUEST_VALUE_START_TAG";
- case MODIFY_REQUEST_VALUE_END_TAG:
- return "MODIFY_REQUEST_VALUE_END_TAG";
- case SEARCH_REQUEST_START_TAG:
- return "SEARCH_REQUEST_START_TAG";
- case SEARCH_REQUEST_CONTROL_START_TAG:
- return "SEARCH_REQUEST_CONTROL_START_TAG";
- case SEARCH_REQUEST_CONTROL_END_TAG:
- return "SEARCH_REQUEST_CONTROL_END_TAG";
- case SEARCH_REQUEST_CONTROLVALUE_START_TAG:
- return "SEARCH_REQUEST_CONTROLVALUE_START_TAG";
- case SEARCH_REQUEST_CONTROLVALUE_END_TAG:
- return "SEARCH_REQUEST_CONTROLVALUE_END_TAG";
- case SEARCH_REQUEST_FILTER_START_TAG:
- return "SEARCH_REQUEST_FILTER_START_TAG";
- case SEARCH_REQUEST_FILTER_END_TAG:
- return "SEARCH_REQUEST_FILTER_END_TAG";
- case SEARCH_REQUEST_ATTRIBUTES_START_TAG:
- return "SEARCH_REQUEST_ATTRIBUTES_START_TAG";
- case SEARCH_REQUEST_ATTRIBUTES_END_TAG:
- return "SEARCH_REQUEST_ATTRIBUTES_END_TAG";
- case SEARCH_REQUEST_ATTRIBUTE_START_TAG:
- return "SEARCH_REQUEST_ATTRIBUTE_START_TAG";
- case SEARCH_REQUEST_ATTRIBUTE_END_TAG:
- return "SEARCH_REQUEST_ATTRIBUTE_END_TAG";
- case SEARCH_REQUEST_EQUALITYMATCH_START_TAG:
- return "SEARCH_REQUEST_EQUALITYMATCH_START_TAG";
- case SEARCH_REQUEST_SUBSTRINGS_START_TAG:
- return "SEARCH_REQUEST_SUBSTRINGS_START_TAG";
- case SEARCH_REQUEST_SUBSTRINGS_END_TAG:
- return "SEARCH_REQUEST_SUBSTRINGS_END_TAG";
- case SEARCH_REQUEST_GREATEROREQUAL_START_TAG:
- return "SEARCH_REQUEST_GREATEROREQUAL_START_TAG";
- case SEARCH_REQUEST_LESSOREQUAL_START_TAG:
- return "SEARCH_REQUEST_LESSOREQUAL_START_TAG";
- case SEARCH_REQUEST_PRESENT_START_TAG:
- return "SEARCH_REQUEST_PRESENT_START_TAG";
- case SEARCH_REQUEST_APPROXMATCH_START_TAG:
- return "SEARCH_REQUEST_APPROXMATCH_START_TAG";
- case SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG:
- return "SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG";
- case SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_START_TAG:
- return "SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_START_TAG";
- case SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_END_TAG:
- return "SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_END_TAG";
- case SEARCH_REQUEST_INITIAL_START_TAG:
- return "SEARCH_REQUEST_INITIAL_START_TAG";
- case SEARCH_REQUEST_INITIAL_END_TAG:
- return "SEARCH_REQUEST_INITIAL_END_TAG";
- case SEARCH_REQUEST_ANY_START_TAG:
- return "SEARCH_REQUEST_ANY_START_TAG";
- case SEARCH_REQUEST_ANY_END_TAG:
- return "SEARCH_REQUEST_ANY_END_TAG";
- case SEARCH_REQUEST_FINAL_START_TAG:
- return "SEARCH_REQUEST_FINAL_START_TAG";
- case SEARCH_REQUEST_FINAL_END_TAG:
- return "SEARCH_REQUEST_FINAL_END_TAG";
- case SEARCH_REQUEST_VALUE_START_TAG:
- return "SEARCH_REQUEST_VALUE_START_TAG";
- case SEARCH_REQUEST_VALUE_END_TAG:
- return "SEARCH_REQUEST_VALUE_END_TAG";
- case SEARCH_REQUEST_FILTER_LOOP:
- return "SEARCH_REQUEST_FILTER_LOOP";
-
- case BATCH_RESPONSE_LOOP:
- return "BATCH_RESPONSE_LOOP";
- case ERROR_RESPONSE:
- return "ERROR_RESPONSE";
- case MESSAGE_START:
- return "MESSAGE_START";
- case MESSAGE_END:
- return "MESSAGE_END";
- case DETAIL_START:
- return "DETAIL_START";
- case DETAIL_END:
- return "DETAIL_END";
- case EXTENDED_RESPONSE:
- return "EXTENDED_RESPONSE";
- case EXTENDED_RESPONSE_CONTROL_START:
- return "EXTENDED_RESPONSE_CONTROL_START";
- case EXTENDED_RESPONSE_CONTROL_END:
- return "EXTENDED_RESPONSE_CONTROL_END";
- case EXTENDED_RESPONSE_CONTROL_VALUE_START:
- return "EXTENDED_RESPONSE_CONTROL_VALUE_START";
- case EXTENDED_RESPONSE_CONTROL_VALUE_END:
- return "EXTENDED_RESPONSE_CONTROL_VALUE_END";
- case EXTENDED_RESPONSE_RESULT_CODE_START:
- return "EXTENDED_RESPONSE_RESULT_CODE_START";
- case EXTENDED_RESPONSE_RESULT_CODE_END:
- return "EXTENDED_RESPONSE_RESULT_CODE_END";
- case EXTENDED_RESPONSE_ERROR_MESSAGE_START:
- return "EXTENDED_RESPONSE_ERROR_MESSAGE_START";
- case EXTENDED_RESPONSE_ERROR_MESSAGE_END:
- return "EXTENDED_RESPONSE_ERROR_MESSAGE_END";
- case EXTENDED_RESPONSE_REFERRAL_START:
- return "EXTENDED_RESPONSE_REFERRAL_START";
- case EXTENDED_RESPONSE_REFERRAL_END:
- return "EXTENDED_RESPONSE_REFERRAL_END";
- case RESPONSE_NAME_START:
- return "RESPONSE_NAME_START";
- case RESPONSE_NAME_END:
- return "RESPONSE_NAME_END";
- case RESPONSE_START:
- return "RESPONSE_START";
- case RESPONSE_END:
- return "RESPONSE_END";
- case LDAP_RESULT:
- return "LDAP_RESULT";
- case LDAP_RESULT_CONTROL_START:
- return "LDAP_RESULT_CONTROL_START";
- case LDAP_RESULT_CONTROL_END:
- return "LDAP_RESULT_CONTROL_END";
- case LDAP_RESULT_CONTROL_VALUE_START:
- return "LDAP_RESULT_CONTROL_VALUE_START";
- case LDAP_RESULT_CONTROL_VALUE_END:
- return "LDAP_RESULT_CONTROL_VALUE_END";
- case LDAP_RESULT_RESULT_CODE_START:
- return "LDAP_RESULT_RESULT_CODE_START";
- case LDAP_RESULT_RESULT_CODE_END:
- return "LDAP_RESULT_RESULT_CODE_END";
- case LDAP_RESULT_ERROR_MESSAGE_START:
- return "LDAP_RESULT_ERROR_MESSAGE_START";
- case LDAP_RESULT_ERROR_MESSAGE_END:
- return "LDAP_RESULT_ERROR_MESSAGE_END";
- case LDAP_RESULT_REFERRAL_START:
- return "LDAP_RESULT_REFERRAL_START";
- case LDAP_RESULT_REFERRAL_END:
- return "LDAP_RESULT_REFERRAL_END";
- case LDAP_RESULT_END:
- return "LDAP_RESULT_END";
- case SEARCH_RESPONSE:
- return "SEARCH_RESPONSE";
- case SEARCH_RESULT_ENTRY:
- return "SEARCH_RESULT_ENTRY";
- case SEARCH_RESULT_ENTRY_CONTROL_START:
- return "SEARCH_RESULT_ENTRY_CONTROL_START";
- case SEARCH_RESULT_ENTRY_CONTROL_END:
- return "SEARCH_RESULT_ENTRY_CONTROL_END";
- case SEARCH_RESULT_ENTRY_CONTROL_VALUE_START:
- return "SEARCH_RESULT_ENTRY_CONTROL_VALUE_START";
- case SEARCH_RESULT_ENTRY_CONTROL_VALUE_END:
- return "SEARCH_RESULT_ENTRY_CONTROL_VALUE_END";
- case SEARCH_RESULT_ENTRY_ATTR_START:
- return "SEARCH_RESULT_ENTRY_ATTR_START";
- case SEARCH_RESULT_ENTRY_ATTR_END:
- return "SEARCH_RESULT_ENTRY_ATTR_END";
- case SEARCH_RESULT_ENTRY_VALUE_START:
- return "SEARCH_RESULT_ENTRY_VALUE_START";
- case SEARCH_RESULT_ENTRY_VALUE_END:
- return "SEARCH_RESULT_ENTRY_VALUE_END";
- case SEARCH_RESULT_ENTRY_LOOP:
- return "SEARCH_RESULT_ENTRY_LOOP";
- case SEARCH_RESULT_REFERENCE:
- return "SEARCH_RESULT_REFERENCE";
- case SEARCH_RESULT_REFERENCE_CONTROL_START:
- return "SEARCH_RESULT_REFERENCE_CONTROL_START";
- case SEARCH_RESULT_REFERENCE_CONTROL_END:
- return "SEARCH_RESULT_REFERENCE_CONTROL_END";
- case SEARCH_RESULT_REFERENCE_CONTROL_VALUE_START:
- return "SEARCH_RESULT_REFERENCE_CONTROL_VALUE_START";
- case SEARCH_RESULT_REFERENCE_CONTROL_VALUE_END:
- return "SEARCH_RESULT_REFERENCE_CONTROL_VALUE_END";
- case SEARCH_RESULT_REFERENCE_REF_START:
- return "SEARCH_RESULT_REFERENCE_REF_START";
- case SEARCH_RESULT_REFERENCE_REF_END:
- return "SEARCH_RESULT_REFERENCE_REF_END";
- case SEARCH_RESULT_REFERENCE_LOOP:
- return "SEARCH_RESULT_REFERENCE_LOOP";
- case SEARCH_RESULT_DONE_END:
- return "SEARCH_RESULT_DONE_END";
-
- default:
- return "UNKNOWN";
- }
- }
+ SEARCH_RESULT_DONE_END;
}
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:1023442-1028955
Propchange: directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 01:51:50 2010
@@ -5,3 +5,4 @@
/directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:965208-965686
/directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:945830-946347
/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:980350-980351
+/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:1023442-1028955