Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 59677 invoked from network); 3 Oct 2005 20:00:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2005 20:00:03 -0000 Received: (qmail 63345 invoked by uid 500); 3 Oct 2005 20:00:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 63304 invoked by uid 500); 3 Oct 2005 20:00:02 -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 63293 invoked by uid 99); 3 Oct 2005 20:00:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2005 13:00:02 -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; Mon, 03 Oct 2005 13:00:06 -0700 Received: (qmail 59548 invoked by uid 65534); 3 Oct 2005 19:59:40 -0000 Message-ID: <20051003195940.59542.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r293443 - /directory/apacheds/trunk/core/src/main/schema/apachedns.schema Date: Mon, 03 Oct 2005 19:59:39 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: erodriguez Date: Mon Oct 3 12:59:36 2005 New Revision: 293443 URL: http://svn.apache.org/viewcvs?rev=293443&view=rev Log: Update to apachedns.schema OID's to resolve conflict with apache.schema by branching OID range. 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=293443&r1=293442&r2=293443&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/schema/apachedns.schema (original) +++ directory/apacheds/trunk/core/src/main/schema/apachedns.schema Mon Oct 3 12:59:36 2005 @@ -1,146 +1,155 @@ -# -# ApacheDS schema for storing DNS zones in LDAP -# +# ============================================================================= +# ApacheDS schema for storing DNS zones in LDAP +# ============================================================================= +# +---------------------------+-----------------+ +# | Apache OID | description | +# +---------------------------+-----------------+ +# | 1.2.6.1.4.1.18060.1.1.2.1 | syntaxes | +# | 1.2.6.1.4.1.18060.1.1.2.2 | matchingRules | +# | 1.2.6.1.4.1.18060.1.1.2.3 | attributeTypes | +# | 1.2.6.1.4.1.18060.1.1.2.4 | objectClasses | +# +---------------------------+-----------------+ +# ============================================================================= -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.10 NAME 'apacheDnsName' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.1 NAME 'apacheDnsName' DESC 'A sequence of labels representing a domain name or host name' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.11 NAME 'apacheDnsType' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.2 NAME 'apacheDnsType' DESC 'The type of a resource record' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.12 NAME 'apacheDnsClass' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.3 NAME 'apacheDnsClass' DESC 'The class of a resource record' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.13 NAME 'apacheDnsTtl' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.4 NAME 'apacheDnsTtl' DESC 'An integer denoting time to live' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.14 NAME 'apacheDnsDomainName' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.5 NAME 'apacheDnsDomainName' DESC 'A domain name represented as a sequence of 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 'apacheDnsIpAddress' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.6 NAME 'apacheDnsIpAddress' DESC 'A 4 octet IP address' 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.16 NAME 'apacheDnsSoaMName' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.7 NAME 'apacheDnsSoaMName' DESC 'The domain name of the name server that was the primary source of data for this zone' SUP apacheDnsDomainName SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.17 NAME 'apacheDnsSoaRName' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.8 NAME 'apacheDnsSoaRName' DESC 'The domain name which specifies the mailbox of the person responsible for this zone' SUP apacheDnsDomainName SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.18 NAME 'apacheDnsSoaSerial' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.9 NAME 'apacheDnsSoaSerial' DESC 'The unsigned 32 bit version number of the original copy of the zone' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.19 NAME 'apacheDnsSoaRefresh' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.10 NAME 'apacheDnsSoaRefresh' DESC 'A 32 bit time interval before the zone should be refreshed' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.20 NAME 'apacheDnsSoaRetry' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.11 NAME 'apacheDnsSoaRetry' DESC 'A 32 bit time interval that should elapse before a failed refresh should be retired' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.21 NAME 'apacheDnsSoaExpire' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.12 NAME 'apacheDnsSoaExpire' DESC 'A 32 bit time value that specifies the upper limit on the time interval that can elapse before the zone is no longer authoritative' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.22 NAME 'apacheDnsSoaMinimum' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.13 NAME 'apacheDnsSoaMinimum' DESC 'The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.23 NAME 'apacheDnsMxPreference' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.14 NAME 'apacheDnsMxPreference' DESC 'An integer denoting the mail exchange preference' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.24 NAME 'apacheDnsCharacterString' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.15 NAME 'apacheDnsCharacterString' DESC 'A string up to 256 characters in length' 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.27 NAME 'apacheDnsServicePriority' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.16 NAME 'apacheDnsServicePriority' DESC 'The unsigned 16 bit priority of this target host' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.28 NAME 'apacheDnsServiceWeight' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.17 NAME 'apacheDnsServiceWeight' DESC 'The unsigned 16 bit weight specifying a relative weight for entries with the same priority' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.29 NAME 'apacheDnsServicePort' +attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.18 NAME 'apacheDnsServicePort' DESC 'The unsigned 16 bit port on this target host of this service' 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.6 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.1 NAME 'apacheDnsAbstractRecord' DESC 'An abstract DNS record objectClass used to build other specific structural objectclasses for different record types' SUP top ABSTRACT MUST ( apacheDnsName $ apacheDnsType $ apacheDnsClass $ apacheDnsTtl ) ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.2 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.2 NAME 'apacheDnsAddressRecord' DESC 'An address A record' SUP apacheDnsAbstractRecord MUST apacheDnsIpAddress ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.3 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.3 NAME 'apacheDnsPointerRecord' DESC 'A pointer PTR record' SUP apacheDnsAbstractRecord MUST apacheDnsDomainName ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.4 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.4 NAME 'apacheDnsNameServerRecord' DESC 'A name server NS record' SUP apacheDnsAbstractRecord MUST apacheDnsDomainName ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.5 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.5 NAME 'apacheDnsStartOfAuthorityRecord' DESC 'A start of authority SOA record' SUP apacheDnsAbstractRecord MUST ( apacheDnsSoaMName $ apacheDnsSoaRName $ apacheDnsSoaSerial $ apacheDnsSoaRefresh $ apacheDnsSoaRetry $ apacheDnsSoaExpire $ apacheDnsSoaMinimum ) ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.7 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.6 NAME 'apacheDnsCanonicalNameRecord' DESC 'A canonical name CNAME record' SUP apacheDnsAbstractRecord MUST apacheDnsDomainName ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.8 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.7 NAME 'apacheDnsMailExchangeRecord' DESC 'A mail exchange MX record' SUP apacheDnsAbstractRecord MUST ( apacheDnsMxPreference $ apacheDnsDomainName ) ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.9 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.8 NAME 'apacheDnsTextRecord' DESC 'A text TXT record' SUP apacheDnsAbstractRecord MUST apacheDnsCharacterString ) -objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.10 +objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.9 NAME 'apacheDnsServiceRecord' DESC 'A service SRV record' SUP apacheDnsAbstractRecord