From commits-return-5750-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Aug 26 08:33:19 2005 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 41503 invoked from network); 26 Aug 2005 08:33:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Aug 2005 08:33:17 -0000 Received: (qmail 39073 invoked by uid 500); 26 Aug 2005 08:30:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 28276 invoked by uid 500); 26 Aug 2005 08:29:01 -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 17876 invoked by uid 99); 26 Aug 2005 08:27:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Aug 2005 01:27:39 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 25 Aug 2005 21:44:32 -0700 Received: (qmail 12570 invoked by uid 65534); 26 Aug 2005 04:44:14 -0000 Message-ID: <20050826044414.12569.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r240159 - /directory/apacheds/trunk/core/src/main/schema/apachedns.schema Date: Fri, 26 Aug 2005 04:44:13 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Thu Aug 25 21:44:10 2005 New Revision: 240159 URL: http://svn.apache.org/viewcvs?rev=240159&view=rev Log: fixing schema OID conflict: two attibutes had same OID and an objectClass OID conflicted with objectClass in apache.schema Modified: directory/apacheds/trunk/core/src/main/schema/apachedns.schema Modified: directory/apacheds/trunk/core/src/main/schema/apachedns.schema URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/schema/apachedns.schema?rev=240159&r1=240158&r2=240159&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/schema/apachedns.schema (original) +++ directory/apacheds/trunk/core/src/main/schema/apachedns.schema Thu Aug 25 21:44:10 2005 @@ -29,11 +29,6 @@ EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.14 NAME 'apacheDomainName' - DESC 'A domain name or sequence dotted labels' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) - attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.15 NAME 'apacheSOAMName' DESC 'A domain name of the name server that was the primary source of data for this zone' SUP apacheDomainName SINGLE-VALUE ) @@ -67,7 +62,12 @@ EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.1 +attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.22 NAME 'apacheDomainName' + DESC 'A domain name or sequence dotted labels' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) + +objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.6 NAME 'apacheAbstractRecord' DESC 'An abstract DNS record objectClass used to build other specific structural objectclasses for different record types' SUP top