Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3492B7F2A for ; Mon, 24 Oct 2011 12:03:18 +0000 (UTC) Received: (qmail 42905 invoked by uid 500); 24 Oct 2011 12:03:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 42827 invoked by uid 500); 24 Oct 2011 12:03:18 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 42757 invoked by uid 99); 24 Oct 2011 12:03:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 12:03:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 12:03:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D79B23889D7 for ; Mon, 24 Oct 2011 12:02:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188102 [1/3] - in /directory/shared/branches/shared-osgi: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/rep... Date: Mon, 24 Oct 2011 12:02:44 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111024120253.3D79B23889D7@eris.apache.org> Author: pamarcelot Date: Mon Oct 24 12:02:39 2011 New Revision: 1188102 URL: http://svn.apache.org/viewvc?rev=1188102&view=rev Log: Merged latest modifications in trunk with the OSGI branch [rev:1185683:head] Added: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/oid.txt - copied unchanged from r1188093, directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/oid.txt Modified: directory/shared/branches/shared-osgi/ (props changed) directory/shared/branches/shared-osgi/all/ (props changed) directory/shared/branches/shared-osgi/asn1/api/pom.xml directory/shared/branches/shared-osgi/asn1/ber/pom.xml directory/shared/branches/shared-osgi/dsml/engine/pom.xml directory/shared/branches/shared-osgi/dsml/parser/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/pom.xml directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml (props changed) directory/shared/branches/shared-osgi/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-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml (props changed) directory/shared/branches/shared-osgi/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-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/ (props changed) directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/ (props changed) directory/shared/branches/shared-osgi/i18n/ (props changed) directory/shared/branches/shared-osgi/i18n/pom.xml directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java directory/shared/branches/shared-osgi/ldap/client/all/ (props changed) directory/shared/branches/shared-osgi/ldap/client/api/pom.xml directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java (props changed) directory/shared/branches/shared-osgi/ldap/codec/core/ (props changed) directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml directory/shared/branches/shared-osgi/ldap/codec/standalone/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/aci/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml directory/shared/branches/shared-osgi/ldap/extras/codec/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/codec-api/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/codec-api/pom.xml directory/shared/branches/shared-osgi/ldap/extras/codec/pom.xml directory/shared/branches/shared-osgi/ldap/extras/sp/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/sp/pom.xml directory/shared/branches/shared-osgi/ldap/extras/trigger/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/trigger/pom.xml directory/shared/branches/shared-osgi/ldap/extras/util/ (props changed) directory/shared/branches/shared-osgi/ldap/extras/util/pom.xml directory/shared/branches/shared-osgi/ldap/model/ (props changed) directory/shared/branches/shared-osgi/ldap/model/pom.xml directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java (props changed) directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java directory/shared/branches/shared-osgi/ldap/net/mina/ (props changed) directory/shared/branches/shared-osgi/ldap/net/mina/pom.xml directory/shared/branches/shared-osgi/ldap/schema/converter/pom.xml directory/shared/branches/shared-osgi/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java directory/shared/branches/shared-osgi/ldap/schema/data/ (props changed) directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/ (props changed) directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (contents, props changed) directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.0.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.100.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.101.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.102.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.103.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.104.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.105.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.108.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.111.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.112.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.113.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.115.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.116.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.117.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.120.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.121.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.130.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.131.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.141.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.142.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.143.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.144.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.150.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.151.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.152.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.153.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.154.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.804.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.933.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif directory/shared/branches/shared-osgi/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif directory/shared/branches/shared-osgi/util/pom.xml Propchange: directory/shared/branches/shared-osgi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -6,4 +6,4 @@ /directory/shared/branches/shared-schema:806622-896441 /directory/shared/branches/shared-subtree:965208-965686 /directory/shared/branches/xdbm-refactoring:945830-946347 -/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328 +/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328,1185684-1188093 Propchange: directory/shared/branches/shared-osgi/all/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -4,4 +4,4 @@ /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933 /directory/shared/branches/shared-osgi/all:1103720-1124653 /directory/shared/branches-dnfactory-experiment/all:980350-980351 -/directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1075328 +/directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1075328,1185684-1188093 Modified: directory/shared/branches/shared-osgi/asn1/api/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/asn1/api/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff ============================================================================== --- directory/shared/branches/shared-osgi/asn1/api/pom.xml (original) +++ directory/shared/branches/shared-osgi/asn1/api/pom.xml Mon Oct 24 12:02:39 2011 @@ -47,6 +47,17 @@ + org.apache.maven.plugins + maven-jar-plugin + + + META-INF/MANIFEST.MF + false + + + + + org.apache.felix maven-bundle-plugin true @@ -54,7 +65,7 @@ META-INF - ${project.groupId}.${project.artifactId} + ${project.groupId}.asn1.api {local-packages};version=${project.version};-noimport:=true Modified: directory/shared/branches/shared-osgi/asn1/ber/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/asn1/ber/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff ============================================================================== --- directory/shared/branches/shared-osgi/asn1/ber/pom.xml (original) +++ directory/shared/branches/shared-osgi/asn1/ber/pom.xml Mon Oct 24 12:02:39 2011 @@ -57,6 +57,17 @@ + org.apache.maven.plugins + maven-jar-plugin + + + META-INF/MANIFEST.MF + false + + + + + org.apache.felix maven-bundle-plugin true @@ -64,7 +75,7 @@ META-INF - ${project.groupId}.${project.artifactId} + ${project.groupId}.asn1.ber {local-packages};version=${project.version};-noimport:=true Modified: directory/shared/branches/shared-osgi/dsml/engine/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/dsml/engine/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff ============================================================================== --- directory/shared/branches/shared-osgi/dsml/engine/pom.xml (original) +++ directory/shared/branches/shared-osgi/dsml/engine/pom.xml Mon Oct 24 12:02:39 2011 @@ -72,7 +72,7 @@ META-INF - ${project.groupId}.${project.artifactId} + ${project.groupId}.dsmlv2.engine {local-packages};version=${project.version};-noimport:=true Propchange: directory/shared/branches/shared-osgi/dsml/parser/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -4,4 +4,5 @@ /directory/shared/branches/shared-dnfactory-experiment/dsml-parser:980352-980933 /directory/shared/branches/shared-osgi/dsml/parser:1103720-1124653 /directory/shared/branches-dnfactory-experiment/dsml-parser:980350-980351 +/directory/shared/trunk/dsml/parser:1185684-1188093 /directory/shared/trunk/dsml-parser:1066124-1067995,1068025-1072732,1072797-1075328 Modified: directory/shared/branches/shared-osgi/dsml/parser/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/dsml/parser/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff ============================================================================== --- directory/shared/branches/shared-osgi/dsml/parser/pom.xml (original) +++ directory/shared/branches/shared-osgi/dsml/parser/pom.xml Mon Oct 24 12:02:39 2011 @@ -113,7 +113,7 @@ META-INF - ${project.groupId}.${project.artifactId} + ${project.groupId}.dsmlv2.parser {local-packages};version=${project.version};-noimport:=true Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,5 +8,6 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java:1067492-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:1066124-1067491 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,5 +8,6 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java:1067492-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:1066124-1067491 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /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:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:980350-980351 +/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1185684-1188093 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 12:02:39 2011 @@ -8,4 +8,5 @@ /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351 +/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1185684-1188093 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1072732,1072797-1075328