Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 8703 invoked from network); 15 Dec 2009 20:15:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Dec 2009 20:15:47 -0000 Received: (qmail 16735 invoked by uid 500); 15 Dec 2009 20:15:47 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 16677 invoked by uid 500); 15 Dec 2009 20:15:47 -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 16668 invoked by uid 99); 15 Dec 2009 20:15:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2009 20:15:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 15 Dec 2009 20:15:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43DD523889E7; Tue, 15 Dec 2009 20:15:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r890968 - in /directory/shared/branches/shared-schema: ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/ ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ Date: Tue, 15 Dec 2009 20:15:23 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091215201524.43DD523889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Dec 15 20:15:23 2009 New Revision: 890968 URL: http://svn.apache.org/viewvc?rev=890968&view=rev Log: Renamed some constants containing a double ..._MATCH_MATCH_... Modified: directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java Modified: directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=890968&r1=890967&r2=890968&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original) +++ directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Tue Dec 15 20:15:23 2009 @@ -796,12 +796,12 @@ String PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID = "2.5.13.22"; // uniqueMemberMatch (RFC 4517, chap. 4.2.31) - String UNIQUE_MEMBER_MATCH_MATCH_MR = "uniqueMemberMatch"; - String UNIQUE_MEMBER_MATCH_MATCH_MR_OID = "2.5.13.23"; + String UNIQUE_MEMBER_MATCH_MR = "uniqueMemberMatch"; + String UNIQUE_MEMBER_MATCH_MR_OID = "2.5.13.23"; // protocolInformationMatch Removed in RFC 4517 - String PROTOCOL_INFORMATION_MATCH_MATCH_MR = "protocolInformationMatch"; - String PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID = "2.5.13.24"; + String PROTOCOL_INFORMATION_MATCH_MR = "protocolInformationMatch"; + String PROTOCOL_INFORMATION_MATCH_MR_OID = "2.5.13.24"; // "2.5.13.25" is not used ... // "2.5.13.26" is not used ... Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java?rev=890968&r1=890967&r2=890968&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java (original) +++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java Tue Dec 15 20:15:23 2009 @@ -48,7 +48,7 @@ public UniqueMemberNormalizer() { - super( SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID ); + super( SchemaConstants.UNIQUE_MEMBER_MATCH_MR_OID ); }