From commits-return-31595-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Apr 01 00:09:28 2011 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 83549 invoked from network); 1 Apr 2011 00:09:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Apr 2011 00:09:27 -0000 Received: (qmail 11654 invoked by uid 500); 1 Apr 2011 00:09:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 11607 invoked by uid 500); 1 Apr 2011 00:09:26 -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 11600 invoked by uid 99); 1 Apr 2011 00:09:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2011 00:09:26 +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; Fri, 01 Apr 2011 00:09:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 18746238890A; Fri, 1 Apr 2011 00:09:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1087516 [3/3] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/entry/ core-api/src/main/java/org/apache/directory/server/core/schema/ core-api/src/test/java/org/apache/directory/server/core/entry/ cor... Date: Fri, 01 Apr 2011 00:09:03 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110401000904.18746238890A@eris.apache.org> 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -59,7 +59,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.exceptions.KerberosException; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.BinaryValue; -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; 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.Attribute; @@ -372,14 +372,14 @@ public class KeyDerivationInterceptor ex newModsList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, - new DefaultEntryAttribute( + new DefaultAttribute( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principalName ) ) ); newModsList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, - new DefaultEntryAttribute( + new DefaultAttribute( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT, schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ), Integer.toString( kvno ) ) ) ); @@ -395,7 +395,7 @@ public class KeyDerivationInterceptor ex private Attribute getKeyAttribute( SchemaManager schemaManager, Map keys ) throws LdapException { Attribute keyAttribute = - new DefaultEntryAttribute( KerberosAttribute.KRB5_KEY_AT, + new DefaultAttribute( KerberosAttribute.KRB5_KEY_AT, schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_AT ) ); for ( EncryptionKey encryptionKey : keys.values() ) 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -29,7 +29,7 @@ import jdbm.helper.Serializer; import org.apache.directory.server.i18n.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.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -210,7 +210,7 @@ public class ServerEntrySerializer imple AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid ); // Create the attribute we will read - Attribute attribute = new DefaultEntryAttribute( attributeType ); + Attribute attribute = new DefaultAttribute( 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.Cursor; 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.DefaultAttribute; 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.Attribute; @@ -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(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( 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(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, SN_AT ); + Attribute attrib = new DefaultAttribute( 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(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); + Attribute attrib = new DefaultAttribute( 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(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT ); + Attribute attrib = new DefaultAttribute( 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(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -30,7 +30,7 @@ import java.util.Map; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; 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.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; @@ -261,7 +261,7 @@ public class ServerEntrySerializerTest Entry entry = new DefaultEntry( schemaManager, dn ); ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager ); - Attribute oc = new DefaultEntryAttribute( "ObjectClass", schemaManager + Attribute oc = new DefaultAttribute( "ObjectClass", schemaManager .lookupAttributeTypeRegistry( "objectclass" ) ); entry.add( oc ); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -29,7 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation; 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.DefaultAttribute; 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.Attribute; @@ -77,11 +77,11 @@ public class ChangePassword implements D List mods = new ArrayList(2); - Attribute newPasswordAttribute = new DefaultEntryAttribute( + Attribute newPasswordAttribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), Strings.getBytesUtf8(newPassword) ); mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) ); - Attribute principalAttribute = new DefaultEntryAttribute( + Attribute principalAttribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() ); mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) ); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.constants.SchemaConstants; 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.DefaultEntryAttribute; +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; 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.Attribute; @@ -355,7 +355,7 @@ public class SingleFileLdifPartitionTest List modItems = new ArrayList(); - Attribute attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); + Attribute attribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); attribute.add( "this is description" ); Modification mod = new DefaultModification(); @@ -377,7 +377,7 @@ public class SingleFileLdifPartitionTest modItems = new ArrayList(); - attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); + attribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); attribute.add( "siht si noitpircsed" ); // reversed "this is description" mod = new DefaultModification(); @@ -413,7 +413,7 @@ public class SingleFileLdifPartitionTest modItems = new ArrayList(); - attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); + attribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); attribute.add( "desc of entry1" ); // reversed "this is description" mod = new DefaultModification(); @@ -448,7 +448,7 @@ public class SingleFileLdifPartitionTest modItems = new ArrayList(); - attribute = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); + attribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); attribute.add( "desc of entry1" ); // reversed "this is description" mod = new DefaultModification(); @@ -934,7 +934,7 @@ public class SingleFileLdifPartitionTest List modItems = new ArrayList(); - Attribute attribute = new DefaultEntryAttribute( + Attribute attribute = new DefaultAttribute( schemaManager.lookupAttributeTypeRegistry( "description" ) ); Modification mod = new DefaultModification(); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -34,7 +34,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.Cursor; 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.DefaultAttribute; 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.Attribute; @@ -128,7 +128,7 @@ public class ReplicaDitStoreUtil Attribute lastSentCsnAt = null; if ( mods == null ) { - lastSentCsnAt = new DefaultEntryAttribute( schemaManager + lastSentCsnAt = new DefaultAttribute( schemaManager .lookupAttributeTypeRegistry( "ads-replLastSentCsn" ) ); lastSentCsnAt.add( replica.getLastSentCsn() ); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType; import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnDecorator; 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.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; @@ -170,7 +170,7 @@ public class ReplicaEventMessage impleme AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid ); // Create the attribute we will read - DefaultEntryAttribute attribute = new DefaultEntryAttribute( attributeType ); + DefaultAttribute attribute = new DefaultAttribute( attributeType ); // Read the attribute attribute.readExternal( in ); @@ -234,7 +234,7 @@ public class ReplicaEventMessage impleme while ( attrItr.hasNext() ) { - DefaultEntryAttribute attribute = ( DefaultEntryAttribute ) attrItr.next(); + DefaultAttribute attribute = ( DefaultAttribute ) attrItr.next(); // Write the oid to be able to restore the AttributeType when deserializing // the attribute out.writeUTF( attribute.getAttributeType().getOid() ); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; 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.DefaultAttribute; 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.Attribute; @@ -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" ); - Attribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); + Attribute cookieAttr = new DefaultAttribute( COOKIE_AT_TYPE ); Modification cookieMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, cookieAttr ); cookieModLst = new ArrayList( 1 ); @@ -722,7 +722,7 @@ public class SyncReplConsumer implements { try { - Attribute cookieAttr = new DefaultEntryAttribute( COOKIE_AT_TYPE ); + Attribute cookieAttr = new DefaultAttribute( COOKIE_AT_TYPE ); Modification deleteCookieMod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, cookieAttr ); List deleteModLst = new ArrayList(); 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=1087516&r1=1087515&r2=1087516&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 Fri Apr 1 00:09:01 2011 @@ -33,7 +33,7 @@ import java.util.Set; import org.apache.directory.server.config.beans.AdsBaseBean; 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.DefaultAttribute; 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; @@ -568,7 +568,7 @@ public class ConfigWriter // If no attribute has been found, we need to create it and add it to the entry if ( attribute == null ) { - attribute = new DefaultEntryAttribute( attributeType ); + attribute = new DefaultAttribute( attributeType ); entry.addAttribute( attribute ); } Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java Fri Apr 1 00:09:01 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; 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.Attribute; @@ -302,7 +302,7 @@ public class AdministrativePointModifyDe // Remove the AAP Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, - new DefaultEntryAttribute( "administrativeRole" ) ); + new DefaultAttribute( "administrativeRole" ) ); ModifyResponse response = connection.modify( "ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system", modification ); // Should fail, as we have a TE IAP below Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java Fri Apr 1 00:09:01 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; 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.Attribute; @@ -300,10 +300,10 @@ public class AdministrativePointModifyIT // Remove the AAP Modification modificationDelAap = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, - new DefaultEntryAttribute( "administrativeRole" ) ); + new DefaultAttribute( "administrativeRole" ) ); // Add the SAP Modification modificationAddSap = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, - new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) ); + new DefaultAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) ); ModifyResponse response = connection.modify( "ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system", modificationDelAap, modificationAddSap ); assertNotNull( response ); Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Fri Apr 1 00:09:01 2011 @@ -85,7 +85,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.entry.Attribute; 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.DefaultAttribute; 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.Modification; @@ -1175,7 +1175,7 @@ public class AddIT extends AbstractLdapT sb.append( "0123456789ABCDEF" ); } - Attribute description = new DefaultEntryAttribute( "description", sb.toString() ); + Attribute description = new DefaultAttribute( "description", sb.toString() ); try { Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original) +++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Fri Apr 1 00:09:01 2011 @@ -53,7 +53,7 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ntp.NtpServer; 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.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; @@ -649,7 +649,7 @@ public class ApacheDsService if ( !uuidChecker.isValidSyntax( uuid ) ) { - uuidAt = new DefaultEntryAttribute( atType, UUID.randomUUID().toString() ); + uuidAt = new DefaultAttribute( atType, UUID.randomUUID().toString() ); } Modification uuidMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, uuidAt ); @@ -661,7 +661,7 @@ public class ApacheDsService if ( !csnChecker.isValidSyntax( csn ) ) { - csnAt = new DefaultEntryAttribute( atType, dirService.getCSN().toString() ); + csnAt = new DefaultAttribute( atType, dirService.getCSN().toString() ); } Modification csnMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, csnAt ); @@ -673,7 +673,7 @@ public class ApacheDsService if ( ( creator.length() == 0 ) || ( !Dn.isValid(creator) ) ) { - creatorAt = new DefaultEntryAttribute( atType, adminDn ); + creatorAt = new DefaultAttribute( atType, adminDn ); } Modification creatorMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, creatorAt ); @@ -685,7 +685,7 @@ public class ApacheDsService if ( !timeChecker.isValidSyntax( createdTime ) ) { - createdTimeAt = new DefaultEntryAttribute( atType, DateUtils.getGeneralizedTime() ); + createdTimeAt = new DefaultAttribute( atType, DateUtils.getGeneralizedTime() ); } Modification createdMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, createdTimeAt ); Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Fri Apr 1 00:09:01 2011 @@ -37,7 +37,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.model.constants.SchemaConstants; 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.DefaultEntryAttribute; +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; 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.Attribute; @@ -170,7 +170,7 @@ public class AbstractStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) ); String attribVal = "uidObject"; @@ -203,7 +203,7 @@ public class AbstractStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( SchemaConstants.OU_AT, OU_AT ); String attribVal = "sales"; attrib.add( attribVal ); @@ -237,7 +237,7 @@ public class AbstractStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( SchemaConstants.OU_AT, OU_AT ); Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib ); mods.add( add ); @@ -270,7 +270,7 @@ public class AbstractStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) ); String attribVal = "person"; @@ -303,7 +303,7 @@ public class AbstractStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) ); Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib ); @@ -333,7 +333,7 @@ public class AbstractStoreTest List mods = new ArrayList(); AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT ); - Attribute attrib = new DefaultEntryAttribute( csnAt ); + Attribute attrib = new DefaultAttribute( csnAt ); CsnFactory csnF = new CsnFactory( 0 ); String csn = csnF.newInstance().toString(); Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Fri Apr 1 00:09:01 2011 @@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.Cursor; 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.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.name.Dn; @@ -208,7 +208,7 @@ public class StoreUtils if ( attr == null ) { - attr = new DefaultEntryAttribute( attrId ); + attr = new DefaultAttribute( attrId ); } attr.add( val ); @@ -236,7 +236,7 @@ public class StoreUtils if ( attr == null ) { - attr = new DefaultEntryAttribute( valStr ); + attr = new DefaultAttribute( valStr ); } attr.add( rec.getId().toString() ); @@ -251,7 +251,7 @@ public class StoreUtils recordForward.setId( id ); children.before( longRecordForward ); - Attribute childAttr = new DefaultEntryAttribute( "_child" ); + Attribute childAttr = new DefaultAttribute( "_child" ); entry.put( childAttr ); while ( children.next() ) Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Fri Apr 1 00:09:01 2011 @@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.Cursor; 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.DefaultAttribute; 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.Attribute; @@ -598,7 +598,7 @@ public class AvlStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( SchemaConstants.OU_AT, OU_AT ); attrib.add( "Engineering" ); Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib ); @@ -692,7 +692,7 @@ public class AvlStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.SURNAME_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.SURNAME_AT ) ); String attribVal = "Walker"; @@ -723,7 +723,7 @@ public class AvlStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.SN_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) ); String attribVal = "Johnny"; @@ -755,7 +755,7 @@ public class AvlStoreTest Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager + Attribute attrib = new DefaultAttribute( SchemaConstants.SN_AT, schemaManager .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) ); Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib ); @@ -794,7 +794,7 @@ public class AvlStoreTest store.add( entry ); List mods = new ArrayList(); - Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT ); + Attribute attrib = new DefaultAttribute( SchemaConstants.OU_AT, OU_AT ); String attribVal = "Marketing"; attrib.add( attribVal );