Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 75635 invoked from network); 26 Oct 2010 15:24:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Oct 2010 15:24:43 -0000 Received: (qmail 7824 invoked by uid 500); 26 Oct 2010 15:24:43 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 7769 invoked by uid 500); 26 Oct 2010 15:24:43 -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 7762 invoked by uid 99); 26 Oct 2010 15:24:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Oct 2010 15:24:42 +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, 26 Oct 2010 15:24:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B600323889E0; Tue, 26 Oct 2010 15:23:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1027593 - in /directory: apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ apacheds/branches/apacheds-config/server-config/src/main/resources/ shared/branches/shared-config/ldap-schema/... Date: Tue, 26 Oct 2010 15:23:45 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101026152345.B600323889E0@eris.apache.org> Author: elecharny Date: Tue Oct 26 15:23:45 2010 New Revision: 1027593 URL: http://svn.apache.org/viewvc?rev=1027593&view=rev Log: o Added the ads-contextEntry AT o Added this AT to the Partition OC o Added it into the Partition Bean Added: directory/shared/branches/shared-config/ldap-schema/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 Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1027593&r1=1027592&r2=1027593&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original) +++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Tue Oct 26 15:23:45 2010 @@ -41,6 +41,9 @@ public abstract class PartitionBean exte /** The list of declared indexes */ private List indexes; + + /** The partition's ContextEntry */ + private String contextEntry; /** * Create a new PartitionBean instance @@ -120,6 +123,24 @@ public abstract class PartitionBean exte { this.indexes = indexes; } + + + /** + * @param contextEntry the contextEntry to set + */ + public void setContextEntry( String contextEntry ) + { + this.contextEntry = contextEntry; + } + + + /** + * @return the contextEntry + */ + public String getContextEntry() + { + return contextEntry; + } /** @@ -133,6 +154,7 @@ public abstract class PartitionBean exte sb.append( tabs ).append( " partition ID : " ).append( partitionId ).append( '\n' ); sb.append( tabs ).append( " suffix : " ).append( partitionSuffix.getName() ).append( '\n' ); sb.append( toString( tabs, " sync on write", partitionSyncOnWrite ) ); + sb.append( toString( tabs, " contextEntry", contextEntry ) ); sb.append( tabs ).append( " indexes : \n" ); Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif?rev=1027593&r1=1027592&r2=1027593&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif (original) +++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif Tue Oct 26 15:23:45 2010 @@ -232,6 +232,11 @@ ads-partitioncachesize: 100 ads-partitionsynconwrite: true ads-partitionid: system ads-enabled: true +ads-contextEntry: dc=example,dc=com\n + objectClass: top\n + objectClass: domain\n + dc: example\n + description: The example context entry dn: ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config ou: indexes Added: directory/shared/branches/shared-config/ldap-schema/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 URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.154.ldif?rev=1027593&view=auto ============================================================================== --- directory/shared/branches/shared-config/ldap-schema/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 (added) +++ directory/shared/branches/shared-config/ldap-schema/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 Tue Oct 26 15:23:45 2010 @@ -0,0 +1,18 @@ +version: 1 +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.154, ou=attributeTypes, cn=adsconfig, ou=sch + ema +objectclass: top +objectclass: metaTop +objectclass: metaAttributeType +m-name: ads-contextEntry +m-oid: 1.3.6.1.4.1.18060.0.4.1.2.154 +m-description: The Partition context entry +m-syntax: 1.3.6.1.4.1.1466.115.121.1.44 +m-length: 0 +m-singlevalue: TRUE +m-ordering: caseExactOrderingMatch +m-substr: caseExactSubstringsMatch +m-equality: caseExactMatch +createtimestamp: 20100111145215Z +creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system +entrycsn: 20100111202215.976000Z#000000#000#000000 Modified: directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.150.ldif?rev=1027593&r1=1027592&r2=1027593&view=diff ============================================================================== --- directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif (original) +++ directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif Tue Oct 26 15:23:45 2010 @@ -14,5 +14,6 @@ creatorsname: 0.9.2342.19200300.100.1.1= entrycsn: 20100111202217.958000Z#000000#000#000000 m-must: ads-partitionId m-must: ads-partitionSuffix +m-may: ads-contextEntry m-may: ads-partitionSyncOnWrite m-may: ads-indexes