From commits-return-25656-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Apr 28 08:46:18 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 93854 invoked from network); 28 Apr 2010 08:46:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Apr 2010 08:46:18 -0000 Received: (qmail 7825 invoked by uid 500); 28 Apr 2010 08:46:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 7786 invoked by uid 500); 28 Apr 2010 08:46:17 -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 7779 invoked by uid 99); 28 Apr 2010 08:46:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 08:46:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 08:46:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2AF2E2388B1B; Wed, 28 Apr 2010 08:44:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938820 [6/10] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-annota... Date: Wed, 28 Apr 2010 08:44:47 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100428084501.2AF2E2388B1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Wed Apr 28 08:44:42 2010 @@ -27,7 +27,7 @@ import javax.naming.NamingException; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.interceptor.context.OperationContext; import org.apache.directory.server.core.partition.ByPassConstants; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. public class DeleteStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector { private DN deletedEntryName; - private ServerEntry deletedEntry; + private Entry deletedEntry; public DeleteStoredProcedureParameterInjector( OperationContext opContext, DN deletedEntryName ) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Wed Apr 28 08:44:42 2010 @@ -29,7 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.OperationContext; import org.apache.directory.server.core.partition.ByPassConstants; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.DN; @@ -40,7 +40,7 @@ public class ModifyStoredProcedureParame { private DN modifiedEntryName; private List modifications; - private ServerEntry oldEntry; + private Entry oldEntry; public ModifyStoredProcedureParameterInjector( ModifyOperationContext opContext ) throws Exception 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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010 @@ -48,7 +48,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapOperationErrorException; import org.apache.directory.shared.ldap.exception.LdapOtherException; @@ -115,7 +115,7 @@ public class TriggerInterceptor extends * @param proxy the partition nexus proxy */ private void addPrescriptiveTriggerSpecs( OperationContext opContext, List triggerSpecs, - DN dn, ServerEntry entry ) throws Exception + DN dn, Entry entry ) throws Exception { /* @@ -158,7 +158,7 @@ public class TriggerInterceptor extends * @param entry the target entry that is considered as the trigger source * @throws Exception if there are problems accessing attribute values */ - private void addEntryTriggerSpecs( List triggerSpecs, ServerEntry entry ) throws Exception + private void addEntryTriggerSpecs( List triggerSpecs, Entry entry ) throws Exception { EntryAttribute entryTrigger = entry.get( ENTRY_TRIGGER_ATTR ); @@ -258,7 +258,7 @@ public class TriggerInterceptor extends public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception { DN name = addContext.getDn(); - ServerEntry entry = addContext.getEntry(); + Entry entry = addContext.getEntry(); // Bypass trigger handling if the service is disabled. if ( !enabled ) @@ -369,7 +369,7 @@ public class TriggerInterceptor extends } // Gather supplementary data. - ServerEntry renamedEntry = (ServerEntry)renameContext.getEntry().getClonedEntry(); + Entry renamedEntry = (Entry)renameContext.getEntry().getClonedEntry(); // @TODO : To be completely reviewed !!! DN oldRDN = new DN( name.getRdn().getName() ); @@ -448,7 +448,7 @@ public class TriggerInterceptor extends // at least with minimal requirements which are object class // and access control subentry operational attributes. SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() ); - ServerEntry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry ); + Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry ); for ( EntryAttribute attribute:importedEntry ) { @@ -523,7 +523,7 @@ public class TriggerInterceptor extends // at least with minimal requirements which are object class // and access control subentry operational attributes. SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() ); - ServerEntry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry ); + Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry ); for ( EntryAttribute attribute:importedEntry ) { 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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010 @@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; @@ -157,7 +157,7 @@ public class TriggerSpecCache } - private boolean hasPrescriptiveTrigger( ServerEntry entry ) throws Exception + private boolean hasPrescriptiveTrigger( Entry entry ) throws Exception { // only do something if the entry contains prescriptiveTrigger EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); @@ -166,7 +166,7 @@ public class TriggerSpecCache } - public void subentryAdded( DN normName, ServerEntry entry ) throws Exception + public void subentryAdded( DN normName, Entry entry ) throws Exception { // only do something if the entry contains prescriptiveTrigger EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR ); @@ -199,7 +199,7 @@ public class TriggerSpecCache } - public void subentryDeleted( DN normName, ServerEntry entry ) throws Exception + public void subentryDeleted( DN normName, Entry entry ) throws Exception { if ( !hasPrescriptiveTrigger( entry ) ) { @@ -210,7 +210,7 @@ public class TriggerSpecCache } - public void subentryModified( ModifyOperationContext opContext, ServerEntry entry ) throws Exception + public void subentryModified( ModifyOperationContext opContext, Entry entry ) throws Exception { if ( !hasPrescriptiveTrigger( entry ) ) { Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Wed Apr 28 08:44:42 2010 @@ -84,9 +84,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.ClosureMonitor; import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.cursor.CursorIterator; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.DN; @@ -113,7 +113,7 @@ public class MaxImmSubFilterTest private static final DN ROOTDSE_NAME = new DN(); private static DN ENTRY_NAME; private static Collection PROTECTED_ITEMS = new ArrayList(); - private static ServerEntry ENTRY; + private static Entry ENTRY; /** A reference to the directory service */ private static DirectoryService service; @@ -126,7 +126,7 @@ public class MaxImmSubFilterTest ENTRY_NAME = new DN( "ou=test, ou=system" ); PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) ); - ENTRY = new DefaultServerEntry( service.getSchemaManager(), ENTRY_NAME ); + ENTRY = new DefaultClientEntry( service.getSchemaManager(), ENTRY_NAME ); } @@ -406,7 +406,7 @@ public class MaxImmSubFilterTest } - public void add( ServerEntry entry, Collection bypass ) throws Exception + public void add( Entry entry, Collection bypass ) throws Exception { } @@ -766,12 +766,12 @@ public class MaxImmSubFilterTest } - public ServerEntry newEntry( DN dn ) throws NamingException + public Entry newEntry( DN dn ) throws NamingException { return null; } - public ServerEntry newEntry( String ldif, String dn ) + public Entry newEntry( String ldif, String dn ) { return null; } @@ -983,7 +983,7 @@ public class MaxImmSubFilterTest } - class BogusCursor implements Cursor + class BogusCursor implements Cursor { final int count; int ii; @@ -1026,7 +1026,7 @@ public class MaxImmSubFilterTest } - public void after( ServerEntry element ) throws Exception + public void after( Entry element ) throws Exception { } @@ -1036,7 +1036,7 @@ public class MaxImmSubFilterTest } - public void before( ServerEntry element ) throws Exception + public void before( Entry element ) throws Exception { throw new NotImplementedException(); } @@ -1055,9 +1055,9 @@ public class MaxImmSubFilterTest } - public ServerEntry get() throws Exception + public Entry get() throws Exception { - return new DefaultServerEntry( service.getSchemaManager() ); + return new DefaultClientEntry( service.getSchemaManager() ); } @@ -1105,9 +1105,9 @@ public class MaxImmSubFilterTest } - public Iterator iterator() + public Iterator iterator() { - return new CursorIterator( this ); + return new CursorIterator( this ); } Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Wed Apr 28 08:44:42 2010 @@ -35,8 +35,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.aci.UserClass; import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -63,8 +63,8 @@ public class MaxValueCountFilterTest private static final Set EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet() ); private static final Collection PROTECTED_ITEMS = new ArrayList(); - private static ServerEntry ENTRY; - private static ServerEntry FULL_ENTRY; + private static Entry ENTRY; + private static Entry FULL_ENTRY; static { @@ -97,8 +97,8 @@ public class MaxValueCountFilterTest public void setup() throws LdapInvalidDnException { DN entryName = new DN( "ou=test, ou=system" ); - ENTRY = new DefaultServerEntry( schemaManager, entryName ); - FULL_ENTRY = new DefaultServerEntry( schemaManager, entryName ); + ENTRY = new DefaultClientEntry( schemaManager, entryName ); + FULL_ENTRY = new DefaultClientEntry( schemaManager, entryName ); ENTRY.put( "cn", "1" ); FULL_ENTRY.put( "cn", "1", "2", "3" ); 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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010 @@ -44,9 +44,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.entry.StringValue; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -298,7 +298,7 @@ public class RelatedProtectedItemFilterT * public void testRangeOfValues() throws Exception { - ServerEntry entry = new DefaultServerEntry( service.getRegistries(), USER_NAME ); + Entry entry = new DefaultClientEntry( service.getRegistries(), USER_NAME ); entry.put( "cn", "valueA" ); Collection tuples = getTuples( new ProtectedItem.RangeOfValues( new PresenceNode( "cn" ) ) ); @@ -343,7 +343,7 @@ public class RelatedProtectedItemFilterT attrTypes.add( "cn" ); Collection tuples = getTuples( new ProtectedItem.SelfValue( attrTypes ) ); - ServerEntry entry = new DefaultServerEntry( schemaManager, USER_NAME ); + Entry entry = new DefaultClientEntry( schemaManager, USER_NAME ); entry.put( "cn", USER_NAME.getNormName() ); // Test wrong scope Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Wed Apr 28 08:44:42 2010 @@ -36,8 +36,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.entry.StringValue; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; @@ -61,7 +61,7 @@ public class RestrictedByFilterTest private static final Set MO_EMPTY_SET = Collections.unmodifiableSet( new HashSet() ); private static final Collection PROTECTED_ITEMS = new ArrayList(); - private static ServerEntry ENTRY; + private static Entry ENTRY; static { @@ -91,7 +91,7 @@ public class RestrictedByFilterTest DN entryName = new DN( "ou=test, ou=system" ); PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) ); - ENTRY = new DefaultServerEntry( schemaManager, entryName ); + ENTRY = new DefaultClientEntry( schemaManager, entryName ); ENTRY.put( "cn", "1", "2" ); } Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Wed Apr 28 08:44:42 2010 @@ -51,7 +51,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.schema.SchemaService; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.csn.Csn; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -572,13 +572,13 @@ public class InterceptorChainTest } - public ServerEntry newEntry( DN dn ) throws NamingException + public Entry newEntry( DN dn ) throws NamingException { return null; } - public ServerEntry newEntry( String ldif, String dn ) + public Entry newEntry( String ldif, String dn ) { return null; } Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Apr 28 08:44:42 2010 @@ -30,10 +30,10 @@ import java.util.List; import java.util.Map; import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -99,7 +99,7 @@ public class SchemaCheckerTest { DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" ); ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE; - ServerEntry modifyAttributes = new DefaultServerEntry( schemaManager ); + Entry modifyAttributes = new DefaultClientEntry( schemaManager ); AttributeType atCN = schemaManager.lookupAttributeTypeRegistry( "cn" ); modifyAttributes.put( new DefaultEntryAttribute( atCN ) ); @@ -219,7 +219,7 @@ public class SchemaCheckerTest { ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE; DN name = new DN( "ou=user,dc=example,dc=com" ); - ServerEntry attributes = new DefaultServerEntry( schemaManager, name ); + Entry attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "cn", "does not matter" ); // postive test which should pass @@ -241,7 +241,7 @@ public class SchemaCheckerTest // test success using more than one attribute for the Rdn but not modifying rdn attribute name = new DN( "ou=users+cn=system users,dc=example,dc=com" ); - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "sn", "does not matter" ); SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, schemaManager ); @@ -261,12 +261,12 @@ public class SchemaCheckerTest // should succeed since the value being deleted from the rdn attribute is // is not used when composing the Rdn - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "ou", "container" ); SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, schemaManager ); // now let's make it fail again just by providing the right value for ou (users) - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "ou", "users" ); try { @@ -289,7 +289,7 @@ public class SchemaCheckerTest { ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE; DN name = new DN( "ou=user,dc=example,dc=com" ); - ServerEntry attributes = new DefaultServerEntry( schemaManager, name ); + Entry attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "cn", "does not matter" ); // postive test which should pass @@ -310,7 +310,7 @@ public class SchemaCheckerTest // test success using more than one attribute for the Rdn but not modifying rdn attribute name = new DN( "ou=users+cn=system users,dc=example,dc=com" ); - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "sn", "does not matter" ); SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, schemaManager ); @@ -329,13 +329,13 @@ public class SchemaCheckerTest // should succeed since the values being replaced from the rdn attribute is // is includes the old Rdn attribute value - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "ou", "container" ); attributes.put( "ou", "users" ); SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, schemaManager ); // now let's make it fail by not including the old value for ou (users) - attributes = new DefaultServerEntry( schemaManager, name ); + attributes = new DefaultClientEntry( schemaManager, name ); attributes.put( "ou", "container" ); try { Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Wed Apr 28 08:44:42 2010 @@ -29,7 +29,8 @@ import java.security.KeyPair; import java.security.cert.X509Certificate; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -92,7 +93,7 @@ public class TlsKeyGeneratorTest @Test public void testAll() throws Exception { - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, new DN() ); + Entry entry = new DefaultClientEntry( schemaManager, new DN() ); TlsKeyGenerator.addKeyPair( entry ); LOG.debug( "Entry: {}", entry ); assertTrue( entry.contains( SchemaConstants.OBJECT_CLASS_AT, TlsKeyGenerator.TLS_KEY_INFO_OC ) ); Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Wed Apr 28 08:44:42 2010 @@ -29,8 +29,8 @@ import java.util.HashSet; import java.util.Set; import org.apache.directory.server.core.normalization.FilterNormalizingVisitor; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.name.DN; @@ -123,7 +123,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn, "objectClass" ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn, "objectClass" ); assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -143,7 +143,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn, "objectClass" ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn, "objectClass" ); assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -165,7 +165,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn, "objectClass" ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn, "objectClass" ); assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -200,7 +200,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn, "objectClass" ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn, "objectClass" ); assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -235,7 +235,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn, "objectClass" ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn, "objectClass" ); assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -270,7 +270,7 @@ public class SubtreeEvaluatorTest SubtreeSpecification ss = modifier.getSubtreeSpecification(); DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn ); + Entry entry = new DefaultClientEntry( schemaManager, entryDn ); entry.put( "objectClass", "person" ); assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) ); @@ -291,7 +291,7 @@ public class SubtreeEvaluatorTest assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) ); // now change the refinement so the entry is rejected - entry = new DefaultServerEntry( schemaManager, entryDn ); + entry = new DefaultClientEntry( schemaManager, entryDn ); entry.put( "objectClass", "organizationalUnit" ); @@ -330,7 +330,7 @@ public class SubtreeEvaluatorTest DN apDn = new DN( "ou=system" ); DN entryDn = new DN( "ou=users,ou=system" ); - ServerEntry entry = new DefaultServerEntry( schemaManager, entryDn );; + Entry entry = new DefaultClientEntry( schemaManager, entryDn );; entry.put( "objectClass", "person" ); entry.put( "cn", "Ersin" ); @@ -340,7 +340,7 @@ public class SubtreeEvaluatorTest assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) ); // now change the filter so the entry is rejected - entry = new DefaultServerEntry( schemaManager, entryDn );; + entry = new DefaultClientEntry( schemaManager, entryDn );; entry.put( "objectClass", "person" ); entry.put( "cn", "Alex" ); Modified: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original) +++ directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Wed Apr 28 08:44:42 2010 @@ -72,7 +72,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.EqualityNode; @@ -101,7 +101,7 @@ public class ConfigPartitionReader private LdifPartition configPartition; /** the search engine of the partition */ - private SearchEngine se; + private SearchEngine se; /** the schema manager set in the config partition */ private SchemaManager schemaManager; @@ -162,7 +162,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -171,7 +171,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -202,7 +202,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -211,7 +211,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -345,7 +345,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -354,7 +354,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -387,7 +387,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -396,7 +396,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -422,7 +422,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -431,7 +431,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -463,7 +463,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -472,7 +472,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor.get(); + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor.get(); cursor.close(); ClonedServerEntry chgPwdEntry = configPartition.lookup( forwardEntry.getId() ); @@ -569,7 +569,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -578,7 +578,7 @@ public class ConfigPartitionReader return null; } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -634,7 +634,7 @@ public class ConfigPartitionReader SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), + IndexCursor cursor = se.cursor( configPartition.getSuffixDn(), AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); if ( !cursor.next() ) @@ -644,7 +644,7 @@ public class ConfigPartitionReader + configPartition.getSuffixDn() ); } - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); cursor.close(); @@ -778,16 +778,16 @@ public class ConfigPartitionReader PresenceNode filter = new PresenceNode( ConfigSchemaConstants.ADS_INTERCEPTOR_ID ); SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); - IndexCursor cursor = se.cursor( interceptorsDN, AliasDerefMode.NEVER_DEREF_ALIASES, + IndexCursor cursor = se.cursor( interceptorsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); Set set = new TreeSet(); while ( cursor.next() ) { - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); - ServerEntry interceptorEntry = configPartition.lookup( forwardEntry.getId() ); + Entry interceptorEntry = configPartition.lookup( forwardEntry.getId() ); String id = getString( ConfigSchemaConstants.ADS_INTERCEPTOR_ID, interceptorEntry ); String fqcn = getString( ConfigSchemaConstants.ADS_INTERCEPTOR_CLASSNAME, interceptorEntry ); @@ -824,16 +824,16 @@ public class ConfigPartitionReader PresenceNode filter = new PresenceNode( ConfigSchemaConstants.ADS_PARTITION_ID ); SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); - IndexCursor cursor = se.cursor( partitionsDN, AliasDerefMode.NEVER_DEREF_ALIASES, + IndexCursor cursor = se.cursor( partitionsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); Map partitions = new HashMap(); while ( cursor.next() ) { - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); - ServerEntry partitionEntry = configPartition.lookup( forwardEntry.getId() ); + Entry partitionEntry = configPartition.lookup( forwardEntry.getId() ); if ( !isEnabled( partitionEntry ) ) { @@ -858,7 +858,7 @@ public class ConfigPartitionReader } - private JdbmPartition getJdbmPartition( ServerEntry partitionEntry ) throws Exception + private JdbmPartition getJdbmPartition( Entry partitionEntry ) throws Exception { JdbmPartition partition = new JdbmPartition(); partition.setSchemaManager( schemaManager ); @@ -891,28 +891,28 @@ public class ConfigPartitionReader String indexesDN = partitionEntry.get( ConfigSchemaConstants.ADS_PARTITION_INDEXED_ATTRIBUTES ).getString(); - Set> indexedAttributes = getIndexes( new DN( indexesDN ) ); + Set> indexedAttributes = getIndexes( new DN( indexesDN ) ); partition.setIndexedAttributes( indexedAttributes ); return partition; } - private Set> getIndexes( DN indexesDN ) throws Exception + private Set> getIndexes( DN indexesDN ) throws Exception { PresenceNode filter = new PresenceNode( ConfigSchemaConstants.ADS_INDEX_ATTRIBUTE_ID ); SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); - IndexCursor cursor = se.cursor( indexesDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, + IndexCursor cursor = se.cursor( indexesDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); - Set> indexes = new HashSet>(); + Set> indexes = new HashSet>(); while ( cursor.next() ) { - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); - ServerEntry indexEntry = configPartition.lookup( forwardEntry.getId() ); + Entry indexEntry = configPartition.lookup( forwardEntry.getId() ); if ( !isEnabled( indexEntry ) ) { @@ -935,9 +935,9 @@ public class ConfigPartitionReader } - private JdbmIndex getJdbmIndex( ServerEntry indexEntry ) throws Exception + private JdbmIndex getJdbmIndex( Entry indexEntry ) throws Exception { - JdbmIndex index = new JdbmIndex(); + JdbmIndex index = new JdbmIndex(); index.setAttributeId( getString( ConfigSchemaConstants.ADS_INDEX_ATTRIBUTE_ID, indexEntry ) ); EntryAttribute cacheAttr = indexEntry.get( ConfigSchemaConstants.ADS_INDEX_CACHESIZE ); @@ -962,16 +962,16 @@ public class ConfigPartitionReader PresenceNode filter = new PresenceNode( ConfigSchemaConstants.ADS_TRANSPORT_ID ); SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); - IndexCursor cursor = se.cursor( transportsDN, AliasDerefMode.NEVER_DEREF_ALIASES, + IndexCursor cursor = se.cursor( transportsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); List transports = new ArrayList(); while ( cursor.next() ) { - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); - ServerEntry transportEntry = configPartition.lookup( forwardEntry.getId() ); + Entry transportEntry = configPartition.lookup( forwardEntry.getId() ); if ( !isEnabled( transportEntry ) ) { @@ -1143,16 +1143,16 @@ public class ConfigPartitionReader PresenceNode filter = new PresenceNode( ConfigSchemaConstants.ADS_HTTP_WARFILE ); SearchControls controls = new SearchControls(); controls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); - IndexCursor cursor = se.cursor( webAppsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, + IndexCursor cursor = se.cursor( webAppsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ); Set webApps = new HashSet(); while ( cursor.next() ) { - ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor + ForwardIndexEntry forwardEntry = ( ForwardIndexEntry ) cursor .get(); - ServerEntry webAppEntry = configPartition.lookup( forwardEntry.getId() ); + Entry webAppEntry = configPartition.lookup( forwardEntry.getId() ); WebApp app = new WebApp(); app.setWarFile( getString( ConfigSchemaConstants.ADS_HTTP_WARFILE, webAppEntry ) ); 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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010 @@ -67,7 +67,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; import org.apache.directory.shared.ldap.name.DN; @@ -129,7 +129,7 @@ public class KeyDerivationInterceptor ex { DN normName = addContext.getDn(); - ServerEntry entry = addContext.getEntry(); + Entry entry = addContext.getEntry(); if ( ( entry.get( SchemaConstants.USER_PASSWORD_AT ) != null ) && ( entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ) != null ) ) Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (original) +++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Wed Apr 28 08:44:42 2010 @@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; @@ -69,7 +69,7 @@ public class PasswordPolicyInterceptor e { DN normName = addContext.getDn(); - ServerEntry entry = addContext.getEntry(); + Entry entry = addContext.getEntry(); log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getName() ); Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Wed Apr 28 08:44:42 2010 @@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine; import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder; import org.apache.directory.server.xdbm.search.impl.NoOpOptimizer; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; /** @@ -48,7 +48,7 @@ public class JdbmPartition extends Abstr */ public JdbmPartition() { - super( new JdbmStore() ); + super( new JdbmStore() ); } @@ -66,7 +66,7 @@ public class JdbmPartition extends Abstr } else { - optimizer = new DefaultOptimizer( store ); + optimizer = new DefaultOptimizer( store ); } searchEngine = new DefaultSearchEngine( store, cursorBuilder, evaluatorBuilder, optimizer ); @@ -80,7 +80,7 @@ public class JdbmPartition extends Abstr store.setSuffixDn( suffixDn ); store.setPartitionDir( getPartitionDir() ); - for ( Index index : getIndexedAttributes() ) + for ( Index index : getIndexedAttributes() ) { String oid = schemaManager.getAttributeTypeRegistry().getOidByName( index.getAttributeId() ); if ( !index.getAttributeId().equals( oid ) ) @@ -94,19 +94,19 @@ public class JdbmPartition extends Abstr } - public Index getObjectClassIndex() + public Index getObjectClassIndex() { return store.getObjectClassIndex(); } - public Index getEntryCsnIndex() + public Index getEntryCsnIndex() { return store.getEntryCsnIndex(); } - public Index getEntryUuidIndex() + public Index getEntryUuidIndex() { return store.getEntryUuidIndex(); } Added: directory/apacheds/trunk/jdbm-store/ou.db URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/ou.db?rev=938820&view=auto ============================================================================== (empty) Added: directory/apacheds/trunk/jdbm-store/ou.lg URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/ou.lg?rev=938820&view=auto ============================================================================== Binary file - no diff available. Propchange: directory/apacheds/trunk/jdbm-store/ou.lg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original) +++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Wed Apr 28 08:44:42 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAliasDereferencingException; import org.apache.directory.shared.ldap.exception.LdapAliasException; @@ -69,7 +69,7 @@ public class JdbmStore extends Abstra private RecordManager recMan; /** the master table storing entries by primary key */ - private JdbmMasterTable master; + private JdbmMasterTable master; /** the relative distinguished name index */ private JdbmRdnIndex rdnIdx; @@ -140,7 +140,7 @@ public class JdbmStore extends Abstra recMan = new CacheRecordManager( base, new MRU( cacheSize ) ); // Create the master table (the table containing all the entries) - master = new JdbmMasterTable( recMan, schemaManager ); + master = new JdbmMasterTable( recMan, schemaManager ); // ------------------------------------------------------------------- // Initializes the user and system indices @@ -683,7 +683,7 @@ public class JdbmStore extends Abstra * an entry does not exist in the Master table, then the index must be updated to reflect this. */ @SuppressWarnings("unchecked") - public synchronized void add( ServerEntry entry ) throws Exception + public synchronized void add( Entry entry ) throws Exception { if ( entry instanceof ClonedServerEntry ) { @@ -821,9 +821,9 @@ public class JdbmStore extends Abstra } - public ServerEntry lookup( Long id ) throws Exception + public Entry lookup( Long id ) throws Exception { - ServerEntry se = ( ServerEntry ) master.get( id ); + Entry se = ( Entry ) master.get( id ); if ( se == null ) { @@ -840,7 +840,7 @@ public class JdbmStore extends Abstra */ public synchronized void delete( Long id ) throws Exception { - ServerEntry entry = master.get( id ); + Entry entry = master.get( id ); Long parentId = getParentId( id ); EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT ); @@ -943,7 +943,7 @@ public class JdbmStore extends Abstra * @throws Exception if index alteration or attribute addition fails */ @SuppressWarnings("unchecked") - private void add( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception + private void add( Long id, Entry entry, EntryAttribute mods ) throws Exception { if ( entry instanceof ClonedServerEntry ) { @@ -1006,7 +1006,7 @@ public class JdbmStore extends Abstra * @throws Exception if index alteration or attribute modification fails. */ @SuppressWarnings("unchecked") - private void remove( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception + private void remove( Long id, Entry entry, EntryAttribute mods ) throws Exception { if ( entry instanceof ClonedServerEntry ) { @@ -1090,7 +1090,7 @@ public class JdbmStore extends Abstra * fails. */ @SuppressWarnings("unchecked") - private void replace( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception + private void replace( Long id, Entry entry, EntryAttribute mods ) throws Exception { if ( entry instanceof ClonedServerEntry ) { @@ -1167,7 +1167,7 @@ public class JdbmStore extends Abstra } - public void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception + public void modify( DN dn, ModificationOperation modOp, Entry mods ) throws Exception { if ( mods instanceof ClonedServerEntry ) { @@ -1175,7 +1175,7 @@ public class JdbmStore extends Abstra } Long id = getEntryId( dn ); - ServerEntry entry = ( ServerEntry ) master.get( id ); + Entry entry = ( Entry ) master.get( id ); for ( AttributeType attributeType : mods.getAttributeTypes() ) { @@ -1213,7 +1213,7 @@ public class JdbmStore extends Abstra public void modify( DN dn, List mods ) throws Exception { Long id = getEntryId( dn ); - ServerEntry entry = ( ServerEntry ) master.get( id ); + Entry entry = ( Entry ) master.get( id ); for ( Modification mod : mods ) { @@ -1267,7 +1267,7 @@ public class JdbmStore extends Abstra public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception { Long id = getEntryId( dn ); - ServerEntry entry = lookup( id ); + Entry entry = lookup( id ); DN updn = entry.getDn(); /* @@ -1455,7 +1455,7 @@ public class JdbmStore extends Abstra DN newUpdn = move( oldChildDn, childId, newParentDn ); // Update the current entry - ServerEntry entry = master.get( childId ); + Entry entry = master.get( childId ); entry.setDn( newUpdn ); master.put( childId, entry ); @@ -1472,7 +1472,7 @@ public class JdbmStore extends Abstra DN newUpdn = move( oldChildDn, childId, newParentDn ); // Update the current entry - ServerEntry entry = master.get( childId ); + Entry entry = master.get( childId ); entry.setDn( newUpdn ); master.put( childId, entry ); Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (original) +++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Wed Apr 28 08:44:42 2010 @@ -28,7 +28,8 @@ import java.io.ObjectOutputStream; import jdbm.helper.Serializer; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -113,12 +114,12 @@ public class ServerEntrySerializer imple */ public byte[] serialize( Object object ) throws IOException { - DefaultServerEntry entry = ( DefaultServerEntry ) object; + Entry entry = ( DefaultClientEntry ) object; ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream( baos ); - entry.serialize( out ); + ((DefaultClientEntry)entry).serialize( out ); // Note : we don't store the ObjectClassAttribute. I has already // been stored as an attribute. @@ -136,21 +137,21 @@ public class ServerEntrySerializer imple /** - * Deserialize a ServerEntry. + * Deserialize a Entry. * * @param bytes the byte array containing the serialized entry - * @return An instance of a ServerEntry object - * @throws IOException if we can't deserialize the ServerEntry + * @return An instance of a Entry object + * @throws IOException if we can't deserialize the Entry */ public Object deserialize( byte[] bytes ) throws IOException { ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( bytes ) ); - DefaultServerEntry serverEntry = new DefaultServerEntry( schemaManager ); + Entry serverEntry = new DefaultClientEntry( schemaManager ); try { - serverEntry.deserialize( in ); + ((DefaultClientEntry)serverEntry).deserialize( in ); return serverEntry; } Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Wed Apr 28 08:44:42 2010 @@ -34,7 +34,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.cursor.Cursor; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -57,7 +57,7 @@ import org.junit.Test; public class JdbmIndexTest { private static File dbFileDir; - Index idx; + Index idx; private static SchemaManager schemaManager; @@ -134,15 +134,15 @@ public class JdbmIndexTest void initIndex() throws Exception { - initIndex( new JdbmIndex() ); + initIndex( new JdbmIndex() ); } - void initIndex( JdbmIndex jdbmIdx ) throws Exception + void initIndex( JdbmIndex jdbmIdx ) throws Exception { if ( jdbmIdx == null ) { - jdbmIdx = new JdbmIndex(); + jdbmIdx = new JdbmIndex(); } jdbmIdx.init( schemaManager, schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT ), dbFileDir ); @@ -179,7 +179,7 @@ public class JdbmIndexTest assertEquals( "ou", idx.getAttributeId() ); destroyIndex(); - initIndex( new JdbmIndex( "foo" ) ); + initIndex( new JdbmIndex( "foo" ) ); assertEquals( "foo", idx.getAttributeId() ); } @@ -210,7 +210,7 @@ public class JdbmIndexTest public void testWkDirPath() throws Exception { // uninitialized index - JdbmIndex jdbmIndex = new JdbmIndex(); + JdbmIndex jdbmIndex = new JdbmIndex(); jdbmIndex.setWkDirPath( new File( dbFileDir, "foo" ) ); assertEquals( "foo", jdbmIndex.getWkDirPath().getName() ); @@ -227,7 +227,7 @@ public class JdbmIndexTest assertEquals( dbFileDir, idx.getWkDirPath() ); destroyIndex(); - jdbmIndex = new JdbmIndex(); + jdbmIndex = new JdbmIndex(); File wkdir = new File( dbFileDir, "foo" ); wkdir.mkdirs(); jdbmIndex.setWkDirPath( wkdir ); @@ -516,21 +516,21 @@ public class JdbmIndexTest assertEquals( 3, idx.count() ); // use forward index's cursor - Cursor> cursor = idx.forwardCursor(); + Cursor> cursor = idx.forwardCursor(); cursor.beforeFirst(); cursor.next(); - IndexEntry e1 = cursor.get(); + IndexEntry e1 = cursor.get(); assertEquals( 555L, ( long ) e1.getId() ); assertEquals( "bar", e1.getValue() ); cursor.next(); - IndexEntry e2 = cursor.get(); + IndexEntry e2 = cursor.get(); assertEquals( 333L, ( long ) e2.getId() ); assertEquals( "foo", e2.getValue() ); cursor.next(); - IndexEntry e3 = cursor.get(); + IndexEntry e3 = cursor.get(); assertEquals( 1234L, ( long ) e3.getId() ); assertEquals( "foo", e3.getValue() ); Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=938820&r1=938819&r2=938820&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Wed Apr 28 08:44:42 2010 @@ -48,11 +48,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.entry.DefaultModification; -import org.apache.directory.shared.ldap.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.entry.ServerEntry; +import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.name.DN; @@ -83,7 +83,7 @@ public class JdbmStoreTest private static final Logger LOG = LoggerFactory.getLogger( JdbmStoreTest.class.getSimpleName() ); File wkdir; - JdbmStore store; + JdbmStore store; private static SchemaManager schemaManager = null; private static LdifSchemaLoader loader; private static DN EXAMPLE_COM; @@ -131,7 +131,7 @@ public class JdbmStoreTest wkdir.mkdirs(); // initialize the store - store = new JdbmStore(); + store = new JdbmStore(); store.setId( "example" ); store.setCacheSize( 10 ); store.setPartitionDir( wkdir ); @@ -178,7 +178,7 @@ public class JdbmStoreTest wkdir2.mkdirs(); // initialize the 2nd store - JdbmStore store2 = new JdbmStore(); + JdbmStore store2 = new JdbmStore(); store2.setId( "example2" ); store2.setCacheSize( 10 ); store2.setPartitionDir( wkdir2 ); @@ -191,7 +191,7 @@ public class JdbmStoreTest // inject context entry DN suffixDn = new DN( "dc=example,dc=com" ); suffixDn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, suffixDn ); + Entry entry = new DefaultClientEntry( schemaManager, suffixDn ); entry.add( "objectClass", "top", "domain" ); entry.add( "dc", "example" ); entry.add( SchemaConstants.ENTRY_CSN_AT, new CsnFactory( 0 ).newInstance().toString() ); @@ -200,7 +200,7 @@ public class JdbmStoreTest // lookup the context entry Long id = store2.getEntryId( suffixDn ); - ServerEntry lookup = store2.lookup( id ); + Entry lookup = store2.lookup( id ); assertEquals( 2, lookup.getDn().getRdns().size() ); } @@ -277,7 +277,7 @@ public class JdbmStoreTest assertNotNull( store.getAliasIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -296,7 +296,7 @@ public class JdbmStoreTest assertNotNull( store.getPresenceIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -306,7 +306,7 @@ public class JdbmStoreTest assertNotNull( store.getOneLevelIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -316,7 +316,7 @@ public class JdbmStoreTest assertNotNull( store.getSubLevelIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -338,7 +338,7 @@ public class JdbmStoreTest assertNotNull( store.getOneAliasIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -348,7 +348,7 @@ public class JdbmStoreTest assertNotNull( store.getSubAliasIndex() ); try { - store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) ); + store.addIndex( new JdbmIndex( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) ); fail(); } catch ( IllegalStateException e ) @@ -474,7 +474,7 @@ public class JdbmStoreTest { assertEquals( 3, store.getChildCount( 1L ) ); - Cursor> cursor = store.list( 1L ); + Cursor> cursor = store.list( 1L ); assertNotNull( cursor ); cursor.beforeFirst(); assertTrue( cursor.next() ); @@ -489,7 +489,7 @@ public class JdbmStoreTest // add an alias and delete to test dropAliasIndices method DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "objectClass", "top", "alias", "extensibleObject" ); entry.add( "ou", "Apache" ); entry.add( "commonName", "Jack Daniels" ); @@ -538,7 +538,7 @@ public class JdbmStoreTest // dn id 12 DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co." ); martinDn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, martinDn ); + Entry entry = new DefaultClientEntry( schemaManager, martinDn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); @@ -563,7 +563,7 @@ public class JdbmStoreTest // dn id 13 DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co." ); marketingDn.normalize( schemaManager.getNormalizerMapping() ); - entry = new DefaultServerEntry( schemaManager, marketingDn ); + entry = new DefaultClientEntry( schemaManager, marketingDn ); entry.add( "objectClass", "top", "organizationalUnit" ); entry.add( "ou", "Marketing" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); @@ -573,7 +573,7 @@ public class JdbmStoreTest // dn id 14 DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." ); jimmyDn.normalize( schemaManager.getNormalizerMapping() ); - entry = new DefaultServerEntry( schemaManager, jimmyDn ); + entry = new DefaultClientEntry( schemaManager, jimmyDn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Marketing" ); entry.add( "cn", "Jimmy Wales" ); @@ -630,7 +630,7 @@ public class JdbmStoreTest { DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Not Present" ); entry.add( "cn", "Martin King" ); @@ -643,7 +643,7 @@ public class JdbmStoreTest { DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); store.add( entry ); @@ -674,7 +674,7 @@ public class JdbmStoreTest { DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); @@ -694,7 +694,7 @@ public class JdbmStoreTest { DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); @@ -711,7 +711,7 @@ public class JdbmStoreTest dn2.normalize( schemaManager.getNormalizerMapping() ); Long id = store.getEntryId( dn2 ); assertNotNull( id ); - ServerEntry entry2 = store.lookup( id ); + Entry entry2 = store.lookup( id ); assertEquals( "Ja+es", entry2.get( "sn" ).getString() ); } @@ -721,7 +721,7 @@ public class JdbmStoreTest { DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." ); childDn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry childEntry = new DefaultServerEntry( schemaManager, childDn ); + Entry childEntry = new DefaultClientEntry( schemaManager, childDn ); childEntry.add( "objectClass", "top", "person", "organizationalPerson" ); childEntry.add( "ou", "Engineering" ); childEntry.add( "cn", "Private Ryan" ); @@ -768,13 +768,13 @@ public class JdbmStoreTest Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib ); mods.add( add ); - ServerEntry lookedup = store.lookup( store.getEntryId( dn ) ); + Entry lookedup = store.lookup( store.getEntryId( dn ) ); store.modify( dn, mods ); assertTrue( lookedup.get( "sn" ).contains( attribVal ) ); // testing the store.modify( dn, mod, entry ) API - ServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); attribVal = "+1974045779"; entry.add( "telephoneNumber", attribVal ); @@ -800,7 +800,7 @@ public class JdbmStoreTest Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib ); mods.add( add ); - ServerEntry lookedup = store.lookup( store.getEntryId( dn ) ); + Entry lookedup = store.lookup( store.getEntryId( dn ) ); assertEquals( "WAlkeR", lookedup.get( "sn" ).get().getString() ); // before replacing @@ -808,7 +808,7 @@ public class JdbmStoreTest assertEquals( attribVal, lookedup.get( "sn" ).get().getString() ); // testing the store.modify( dn, mod, entry ) API - ServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); attribVal = "JWalker"; entry.add( "sn", attribVal ); @@ -830,7 +830,7 @@ public class JdbmStoreTest Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib ); mods.add( add ); - ServerEntry lookedup = store.lookup( store.getEntryId( dn ) ); + Entry lookedup = store.lookup( store.getEntryId( dn ) ); assertNotNull( lookedup.get( "sn" ).get() ); @@ -838,7 +838,7 @@ public class JdbmStoreTest assertNull( lookedup.get( "sn" ) ); // testing the store.modify( dn, mod, entry ) API - ServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); // add an entry for the sake of testing the remove operation entry.add( "sn", "JWalker" ); @@ -855,7 +855,7 @@ public class JdbmStoreTest { DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co." ); dn.normalize( schemaManager.getNormalizerMapping() ); - DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn ); + Entry entry = new DefaultClientEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "cn", "Tim B" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); @@ -873,7 +873,7 @@ public class JdbmStoreTest Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib ); mods.add( add ); - ServerEntry lookedup = store.lookup( store.getEntryId( dn ) ); + Entry lookedup = store.lookup( store.getEntryId( dn ) ); assertNull( lookedup.get( "ou" ) ); // before replacing