Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 57658 invoked from network); 18 Mar 2007 01:39:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Mar 2007 01:39:05 -0000 Received: (qmail 79174 invoked by uid 500); 18 Mar 2007 01:39:13 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 79137 invoked by uid 500); 18 Mar 2007 01:39:13 -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 79126 invoked by uid 99); 18 Mar 2007 01:39:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Mar 2007 18:39:13 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Mar 2007 18:39:04 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1D07B1A9838; Sat, 17 Mar 2007 18:38:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r519503 - in /directory: apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ apacheds/trunk/core/src/main/java/org/ap... Date: Sun, 18 Mar 2007 01:38:43 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070318013844.1D07B1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Mar 17 18:38:42 2007 New Revision: 519503 URL: http://svn.apache.org/viewvc?view=rev&rev=519503 Log: Removed the "modifierName" from the code (except from tests and antlr files) and replaced it by a reference to the constant declared in the new SchemaConstants class in shared-ldap-constants Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original) +++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sat Mar 17 18:38:42 2007 @@ -656,7 +656,7 @@ entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.TOP_OC ); entry.put( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, ADMIN_NORM_NAME ); - entry.put( SystemSchemaConstants.MODIFIERS_NAME_AT, ADMIN_NORM_NAME ); + entry.put( SchemaConstants.MODIFIERS_NAME_AT, ADMIN_NORM_NAME ); entry.put( SchemaConstants.CREATORS_NAME_AT, ADMIN_NORM_NAME ); entry.put( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() ); Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java (original) +++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java Sat Mar 17 18:38:42 2007 @@ -31,7 +31,6 @@ String SCHEMA_NAME = "system"; String CN_AT = "cn"; - String MODIFIERS_NAME_AT = "modifiersName"; String LDAP_SYNTAXES_AT = "ldapSyntaxes"; String MATCHING_RULES_AT = "matchingRules"; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Sat Mar 17 18:38:42 2007 @@ -35,7 +35,6 @@ import javax.naming.directory.SearchResult; import org.apache.directory.server.constants.ApacheSchemaConstants; -import org.apache.directory.server.constants.SystemSchemaConstants; import org.apache.directory.server.core.DirectoryServiceConfiguration; import org.apache.directory.server.core.configuration.InterceptorConfiguration; import org.apache.directory.server.core.enumeration.SearchResultFilter; @@ -175,7 +174,7 @@ // add operational attributes after call in case the operation fails Attributes attributes = new AttributesImpl( true ); - Attribute attribute = new AttributeImpl( "modifiersName" ); + Attribute attribute = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); attribute.add( getPrincipal().getName() ); attributes.put( attribute ); @@ -198,7 +197,7 @@ // add operational attributes after call in case the operation fails Attributes attributes = new AttributesImpl( true ); - Attribute attribute = new AttributeImpl( "modifiersName" ); + Attribute attribute = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); attribute.add( getPrincipal().getName() ); attributes.put( attribute ); @@ -217,7 +216,7 @@ // add operational attributes after call in case the operation fails Attributes attributes = new AttributesImpl( true ); - Attribute attribute = new AttributeImpl( "modifiersName" ); + Attribute attribute = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); attribute.add( getPrincipal().getName() ); attributes.put( attribute ); @@ -239,7 +238,7 @@ // add operational attributes after call in case the operation fails Attributes attributes = new AttributesImpl( true ); - Attribute attribute = new AttributeImpl( "modifiersName" ); + Attribute attribute = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); attribute.add( getPrincipal().getName() ); attributes.put( attribute ); @@ -258,7 +257,7 @@ // add operational attributes after call in case the operation fails Attributes attributes = new AttributesImpl( true ); - Attribute attribute = new AttributeImpl( "modifiersName" ); + Attribute attribute = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); attribute.add( getPrincipal().getName() ); attributes.put( attribute ); @@ -408,7 +407,7 @@ } type = null; - type = registry.lookup( SystemSchemaConstants.MODIFIERS_NAME_AT ); + type = registry.lookup( SchemaConstants.MODIFIERS_NAME_AT ); attr = null; attr = AttributeUtils.getAttribute( entry, type ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sat Mar 17 18:38:42 2007 @@ -566,7 +566,7 @@ mods[0] = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, new AttributeImpl( MetaSchemaConstants.M_DISABLED_AT ) ); mods[1] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, - new AttributeImpl( SystemSchemaConstants.MODIFIERS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL ) ); + new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL ) ); mods[2] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() ) ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sat Mar 17 18:38:42 2007 @@ -774,9 +774,9 @@ attrs.put( attr ); } - if ( returnAllOperationalAttributes || set.contains( "modifiersname" ) ) + if ( returnAllOperationalAttributes || set.contains( SchemaConstants.MODIFIERS_NAME_AT ) ) { - attr = new AttributeImpl( "modifiersName" ); + attr = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT ); AttributeType schemaModifiersNameAT = registries. getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT ); Attribute schemaModifiersName = Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?view=diff&rev=519503&r1=519502&r2=519503 ============================================================================== --- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original) +++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Sat Mar 17 18:38:42 2007 @@ -41,4 +41,5 @@ public static final String CREATE_TIMESTAMP_AT = "createTimestamp"; public static final String OBJECT_CLASSES_AT = "objectClasses"; public static final String MODIFY_TIMESTAMP_AT = "modifyTimestamp"; + public static final String MODIFIERS_NAME_AT = "modifiersName"; }