Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 20257 invoked from network); 31 Mar 2011 23:29:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Mar 2011 23:29:54 -0000 Received: (qmail 69016 invoked by uid 500); 31 Mar 2011 23:29:54 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 68888 invoked by uid 500); 31 Mar 2011 23:29:54 -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 68872 invoked by uid 99); 31 Mar 2011 23:29:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Mar 2011 23:29:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 31 Mar 2011 23:29:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D78BA2388A70; Thu, 31 Mar 2011 23:29:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1087506 [5/6] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/java/org/apache/directory/server/core/entry/ core-a... Date: Thu, 31 Mar 2011 23:29:27 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110331232929.D78BA2388A70@eris.apache.org> Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java Thu Mar 31 23:29:24 2011 @@ -45,7 +45,7 @@ import javax.security.auth.x500.X500Prin import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.x509.X509V1CertificateGenerator; @@ -210,7 +210,7 @@ public class TlsKeyGenerator */ public static void addKeyPair( Entry entry ) throws LdapException { - EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT ); + Attribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT ); if ( objectClass == null ) { @@ -307,7 +307,7 @@ public class TlsKeyGenerator */ public static void addKeyPair( Entry entry, String issuerDN, String subjectDN, String keyAlgo ) throws LdapException { - EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT ); + Attribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT ); if ( objectClass == null ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Thu Mar 31 23:29:24 2011 @@ -30,7 +30,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -158,7 +158,7 @@ public class LdapClassLoader extends Cla if ( configEntry != null ) { List searchContexts = new ArrayList(); - EntryAttribute attr = configEntry.get( "classLoaderDefaultSearchContext" ); + Attribute attr = configEntry.get( "classLoaderDefaultSearchContext" ); for ( Value val : attr ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java Thu Mar 31 23:29:24 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.sp.StoredProcEngine; import org.apache.directory.server.core.sp.StoredProcUtils; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.util.MethodUtils; @@ -54,7 +54,7 @@ public class JavaStoredProcEngine implem */ public Object invokeProcedure( CoreSession session, String fullSPName, Object[] spArgs ) throws LdapException { - EntryAttribute javaByteCode = spUnit.get( "javaByteCode" ); + Attribute javaByteCode = spUnit.get( "javaByteCode" ); String spName = StoredProcUtils.extractStoredProcName( fullSPName ); String className = StoredProcUtils.extractStoredProcUnitName( fullSPName ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java Thu Mar 31 23:29:24 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core.sp.java; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -32,10 +32,10 @@ import org.apache.directory.shared.ldap. */ public class LdapJavaStoredProcClassLoader extends ClassLoader { - private EntryAttribute javaByteCodeAttr; + private Attribute javaByteCodeAttr; - public LdapJavaStoredProcClassLoader( EntryAttribute javaByteCodeAttr ) + public LdapJavaStoredProcClassLoader( Attribute javaByteCodeAttr ) { // Critical call to super class constructor. Required for true plumbing of class loaders. super( LdapJavaStoredProcClassLoader.class.getClassLoader() ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Thu Mar 31 23:29:24 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.filter.AndNode; import org.apache.directory.shared.ldap.model.filter.BranchNode; @@ -53,7 +53,7 @@ public class RefinementEvaluator } - public boolean evaluate( ExprNode node, EntryAttribute objectClasses ) throws LdapException + public boolean evaluate( ExprNode node, Attribute objectClasses ) throws LdapException { if ( node == null ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Thu Mar 31 23:29:24 2011 @@ -24,7 +24,7 @@ import java.util.Iterator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.filter.EqualityNode; import org.apache.directory.shared.ldap.model.filter.SimpleNode; @@ -70,7 +70,7 @@ public class RefinementLeafEvaluator * if it rejects the entry * @throws LdapException */ - public boolean evaluate( SimpleNode node, EntryAttribute objectClasses ) throws LdapException + public boolean evaluate( SimpleNode node, Attribute objectClasses ) throws LdapException { if ( node == null ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Mar 31 23:29:24 2011 @@ -58,7 +58,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.entry.StringValue; @@ -266,7 +266,7 @@ public class SubentryInterceptor extends { Set adminRoles = new HashSet(); - EntryAttribute oc = subentry.get( OBJECT_CLASS_AT ); + Attribute oc = subentry.get( OBJECT_CLASS_AT ); if ( oc == null ) { @@ -325,7 +325,7 @@ public class SubentryInterceptor extends /** * Update all the entries under an AP adding the */ - private void updateEntries( OperationEnum operation, CoreSession session, Dn subentryDn, Dn apDn, SubtreeSpecification ss, Dn baseDn, List operationalAttributes ) throws LdapException + private void updateEntries( OperationEnum operation, CoreSession session, Dn subentryDn, Dn apDn, SubtreeSpecification ss, Dn baseDn, List operationalAttributes ) throws LdapException { ExprNode filter = new PresenceNode( OBJECT_CLASS_AT ); // (objectClass=*) SearchControls controls = new SearchControls(); @@ -398,7 +398,7 @@ public class SubentryInterceptor extends Entry administrationPoint = opContext.lookup( apDn, ByPassConstants.LOOKUP_BYPASS ); // The administrativeRole AT must exist and not be null - EntryAttribute administrativeRole = administrationPoint.get( ADMINISTRATIVE_ROLE_AT ); + Attribute administrativeRole = administrationPoint.get( ADMINISTRATIVE_ROLE_AT ); // check that administrativeRole has something valid in it for us if ( ( administrativeRole == null ) || ( administrativeRole.size() <= 0 ) ) @@ -506,7 +506,7 @@ public class SubentryInterceptor extends for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS ) { ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE; - EntryAttribute opAttr = entry.get( operationalAttribute ); + Attribute opAttr = entry.get( operationalAttribute ); if ( opAttr != null ) { @@ -528,7 +528,7 @@ public class SubentryInterceptor extends for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS ) { ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE; - EntryAttribute opAttr = new DefaultEntryAttribute( operationalAttribute ); + Attribute opAttr = new DefaultEntryAttribute( operationalAttribute ); opAttr.add( subentryDn.getNormName() ); modifications.add( new DefaultModification( op, opAttr ) ); } @@ -545,7 +545,7 @@ public class SubentryInterceptor extends private Set getSubentryTypes( Entry entry, List mods ) throws LdapException { - EntryAttribute ocFinalState = entry.get( OBJECT_CLASS_AT ).clone(); + Attribute ocFinalState = entry.get( OBJECT_CLASS_AT ).clone(); for ( Modification mod : mods ) { @@ -595,7 +595,7 @@ public class SubentryInterceptor extends if ( hasRole ) { - EntryAttribute operational = entry.get( attributeType ).clone(); + Attribute operational = entry.get( attributeType ).clone(); if ( operational == null ) { @@ -634,31 +634,31 @@ public class SubentryInterceptor extends * Gets the subschema operational attributes to be added to or removed from * an entry selected by a subentry's subtreeSpecification. */ - private List getSubentryOperationalAttributes( Dn dn, Subentry subentry ) throws LdapException + private List getSubentryOperationalAttributes( Dn dn, Subentry subentry ) throws LdapException { - List attributes = new ArrayList(); + List attributes = new ArrayList(); if ( subentry.isAccessControlAdminRole() ) { - EntryAttribute accessControlSubentries = new DefaultEntryAttribute( ACCESS_CONTROL_SUBENTRIES_AT, dn.getNormName() ); + Attribute accessControlSubentries = new DefaultEntryAttribute( ACCESS_CONTROL_SUBENTRIES_AT, dn.getNormName() ); attributes.add( accessControlSubentries ); } if ( subentry.isSchemaAdminRole() ) { - EntryAttribute subschemaSubentry = new DefaultEntryAttribute( SUBSCHEMA_SUBENTRY_AT, dn.getNormName() ); + Attribute subschemaSubentry = new DefaultEntryAttribute( SUBSCHEMA_SUBENTRY_AT, dn.getNormName() ); attributes.add( subschemaSubentry ); } if ( subentry.isCollectiveAdminRole() ) { - EntryAttribute collectiveAttributeSubentries = new DefaultEntryAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT, dn.getNormName() ); + Attribute collectiveAttributeSubentries = new DefaultEntryAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT, dn.getNormName() ); attributes.add( collectiveAttributeSubentries ); } if ( subentry.isTriggersAdminRole() ) { - EntryAttribute tiggerExecutionSubentries = new DefaultEntryAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT, dn.getNormName() ); + Attribute tiggerExecutionSubentries = new DefaultEntryAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT, dn.getNormName() ); attributes.add( tiggerExecutionSubentries ); } @@ -686,11 +686,11 @@ public class SubentryInterceptor extends for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS ) { - EntryAttribute opAttr = candidate.get( operationalAttribute ); + Attribute opAttr = candidate.get( operationalAttribute ); if ( ( opAttr != null ) && opAttr.contains( dn ) ) { - EntryAttribute attr = new DefaultEntryAttribute( operationalAttribute, dn ); + Attribute attr = new DefaultEntryAttribute( operationalAttribute, dn ); modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) ); } } @@ -708,17 +708,17 @@ public class SubentryInterceptor extends * selected by the subtree specification. This method calculates the * modify operation to be performed on the entry. */ - private List getOperationalModsForAdd( Entry entry, List operationalAttributes ) throws LdapException + private List getOperationalModsForAdd( Entry entry, List operationalAttributes ) throws LdapException { List modifications = new ArrayList(); - for ( EntryAttribute operationalAttribute : operationalAttributes ) + for ( Attribute operationalAttribute : operationalAttributes ) { - EntryAttribute opAttrInEntry = entry.get( operationalAttribute.getAttributeType() ); + Attribute opAttrInEntry = entry.get( operationalAttribute.getAttributeType() ); if ( ( opAttrInEntry != null ) && ( opAttrInEntry.size() > 0 ) ) { - EntryAttribute newOperationalAttribute = operationalAttribute.clone(); + Attribute newOperationalAttribute = operationalAttribute.clone(); for ( Value value : opAttrInEntry ) { @@ -762,7 +762,7 @@ public class SubentryInterceptor extends for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS ) { ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE; - EntryAttribute opAttr = oldEntry.get( operationalAttribute ); + Attribute opAttr = oldEntry.get( operationalAttribute ); if ( opAttr != null ) { @@ -784,7 +784,7 @@ public class SubentryInterceptor extends for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS ) { ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE; - EntryAttribute opAttr = new DefaultEntryAttribute( operationalAttribute ); + Attribute opAttr = new DefaultEntryAttribute( operationalAttribute ); opAttr.add( subentryDn.getNormName() ); modList.add( new DefaultModification( op, opAttr ) ); } @@ -800,7 +800,7 @@ public class SubentryInterceptor extends */ private void setOperationalAttribute( Entry entry, Dn subentryDn, AttributeType opAttr) throws LdapException { - EntryAttribute operational = entry.get( opAttr ); + Attribute operational = entry.get( opAttr ); if ( operational == null ) { @@ -850,7 +850,7 @@ public class SubentryInterceptor extends */ Subentry subentry = new Subentry(); subentry.setAdministrativeRoles( getSubentryAdminRoles( entry ) ); - List operationalAttributes = getSubentryOperationalAttributes( dn, subentry ); + List operationalAttributes = getSubentryOperationalAttributes( dn, subentry ); /* ---------------------------------------------------------------- * Parse the subtreeSpecification of the subentry and add it to the @@ -1093,7 +1093,7 @@ public class SubentryInterceptor extends // search for all selected entries by the new SS and add references to subentry subentry = subentryCache.getSubentry( dn ); - List operationalAttributes = getSubentryOperationalAttributes( dn, subentry ); + List operationalAttributes = getSubentryOperationalAttributes( dn, subentry ); Dn newBaseDn = apName; newBaseDn = newBaseDn.add( ssNew.getBase() ); @@ -1486,7 +1486,7 @@ public class SubentryInterceptor extends if ( evaluator.evaluate( ss, apDn, dn, entryAttrs ) ) { - EntryAttribute operational; + Attribute operational; if ( subentry.isAccessControlAdminRole() ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Thu Mar 31 23:29:24 2011 @@ -48,7 +48,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException; @@ -131,7 +131,7 @@ public class TriggerInterceptor extends entry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ); } - EntryAttribute subentries = entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ); + Attribute subentries = entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ); if ( subentries == null ) { @@ -157,7 +157,7 @@ public class TriggerInterceptor extends */ private void addEntryTriggerSpecs( List triggerSpecs, Entry entry ) throws LdapException { - EntryAttribute entryTrigger = entry.get( ENTRY_TRIGGER_ATTR ); + Attribute entryTrigger = entry.get( ENTRY_TRIGGER_ATTR ); if ( entryTrigger == null ) { @@ -446,7 +446,7 @@ public class TriggerInterceptor extends .getName() ); Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes(newDn, importedEntry ); - for ( EntryAttribute attribute : importedEntry ) + for ( Attribute attribute : importedEntry ) { fakeImportedEntry.put( attribute ); } @@ -520,7 +520,7 @@ public class TriggerInterceptor extends .getName() ); Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDn, importedEntry ); - for ( EntryAttribute attribute : importedEntry ) + for ( Attribute attribute : importedEntry ) { fakeImportedEntry.put( attribute ); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Thu Mar 31 23:29:24 2011 @@ -45,7 +45,7 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.entry.Value; @@ -145,7 +145,7 @@ public class TriggerSpecCache { ClonedServerEntry resultEntry = results.get(); Dn subentryDn = resultEntry.getDn(); - EntryAttribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR ); + Attribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR ); if ( triggerSpec == null ) { @@ -170,7 +170,7 @@ public class TriggerSpecCache private boolean hasPrescriptiveTrigger( Entry entry ) throws LdapException { // only do something if the entry contains prescriptiveTrigger - EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); + Attribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); return triggerSpec != null; } @@ -179,7 +179,7 @@ public class TriggerSpecCache public void subentryAdded( Dn normName, Entry entry ) throws LdapException { // only do something if the entry contains prescriptiveTrigger - EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); + Attribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); if ( triggerSpec == null ) { Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Thu Mar 31 23:29:24 2011 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem; import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.filter.PresenceNode; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.junit.BeforeClass; @@ -61,8 +61,8 @@ public class MostSpecificProtectedItemFi { private static final Set EMPTY_STRING_COLLECTION = Collections.unmodifiableSet( new HashSet() ); - private static final Set EMPTY_ATTRIBUTE_COLLECTION = Collections - .unmodifiableSet( new HashSet() ); + private static final Set EMPTY_ATTRIBUTE_COLLECTION = Collections + .unmodifiableSet( new HashSet() ); private static final Collection EMPTY_USER_CLASS_COLLECTION = Collections .unmodifiableCollection( new ArrayList() ); Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Thu Mar 31 23:29:24 2011 @@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.AttributeType; @@ -258,7 +258,7 @@ public class RelatedProtectedItemFilterT @Test public void testAttributeValue() throws Exception { - Set attributes = new HashSet(); + Set attributes = new HashSet(); attributes.add( new DefaultEntryAttribute( "cn", CN_AT, "valueA" ) ); Collection tuples = getTuples( new AttributeValueItem( attributes ) ); Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Thu Mar 31 23:29:24 2011 @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; import com.mycila.junit.concurrent.Concurrency; import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.filter.EqualityNode; import org.apache.directory.shared.ldap.model.filter.ExprNode; @@ -141,7 +141,7 @@ public class RefinementEvaluatorTest @Test public void testMatchByName() throws Exception { - EntryAttribute objectClasses = null; + Attribute objectClasses = null; // positive test objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); @@ -162,7 +162,7 @@ public class RefinementEvaluatorTest @Test public void testMatchByOID() throws Exception { - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); // positive test assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) ); @@ -183,7 +183,7 @@ public class RefinementEvaluatorTest public void testComplexOrRefinement() throws Exception { ExprNode refinement = null; - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); String refStr = "(|(objectClass=person)(objectClass=organizationalUnit))"; refinement = FilterParser.parse( schemaManager, refStr ); @@ -202,7 +202,7 @@ public class RefinementEvaluatorTest public void testComplexAndRefinement() throws Exception { ExprNode refinement = null; - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); objectClasses.add( "organizationalUnit" ); String refStr = "(&(objectClass=person)(objectClass=organizationalUnit))"; @@ -225,7 +225,7 @@ public class RefinementEvaluatorTest public void testComplexNotRefinement() throws Exception { ExprNode refinement = null; - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); String refStr = "(!(objectClass=person))"; refinement = FilterParser.parse( schemaManager, refStr ); Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Thu Mar 31 23:29:24 2011 @@ -28,7 +28,7 @@ import com.mycila.junit.concurrent.Concu import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.filter.EqualityNode; @@ -108,7 +108,7 @@ public class RefinementLeafEvaluatorTest @Test public void testForBadArguments() throws Exception { - EntryAttribute objectClasses = null; + Attribute objectClasses = null; try { @@ -163,7 +163,7 @@ public class RefinementLeafEvaluatorTest public void testMatchByName() throws Exception { // positive test - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) ); objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT ); @@ -183,7 +183,7 @@ public class RefinementLeafEvaluatorTest @Test public void testMatchByOID() throws Exception { - EntryAttribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); + Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" ); // positive test assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) ); Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original) +++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Mar 31 23:29:24 2011 @@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.entry.StringValue; @@ -233,7 +233,7 @@ public class KeyDerivationInterceptor ex } } - EntryAttribute attr = mod.getAttribute(); + Attribute attr = mod.getAttribute(); if ( SchemaConstants.USER_PASSWORD_AT_OID.equals( attr.getAttributeType().getOid() ) ) { @@ -300,7 +300,7 @@ public class KeyDerivationInterceptor ex throw new LdapAuthenticationException( I18n.err( I18n.ERR_512, principalDn ) ); } - EntryAttribute objectClass = ((ClonedServerEntry)userEntry).getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT ); + Attribute objectClass = ((ClonedServerEntry)userEntry).getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT ); if ( !objectClass.contains( SchemaConstants.KRB5_PRINCIPAL_OC ) ) { @@ -314,13 +314,13 @@ public class KeyDerivationInterceptor ex if ( subContext.getPrincipalName() == null ) { - EntryAttribute principalAttribute = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ); + Attribute principalAttribute = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ); String principalName = principalAttribute.getString(); subContext.setPrincipalName( principalName ); log.debug( "Found principal '{}' from lookup.", principalName ); } - EntryAttribute keyVersionNumberAttr = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ); + Attribute keyVersionNumberAttr = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ); if ( keyVersionNumberAttr == null ) { @@ -384,7 +384,7 @@ public class KeyDerivationInterceptor ex schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ), Integer.toString( kvno ) ) ) ); - EntryAttribute attribute = getKeyAttribute( modContext.getSession() + Attribute attribute = getKeyAttribute( modContext.getSession() .getDirectoryService().getSchemaManager(), keys ); newModsList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute ) ); @@ -392,9 +392,9 @@ public class KeyDerivationInterceptor ex } - private EntryAttribute getKeyAttribute( SchemaManager schemaManager, Map keys ) throws LdapException + private Attribute getKeyAttribute( SchemaManager schemaManager, Map keys ) throws LdapException { - EntryAttribute keyAttribute = + Attribute keyAttribute = new DefaultEntryAttribute( KerberosAttribute.KRB5_KEY_AT, schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_AT ) ); Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Thu Mar 31 23:29:24 2011 @@ -38,7 +38,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.cursor.Tuple; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -403,7 +403,7 @@ public class JdbmStore extends Abstra Long id = tuple.getKey(); Entry entry = tuple.getValue(); - EntryAttribute entryAttr = entry.get( atType ); + Attribute entryAttr = entry.get( atType ); if( entryAttr != null ) { for ( Value value : entryAttr ) Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Thu Mar 31 23:29:24 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.name.Dn; @@ -138,7 +138,7 @@ public class ServerEntrySerializer imple out.writeUTF( oid ); // Get the attribute - EntryAttribute attribute = entry.get( attributeType );; + Attribute attribute = entry.get( attributeType );; // Write the attribute attribute.writeExternal( out ); @@ -210,7 +210,7 @@ public class ServerEntrySerializer imple AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid ); // Create the attribute we will read - EntryAttribute attribute = new DefaultEntryAttribute( attributeType ); + Attribute attribute = new DefaultEntryAttribute( attributeType ); // Read the attribute attribute.readExternal( in ); Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Thu Mar 31 23:29:24 2011 @@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; @@ -696,7 +696,7 @@ public class JdbmStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); attrib.add( "Engineering" ); Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib ); @@ -791,7 +791,7 @@ public class JdbmStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, SN_AT ); + Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, SN_AT ); String attribVal = "Walker"; attrib.add( attribVal ); @@ -821,7 +821,7 @@ public class JdbmStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); + Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); String attribVal = "Johnny"; attrib.add( attribVal ); @@ -852,7 +852,7 @@ public class JdbmStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); + Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib ); mods.add( add ); @@ -890,7 +890,7 @@ public class JdbmStoreTest store.add( entry ); List mods = new ArrayList(); - EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); String attribVal = "Marketing"; attrib.add( attribVal ); Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Thu Mar 31 23:29:24 2011 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; @@ -261,7 +261,7 @@ public class ServerEntrySerializerTest Entry entry = new DefaultEntry( schemaManager, dn ); ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager ); - EntryAttribute oc = new DefaultEntryAttribute( "ObjectClass", schemaManager + Attribute oc = new DefaultEntryAttribute( "ObjectClass", schemaManager .lookupAttributeTypeRegistry( "objectclass" ) ); entry.add( oc ); Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Thu Mar 31 23:29:24 2011 @@ -33,7 +33,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.SamType; import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.apache.directory.shared.kerberos.exceptions.KerberosException; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -280,7 +280,7 @@ public class PrincipalStoreEntryModifier * @throws LdapException * @throws IOException */ - public Map reconstituteKeyMap( EntryAttribute krb5key ) throws KerberosException, LdapException + public Map reconstituteKeyMap( Attribute krb5key ) throws KerberosException, LdapException { Map map = new HashMap(); Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Thu Mar 31 23:29:24 2011 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.name.Dn; @@ -77,11 +77,11 @@ public class ChangePassword implements D List mods = new ArrayList(2); - EntryAttribute newPasswordAttribute = new DefaultEntryAttribute( + Attribute newPasswordAttribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), Strings.getBytesUtf8(newPassword) ); mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) ); - EntryAttribute principalAttribute = new DefaultEntryAttribute( + Attribute principalAttribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() ); mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) ); Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Thu Mar 31 23:29:24 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.apache.directory.shared.kerberos.exceptions.KerberosException; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; @@ -134,7 +134,7 @@ public class GetPrincipal implements Dir if ( entry.get( KerberosAttribute.KRB5_KEY_AT ) != null ) { - EntryAttribute krb5key = entry.get( KerberosAttribute.KRB5_KEY_AT ); + Attribute krb5key = entry.get( KerberosAttribute.KRB5_KEY_AT ); try { Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Thu Mar 31 23:29:24 2011 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; @@ -163,7 +163,7 @@ public class ClientModifyRequestTest ext connection.modify( modifyRequest ); lookupEntry = session.lookup( dn ); - EntryAttribute giveName = lookupEntry.get( "givenName" ); + Attribute giveName = lookupEntry.get( "givenName" ); assertNull( giveName ); } Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Thu Mar 31 23:29:24 2011 @@ -59,7 +59,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -355,7 +355,7 @@ public class SingleFileLdifPartitionTest List modItems = new ArrayList(); - EntryAttribute attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); + Attribute attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); attribute.add( "this is description" ); Modification mod = new DefaultModification(); @@ -791,7 +791,7 @@ public class SingleFileLdifPartitionTest Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) ); assertNotNull( entry ); - EntryAttribute dc = entry.get( "dc" ); + Attribute dc = entry.get( "dc" ); assertFalse( dc.contains( "child1" ) ); assertTrue( dc.contains( "movedChild1" ) ); } @@ -818,7 +818,7 @@ public class SingleFileLdifPartitionTest Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) ); assertNotNull( entry ); - EntryAttribute dc = entry.get( "dc" ); + Attribute dc = entry.get( "dc" ); assertTrue( dc.contains( "child1" ) ); assertTrue( dc.contains( "movedChild1" ) ); } @@ -934,7 +934,7 @@ public class SingleFileLdifPartitionTest List modItems = new ArrayList(); - EntryAttribute attribute = new DefaultEntryAttribute( + Attribute attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); Modification mod = new DefaultModification(); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Thu Mar 31 23:29:24 2011 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapOperationException; @@ -827,7 +827,7 @@ public class SearchHandler extends LdapR */ private Response generateResponse( LdapSession session, SearchRequest req, Entry entry ) throws Exception { - EntryAttribute ref = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get( SchemaConstants.REF_AT ); + Attribute ref = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get( SchemaConstants.REF_AT ); boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaIT.OID ); if ( ( ref != null ) && !hasManageDsaItControl ) @@ -1232,7 +1232,7 @@ public class SearchHandler extends LdapR result.setErrorMessage( "Encountered referral attempting to handle request." ); result.setMatchedDn( req.getBase() ); - EntryAttribute refAttr = entry.getOriginalEntry().get( SchemaConstants.REF_AT ); + Attribute refAttr = entry.getOriginalEntry().get( SchemaConstants.REF_AT ); for ( Value refval : refAttr ) { @@ -1358,7 +1358,7 @@ public class SearchHandler extends LdapR { LOG.debug( "Inside getReferralOnAncestor()" ); - EntryAttribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT ); + Attribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT ); Referral referral = new ReferralImpl(); for ( Value value : refAttr ) @@ -1430,7 +1430,7 @@ public class SearchHandler extends LdapR { LOG.debug( "Inside getReferralOnAncestor()" ); - EntryAttribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT ); + Attribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT ); Referral referral = new ReferralImpl(); for ( Value value : refAttr ) Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Thu Mar 31 23:29:24 2011 @@ -39,7 +39,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.ldap.LdapSession; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapOperationException; import org.apache.directory.shared.ldap.model.message.BindRequest; import org.apache.directory.shared.ldap.model.message.Control; @@ -129,7 +129,7 @@ public abstract class AbstractSaslCallba * @param realm The realm. * @return The Password entry attribute resulting from the lookup. It may contain more than one password */ - protected abstract EntryAttribute lookupPassword( String username, String realm ); + protected abstract Attribute lookupPassword( String username, String realm ); /** @@ -178,7 +178,7 @@ public abstract class AbstractSaslCallba else if ( callback instanceof PasswordCallback ) { PasswordCallback passwordCB = ( PasswordCallback ) callback; - EntryAttribute userPassword = lookupPassword( getUsername(), getRealm() ); + Attribute userPassword = lookupPassword( getUsername(), getRealm() ); if ( userPassword != null ) { Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Thu Mar 31 23:29:24 2011 @@ -35,7 +35,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.SaslConstants; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; @@ -78,7 +78,7 @@ public class CramMd5CallbackHandler exte } - protected EntryAttribute lookupPassword( String username, String realm ) + protected Attribute lookupPassword( String username, String realm ) { try { Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Thu Mar 31 23:29:24 2011 @@ -35,7 +35,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.SaslConstants; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; @@ -80,7 +80,7 @@ public class DigestMd5CallbackHandler ex // TODO - should return not be a byte[] - protected EntryAttribute lookupPassword( String username, String realm ) + protected Attribute lookupPassword( String username, String realm ) { try { Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Thu Mar 31 23:29:24 2011 @@ -32,7 +32,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler; import org.apache.directory.server.ldap.handlers.bind.SaslConstants; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.message.BindRequest; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.util.StringConstants; @@ -63,7 +63,7 @@ public class GssapiCallbackHandler exten } - protected EntryAttribute lookupPassword( String username, String password ) + protected Attribute lookupPassword( String username, String password ) { // do nothing, password not used by GSSAPI return null; Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java Thu Mar 31 23:29:24 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; @@ -125,7 +125,7 @@ public class ReplicaDitStoreUtil { List mods = modMap.get( replica.getId() ); - EntryAttribute lastSentCsnAt = null; + Attribute lastSentCsnAt = null; if ( mods == null ) { lastSentCsnAt = new DefaultEntryAttribute( schemaManager Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Thu Mar 31 23:29:24 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -230,7 +230,7 @@ public class ReplicaEventMessage impleme // here, to be able to restore it in the readExternal : // we need access to the registries, which are not available // in the ServerAttribute class. - Iterator attrItr = entry.iterator(); + Iterator attrItr = entry.iterator(); while ( attrItr.hasNext() ) { Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Thu Mar 31 23:29:24 2011 @@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -184,7 +184,7 @@ public class SyncReplConsumer implements ENTRY_UUID_ATOP_SET.add( new AttributeTypeOptions( ENTRY_UUID_AT ) ); COOKIE_AT_TYPE = schemaManager.lookupAttributeTypeRegistry( "ads-replCookie" ); - EntryAttribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); + Attribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); Modification cookieMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, cookieAttr ); cookieModLst = new ArrayList( 1 ); @@ -632,7 +632,7 @@ public class SyncReplConsumer implements } else { - EntryAttribute attr = cookieModLst.get( 0 ).getAttribute(); + Attribute attr = cookieModLst.get( 0 ).getAttribute(); attr.clear(); attr.add( syncCookie ); @@ -681,7 +681,7 @@ public class SyncReplConsumer implements { COOKIE_AT_TYPE.getName() } ); if ( entry != null ) { - EntryAttribute attr = entry.get( COOKIE_AT_TYPE ); + Attribute attr = entry.get( COOKIE_AT_TYPE ); if ( attr != null ) { syncCookie = attr.getBytes(); @@ -722,7 +722,7 @@ public class SyncReplConsumer implements { try { - EntryAttribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); + Attribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); Modification deleteCookieMod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, cookieAttr ); List deleteModLst = new ArrayList(); @@ -790,14 +790,14 @@ public class SyncReplConsumer implements remoteEntry.removeAttributes( MOD_IGNORE_AT ); List mods = new ArrayList(); - Iterator itr = localEntry.iterator(); + Iterator itr = localEntry.iterator(); while ( itr.hasNext() ) { - EntryAttribute localAttr = itr.next(); + Attribute localAttr = itr.next(); String attrId = localAttr.getId(); Modification mod; - EntryAttribute remoteAttr = remoteEntry.get( attrId ); + Attribute remoteAttr = remoteEntry.get( attrId ); if ( remoteAttr != null ) // would be better if we compare the values also? or will it consume more time? { Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Thu Mar 31 23:29:24 2011 @@ -60,7 +60,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.Csn; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -566,7 +566,7 @@ public class SyncReplProvider implements SyncStateTypeEnum syncStateType ) throws Exception { - EntryAttribute uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ); + Attribute uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ); SyncStateValueDecorator syncStateControl = new SyncStateValueDecorator( ldapServer.getDirectoryService().getLdapCodecService() ); syncStateControl.setSyncStateType( syncStateType ); @@ -591,7 +591,7 @@ public class SyncReplProvider implements SyncModifyDnDecorator modDnControl ) throws Exception { - EntryAttribute uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ); + Attribute uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ); SyncStateValueDecorator syncStateControl = new SyncStateValueDecorator( ldapServer.getDirectoryService().getLdapCodecService() ); syncStateControl.setSyncStateType( SyncStateTypeEnum.MODDN ); @@ -608,7 +608,7 @@ public class SyncReplProvider implements private Response generateResponse( LdapSession session, SearchRequest req, Entry entry ) throws Exception { - EntryAttribute ref = entry.get( SchemaConstants.REF_AT ); + Attribute ref = entry.get( SchemaConstants.REF_AT ); boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaIT.OID ); if ( ( ref != null ) && !hasManageDsaItControl ) Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original) +++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Thu Mar 31 23:29:24 2011 @@ -29,7 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.model.message.SearchScope; @@ -66,7 +66,7 @@ public class GetCatalog implements Direc Entry result = list.get(); String name = null; - EntryAttribute attribute = result.get( ApacheSchemaConstants.APACHE_CATALOGUE_ENTRY_NAME_AT ); + Attribute attribute = result.get( ApacheSchemaConstants.APACHE_CATALOGUE_ENTRY_NAME_AT ); if ( attribute != null ) { Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original) +++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Thu Mar 31 23:29:24 2011 @@ -45,7 +45,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.search.SearchEngine; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.StringValue; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -121,7 +121,7 @@ public class ConfigPartitionReader * Fnd the upper objectclass in a hierarchy. All the inherited ObjectClasses * will be removed. */ - private ObjectClass findObjectClass( EntryAttribute objectClass ) throws Exception + private ObjectClass findObjectClass( Attribute objectClass ) throws Exception { Set candidates = new HashSet(); @@ -277,7 +277,7 @@ public class ConfigPartitionReader /** * Read the single entry value for an AttributeType, and feed the Bean field with this value */ - private void readSingleValueField( AdsBaseBean bean, Field beanField, EntryAttribute fieldAttr, boolean mandatory ) + private void readSingleValueField( AdsBaseBean bean, Field beanField, Attribute fieldAttr, boolean mandatory ) throws ConfigurationException { if ( fieldAttr == null ) @@ -342,7 +342,7 @@ public class ConfigPartitionReader /** * Read the multiple entry value for an AttributeType, and feed the Bean field with this value */ - private void readMultiValuedField( AdsBaseBean bean, Field beanField, EntryAttribute fieldAttr, boolean mandatory ) + private void readMultiValuedField( AdsBaseBean bean, Field beanField, Attribute fieldAttr, boolean mandatory ) throws ConfigurationException { if ( fieldAttr == null ) @@ -502,7 +502,7 @@ public class ConfigPartitionReader beanField.setAccessible( true ); // Get the entry attribute for this field - EntryAttribute fieldAttr = entry.get( fieldName ); + Attribute fieldAttr = entry.get( fieldName ); if ( ( fieldAttr == null ) && ( mandatory ) ) { @@ -760,7 +760,7 @@ public class ConfigPartitionReader // Let's instanciate the bean we need. The upper ObjectClass's name // will be used to do that - EntryAttribute objectClassAttr = entry.get( SchemaConstants.OBJECT_CLASS_AT ); + Attribute objectClassAttr = entry.get( SchemaConstants.OBJECT_CLASS_AT ); ObjectClass objectClass = findObjectClass( objectClassAttr ); AdsBaseBean bean = createBean( objectClass ); Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original) +++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Thu Mar 31 23:29:24 2011 @@ -34,7 +34,7 @@ import org.apache.directory.server.confi import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.ldif.LdifEntry; @@ -563,7 +563,7 @@ public class ConfigWriter if ( o != null ) { // Getting the attribute from the entry - EntryAttribute attribute = entry.get( attributeType ); + Attribute attribute = entry.get( attributeType ); // If no attribute has been found, we need to create it and add it to the entry if ( attribute == null ) @@ -603,7 +603,7 @@ public class ConfigWriter * @param value * the value */ - private void addAttributeTypeValue( EntryAttribute attribute, Object value ) throws LdapException + private void addAttributeTypeValue( Attribute attribute, Object value ) throws LdapException { // We don't store a 'null' value if ( value != null ) Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java Thu Mar 31 23:29:24 2011 @@ -32,7 +32,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.EntryAttribute; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.apache.directory.shared.ldap.model.message.AddResponse; import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; @@ -155,7 +155,7 @@ public class AdministrativePointAddIT ex } - private EntryAttribute getAdminRole( String dn ) throws Exception + private Attribute getAdminRole( String dn ) throws Exception { Entry lookup = connection.lookup( dn, "administrativeRole" );