directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [2/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 GMT
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Wed Apr 28 08:44:42 2010
@@ -45,7 +45,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.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -169,7 +169,7 @@ public class SchemaPartitionDaoImpl impl
 
         while ( list.next() )
         {
-            ServerEntry sr = list.get();
+            Entry sr = list.get();
             Schema schema = factory.getSchema( sr );
             schemas.put( schema.getSchemaName(), schema );
         }
@@ -188,7 +188,7 @@ public class SchemaPartitionDaoImpl impl
 
         while ( list.next() )
         {
-            ServerEntry sr = list.get();
+            Entry sr = list.get();
             schemaNames.add( sr.get( SchemaConstants.CN_AT ).getString() );
         }
 
@@ -510,7 +510,7 @@ public class SchemaPartitionDaoImpl impl
      */
     public DN findDn( String entityName ) throws Exception
     {
-        ServerEntry sr = find( entityName );
+        Entry sr = find( entityName );
         DN dn = sr.getDn();
         dn.normalize( schemaManager.getNormalizerMapping() );
         return dn;
@@ -520,7 +520,7 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#find(java.lang.String)
      */
-    public ServerEntry find( String entityName ) throws Exception
+    public Entry find( String entityName ) throws Exception
     {
         BranchNode filter = new OrNode();
         SimpleNode<String> nameAVA = new EqualityNode<String>( M_NAME_OID, 
@@ -546,7 +546,7 @@ public class SchemaPartitionDaoImpl impl
                 return null;
             }
 
-            ServerEntry sr = cursor.get();
+            Entry sr = cursor.get();
             
             if ( cursor.next() )
             {
@@ -572,7 +572,7 @@ public class SchemaPartitionDaoImpl impl
     {
         DN dn = new DN( "cn=" + schemaName + ",ou=schema" );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        ServerEntry entry = partition.lookup( new LookupOperationContext( null, dn ) );
+        Entry entry = partition.lookup( new LookupOperationContext( null, dn ) );
         EntryAttribute disabledAttr = entry.get( disabledAttributeType );
         List<Modification> mods = new ArrayList<Modification>( 3 );
 
@@ -608,9 +608,9 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listSyntaxDependents(java.lang.String)
      */
-    public Set<ServerEntry> listSyntaxDependents( String numericOid ) throws Exception
+    public Set<Entry> listSyntaxDependents( String numericOid ) throws Exception
     {
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         // subfilter for (| (objectClass=metaMatchingRule) (objectClass=metaAttributeType))  
@@ -655,9 +655,9 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listMatchingRuleDependents(org.apache.directory.shared.ldap.schema.MatchingRule)
      */
-    public Set<ServerEntry> listMatchingRuleDependents( MatchingRule mr ) throws Exception
+    public Set<Entry> listMatchingRuleDependents( MatchingRule mr ) throws Exception
     {
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         // ( objectClass = metaAttributeType )
@@ -735,7 +735,7 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listAttributeTypeDependents(org.apache.directory.shared.ldap.schema.AttributeType)
      */
-    public Set<ServerEntry> listAttributeTypeDependents( AttributeType at ) throws Exception
+    public Set<Entry> listAttributeTypeDependents( AttributeType at ) throws Exception
     {
         /*
          * Right now the following inefficient filter is being used:
@@ -755,7 +755,7 @@ public class SchemaPartitionDaoImpl impl
          * )
          */
 
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         // ( objectClass = metaAttributeType )
@@ -804,7 +804,7 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listSchemaDependents(java.lang.String)
      */
-    public Set<ServerEntry> listSchemaDependents( String schemaName ) throws Exception
+    public Set<Entry> listSchemaDependents( String schemaName ) throws Exception
     {
         /*
          * The following filter is being used:
@@ -812,7 +812,7 @@ public class SchemaPartitionDaoImpl impl
          * ( & ( objectClass = metaSchema ) ( m-dependencies = $schemaName ) )
          */
 
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
@@ -852,9 +852,9 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listEnabledSchemaDependents(java.lang.String)
      */
-    public Set<ServerEntry> listEnabledSchemaDependents( String schemaName ) throws Exception
+    public Set<Entry> listEnabledSchemaDependents( String schemaName ) throws Exception
     {
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue( 
@@ -876,7 +876,7 @@ public class SchemaPartitionDaoImpl impl
 
             while ( cursor.next() )
             {
-                ServerEntry sr = cursor.get();
+                Entry sr = cursor.get();
                 EntryAttribute disabled = sr.get( disabledAttributeType );
 
                 if ( disabled == null )
@@ -904,7 +904,7 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listObjectClassDependents(org.apache.directory.shared.ldap.schema.ObjectClass)
      */
-    public Set<ServerEntry> listObjectClassDependents( ObjectClass oc ) throws Exception
+    public Set<Entry> listObjectClassDependents( ObjectClass oc ) throws Exception
     {
         /*
          * Right now the following inefficient filter is being used:
@@ -930,7 +930,7 @@ public class SchemaPartitionDaoImpl impl
          * )
          */
 
-        Set<ServerEntry> set = new HashSet<ServerEntry>();
+        Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();
 
         BranchNode or = new OrNode();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Wed Apr 28 08:44:42 2010
@@ -1,7 +1,7 @@
 package org.apache.directory.server.core.schema;
 
 
-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.schema.SchemaManager;
 
@@ -45,7 +45,7 @@ public interface SchemaService
      * @return the schemaSubentry
      * @throws Exception if there is a failure to access schema timestamps
      */
-    ServerEntry getSubschemaEntryImmutable() throws Exception;
+    Entry getSubschemaEntryImmutable() throws Exception;
 
 
     /**
@@ -54,7 +54,7 @@ public interface SchemaService
      * @return the schemaSubentry
      * @throws Exception if there is a failure to access schema timestamps
      */
-    ServerEntry getSubschemaEntryCloned() throws Exception;
+    Entry getSubschemaEntryCloned() throws Exception;
 
 
     /**
@@ -65,5 +65,5 @@ public interface SchemaService
      * @return the subschema entry with the ids provided
      * @throws Exception if there are failures during schema info access
      */
-    ServerEntry getSubschemaEntry( String[] ids ) throws Exception;
+    Entry getSubschemaEntry( String[] ids ) throws Exception;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapOtherException;
@@ -162,7 +162,7 @@ public abstract class AbstractRegistrySy
     }
 
 
-    protected void checkOidIsUnique( ServerEntry entry ) throws Exception
+    protected void checkOidIsUnique( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 
@@ -177,7 +177,7 @@ public abstract class AbstractRegistrySy
      * Check that a SchemaObject exists in the global OidRegsitry, and if so,
      * return it.
      */
-    protected SchemaObject checkOidExists( ServerEntry entry ) throws Exception
+    protected SchemaObject checkOidExists( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 
@@ -318,30 +318,30 @@ public abstract class AbstractRegistrySy
     /**
      * {@inheritDoc}
      */
-    public abstract boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade ) 
+    public abstract boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) 
         throws Exception;
     
     
-    /*public final boolean modify( DN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, ServerEntry targetEntry, 
+    /*public final boolean modify( DN name, ModificationOperation modOp, Entry mods, Entry entry, Entry targetEntry, 
         boolean cascade ) throws Exception
     {
         return modify( name, entry, targetEntry, cascade );
     }
 
 
-    public final boolean modify( DN name, List<Modification> mods, ServerEntry entry,
-        ServerEntry targetEntry, boolean cascade ) throws Exception
+    public final boolean modify( DN name, List<Modification> mods, Entry entry,
+        Entry targetEntry, boolean cascade ) throws Exception
     {
         return modify( name, entry, targetEntry, cascade );
     }
     */
     
     
-    protected Set<String> getOids( Set<ServerEntry> results ) throws Exception
+    protected Set<String> getOids( Set<Entry> results ) throws Exception
     {
         Set<String> oids = new HashSet<String>( results.size() );
         
-        for ( ServerEntry result : results )
+        for ( Entry result : results )
         {
             DN dn = result.getDn();
             dn.normalize( schemaManager.getNormalizerMapping() );
@@ -352,7 +352,7 @@ public abstract class AbstractRegistrySy
     }
     
     
-    protected String getOid( ServerEntry entry ) throws Exception
+    protected String getOid( Entry entry ) throws Exception
     {
         EntryAttribute oid = entry.get( m_oidAT );
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -65,7 +65,7 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -112,11 +112,11 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
         AttributeType at = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -141,7 +141,7 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -193,14 +193,14 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( entry.getDn() );
         AttributeType oldAt = factory
             .getAttributeType( schemaManager, entry, schemaManager.getRegistries(), schemaName );
 
         // Inject the new OID
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         checkOidIsUnique( newOid );
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -236,14 +236,14 @@ public class AttributeTypeSynchronizer e
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
         AttributeType oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRn.getNormValue();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
         checkOidIsUnique( newOid );
@@ -287,7 +287,7 @@ public class AttributeTypeSynchronizer e
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapSchemaViolationException;
@@ -71,11 +71,11 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
         LdapComparator<?> comparator = factory.getLdapComparator( schemaManager, targetEntry, schemaManager
@@ -98,7 +98,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -146,7 +146,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -224,7 +224,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
 
@@ -242,7 +242,7 @@ public class ComparatorSynchronizer exte
         if ( isSchemaEnabled( schemaName ) )
         {
             // Inject the new OID in the entry
-            ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+            Entry targetEntry = ( Entry ) entry.clone();
             String newOid = ( String ) newRdn.getNormValue();
             checkOidIsUnique( newOid );
             targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -263,7 +263,7 @@ public class ComparatorSynchronizer exte
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -296,7 +296,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -336,7 +336,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    private void checkOidIsUniqueForComparator( ServerEntry entry ) throws Exception
+    private void checkOidIsUniqueForComparator( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 
@@ -352,7 +352,7 @@ public class ComparatorSynchronizer exte
      * Check that a Comparator exists in the ComparatorRegistry, and if so,
      * return it.
      */
-    protected LdapComparator<?> checkComparatorOidExists( ServerEntry entry ) throws Exception
+    protected LdapComparator<?> checkComparatorOidExists( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-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.name.RDN;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -56,7 +56,7 @@ public class DitContentRuleSynchronizer 
      * {@inheritDoc}
      */
     @Override
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade ) 
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) 
         throws NamingException
     {
         // TODO Auto-generated method stub
@@ -67,7 +67,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws NamingException
+    public void add( Entry entry ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -76,7 +76,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -86,7 +86,7 @@ public class DitContentRuleSynchronizer 
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, java.lang.String, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -95,7 +95,7 @@ public class DitContentRuleSynchronizer 
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, 
+    public void move( DN oriChildName, DN newParentName, Entry entry, 
         boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
@@ -105,7 +105,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-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.name.RDN;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -55,7 +55,7 @@ public class DitStructureRuleSynchronize
      * {@inheritDoc}
      */
     @Override
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, 
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
         boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
@@ -66,7 +66,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws NamingException
+    public void add( Entry entry ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -75,7 +75,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -88,7 +88,7 @@ public class DitStructureRuleSynchronize
      * java.lang.String, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -100,7 +100,7 @@ public class DitStructureRuleSynchronize
      * org.apache.directory.shared.ldap.name.DN, 
      * javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, 
+    public void move( DN oriChildName, DN newParentName, Entry entry, 
         boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
@@ -110,7 +110,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapUnwillingToPerformException;
@@ -67,11 +67,11 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String schemaName = getSchemaName( name );
         MatchingRule mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
@@ -95,7 +95,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -143,7 +143,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -196,11 +196,11 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( entry.getDn() );
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
@@ -222,14 +222,14 @@ public class MatchingRuleSynchronizer ex
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
@@ -257,7 +257,7 @@ public class MatchingRuleSynchronizer ex
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-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.name.RDN;
 import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
@@ -55,7 +55,7 @@ public class MatchingRuleUseSynchronizer
      * {@inheritDoc}
      */
     @Override
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, 
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
         boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
@@ -66,7 +66,7 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws NamingException
+    public void add( Entry entry ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -75,21 +75,21 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
 
 
     public void move( DN oriChildName, DN newParentName,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -98,7 +98,7 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-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.name.RDN;
 import org.apache.directory.shared.ldap.schema.NameForm;
@@ -54,7 +54,7 @@ public class NameFormSynchronizer extend
      * {@inheritDoc}
      */
     @Override
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, 
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
         boolean cascade ) throws NamingException
     {
         return SCHEMA_UNCHANGED;
@@ -64,7 +64,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws NamingException
+    public void add( Entry entry ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -73,7 +73,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -85,7 +85,7 @@ public class NameFormSynchronizer extend
      * RDN, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn,
-        boolean deleteOldRn, ServerEntry entry, boolean cascade ) throws NamingException
+        boolean deleteOldRn, Entry entry, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }
@@ -96,7 +96,7 @@ public class NameFormSynchronizer extend
      * org.apache.directory.shared.ldap.name.DN, 
      * org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, 
+    public void move( DN oriChildName, DN newParentName, Entry entry, 
         boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
@@ -106,7 +106,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapSchemaViolationException;
@@ -70,11 +70,11 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String schemaName = getSchemaName( name );
         String oldOid = getOid( entry );
         Normalizer normalizer = factory.getNormalizer( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -97,7 +97,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -155,7 +155,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -199,7 +199,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -216,7 +216,7 @@ public class NormalizerSynchronizer exte
         if ( isSchemaEnabled( schemaName ) )
         {
             // Inject the new OID
-            ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+            Entry targetEntry = ( Entry ) entry.clone();
             targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
             // Inject the new DN
@@ -234,7 +234,7 @@ public class NormalizerSynchronizer exte
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -264,7 +264,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -302,7 +302,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    private void checkOidIsUniqueForNormalizer( ServerEntry entry ) throws Exception
+    private void checkOidIsUniqueForNormalizer( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapUnwillingToPerformException;
@@ -66,11 +66,11 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String oid = getOid( entry );
         ObjectClass oc = factory.getObjectClass( schemaManager, targetEntry, schemaManager.getRegistries(),
             getSchemaName( name ) );
@@ -91,7 +91,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -140,7 +140,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -192,13 +192,13 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( entry.getDn() );
         ObjectClass oldOc = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), schemaName );
 
         // Dependency constraints are not managed by this class
-        //        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldOc );
+        //        Set<Entry> dependees = dao.listObjectClassDependents( oldOc );
         //        
         //        if ( dependees != null && dependees.size() > 0 )
         //        {
@@ -209,7 +209,7 @@ public class ObjectClassSynchronizer ext
         //                ResultCodeEnum.UNWILLING_TO_PERFORM );
         //        }
 
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
@@ -243,14 +243,14 @@ public class ObjectClassSynchronizer ext
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
         ObjectClass oldOc = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), oldSchemaName );
 
         // this class does not handle dependencies
-        //        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldOc );
+        //        Set<Entry> dependees = dao.listObjectClassDependents( oldOc );
         //        if ( dependees != null && dependees.size() > 0 )
         //        {
         //            throw new LdapUnwillingToPerformException( "The objectClass with OID " + oldOc.getOid()
@@ -261,7 +261,7 @@ public class ObjectClassSynchronizer ext
         //        }
 
         String newSchemaName = getSchemaName( newParentName );
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         checkOidIsUnique( newOid );
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -288,7 +288,7 @@ public class ObjectClassSynchronizer ext
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -296,7 +296,7 @@ public class ObjectClassSynchronizer ext
         ObjectClass oldAt = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), oldSchemaName );
 
         // dependencies are not managed by this class
-        //        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldAt );
+        //        Set<Entry> dependees = dao.listObjectClassDependents( oldAt );
         //        if ( dependees != null && dependees.size() > 0 )
         //        {s
         //            throw new LdapUnwillingToPerformException( "The objectClass with OID " + oldAt.getOid() 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-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.name.RDN;
 
@@ -48,7 +48,7 @@ public interface RegistrySynchronizer
      * @param entry The SchemObject to add
      * @throws Exception If the addition failed
      */
-    void add( ServerEntry entry ) throws Exception;
+    void add( Entry entry ) throws Exception;
     
     
     /**
@@ -58,7 +58,7 @@ public interface RegistrySynchronizer
      * @param cascaded unused
      * @throws Exception If the deletion failed
      */
-    void delete( ServerEntry entry, boolean cascaded ) throws Exception;
+    void delete( Entry entry, boolean cascaded ) throws Exception;
     
     
     /**
@@ -69,7 +69,7 @@ public interface RegistrySynchronizer
      * @param cascaded unused
      * @throws Exception If the rename failed
      */
-    void rename( ServerEntry entry, RDN newRdn, boolean cascaded ) throws Exception;
+    void rename( Entry entry, RDN newRdn, boolean cascaded ) throws Exception;
     
 
     /**
@@ -81,11 +81,11 @@ public interface RegistrySynchronizer
      * @return True if the modification has been done
      * @throws Exception If the modification failed
      */
-    boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascaded )
+    boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascaded )
         throws Exception;
     
-    void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, ServerEntry entry,
+    void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, Entry entry,
         boolean cascaded ) throws Exception;
     
-    void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascaded ) throws Exception;
+    void move( DN oriChildName, DN newParentName, Entry entry, boolean cascaded ) throws Exception;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Wed Apr 28 08:44:42 2010
@@ -36,7 +36,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
@@ -167,7 +167,7 @@ public class RegistrySynchronizerAdaptor
                 // This is one of the eleven SchemaObject :
                 // AT, C, DCR, DSR, MR, MRU, NF, N, OC, S, SC
                 RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
-                ServerEntry entry = opContext.getEntry();
+                Entry entry = opContext.getEntry();
                 synchronizer.add( entry );
                 return;
             }
@@ -177,7 +177,7 @@ public class RegistrySynchronizerAdaptor
         // e.g. ou=my custom schema,ou=schema
         if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
         {
-            ServerEntry entry = opContext.getEntry();
+            Entry entry = opContext.getEntry();
             schemaSynchronizer.add( entry );
             return;
         }
@@ -220,7 +220,7 @@ public class RegistrySynchronizerAdaptor
     public void delete( DeleteOperationContext opContext, boolean doCascadeDelete ) 
         throws Exception
     {
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         
         EntryAttribute oc = entry.get( objectClassAT );
         
@@ -273,9 +273,9 @@ public class RegistrySynchronizerAdaptor
      * @param doCascadeModify Not used
      * @throws Exception If the modification failed
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean doCascadeModify ) throws Exception
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean doCascadeModify ) throws Exception
     {
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
@@ -317,7 +317,7 @@ public class RegistrySynchronizerAdaptor
     public void rename( RenameOperationContext opContext, boolean doCascadeModify ) 
         throws Exception
     {
-        ServerEntry originalEntry = opContext.getEntry().getOriginalEntry();
+        Entry originalEntry = opContext.getEntry().getOriginalEntry();
         EntryAttribute oc = originalEntry.get( objectClassAT );
         
         for ( Value<?> value:oc )
@@ -343,9 +343,9 @@ public class RegistrySynchronizerAdaptor
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeManager#replace(org.apache.directory.server.core.interceptor.context.MoveOperationContext, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#replace(org.apache.directory.server.core.interceptor.context.MoveOperationContext, org.apache.directory.server.core.entry.Entry, boolean)
      */
-    public void move( MoveOperationContext opContext, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( MoveOperationContext opContext, Entry entry, boolean cascade ) throws Exception
     {
         EntryAttribute oc = entry.get( objectClassAT );
         
@@ -372,9 +372,9 @@ public class RegistrySynchronizerAdaptor
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeManager#move(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#move(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext, org.apache.directory.server.core.entry.Entry, boolean)
      */
-    public void moveAndRename( MoveAndRenameOperationContext opContext, ServerEntry entry, boolean cascade ) throws Exception
+    public void moveAndRename( MoveAndRenameOperationContext opContext, Entry entry, boolean cascade ) throws Exception
     {
         EntryAttribute oc = entry.get( objectClassAT );
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -39,7 +39,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.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -135,9 +135,9 @@ public class SchemaSynchronizer implemen
      * Depending in the existence of this attribute in the previous entry, we will
      * have to update the entry or not.
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade ) throws Exception
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) throws Exception
     {
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         List<Modification> mods = opContext.getModItems(); 
         boolean hasModification = SCHEMA_UNCHANGED;
         
@@ -166,7 +166,7 @@ public class SchemaSynchronizer implemen
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, ServerEntry entry, boolean cascaded ) throws LdapException
+    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, Entry entry, boolean cascaded ) throws LdapException
     {
 
     }
@@ -178,7 +178,7 @@ public class SchemaSynchronizer implemen
      * @param name the dn of the new metaSchema object
      * @param entry the attributes of the new metaSchema object
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -248,7 +248,7 @@ public class SchemaSynchronizer implemen
      * @param name the dn of the metaSchema object being deleted
      * @param entry the attributes of the metaSchema object 
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         EntryAttribute cn = entry.get( cnAT );
         String schemaName = cn.getString();
@@ -282,7 +282,7 @@ public class SchemaSynchronizer implemen
      * @param entry the entry of the metaSchema object before the rename
      * @param newRdn the new commonName of the metaSchema object
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String rdnAttribute = newRdn.getUpType();
         String rdnAttributeOid = registries.getAttributeTypeRegistry().getOidByName( rdnAttribute );
@@ -365,7 +365,7 @@ public class SchemaSynchronizer implemen
      * UNWILLING_TO_PERFORM LdapException.
      */
     public void moveAndRename( DN oriChildName, DN newParentName, String newRn, boolean deleteOldRn, 
-        ServerEntry entry, boolean cascade ) throws LdapUnwillingToPerformException
+        Entry entry, boolean cascade ) throws LdapUnwillingToPerformException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
             I18n.err( I18n.ERR_383 ) );
@@ -377,7 +377,7 @@ public class SchemaSynchronizer implemen
      * UNWILLING_TO_PERFORM LdapException.
      */
     public void move( DN oriChildName, DN newParentName, 
-        ServerEntry entry, boolean cascade ) throws LdapUnwillingToPerformException
+        Entry entry, boolean cascade ) throws LdapUnwillingToPerformException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
             I18n.err( I18n.ERR_383 ) );
@@ -669,7 +669,7 @@ public class SchemaSynchronizer implemen
      * @throws NamingException if the dependencies do not resolve or are not
      * loaded (enabled)
      */
-    private void checkForDependencies( boolean isEnabled, ServerEntry entry ) throws Exception
+    private void checkForDependencies( boolean isEnabled, Entry entry ) throws Exception
     {
         EntryAttribute dependencies = entry.get( this.dependenciesAT );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapSchemaViolationException;
@@ -69,11 +69,11 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
         SyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
@@ -96,7 +96,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -143,7 +143,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -219,7 +219,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -230,7 +230,7 @@ public class SyntaxCheckerSynchronizer e
                 I18n.err( I18n.ERR_389, oldOid ) );
         }
 
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
 
         if ( schemaManager.getSyntaxCheckerRegistry().contains( newOid ) )
@@ -252,7 +252,7 @@ public class SyntaxCheckerSynchronizer e
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -265,7 +265,7 @@ public class SyntaxCheckerSynchronizer e
                 I18n.err( I18n.ERR_391, oldOid ) );
         }
 
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
 
         String newOid = ( String ) newRdn.getNormValue();
 
@@ -291,7 +291,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -319,7 +319,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    private void checkOidIsUniqueForSyntaxChecker( ServerEntry entry ) throws Exception
+    private void checkOidIsUniqueForSyntaxChecker( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 
@@ -335,7 +335,7 @@ public class SyntaxCheckerSynchronizer e
      * Check that a SyntaxChecker exists in the SyntaxCheckerRegistry, and if so,
      * return it.
      */
-    protected SyntaxChecker checkSyntaxCheckerOidExists( ServerEntry entry ) throws Exception
+    protected SyntaxChecker checkSyntaxCheckerOidExists( Entry entry ) throws Exception
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapUnwillingToPerformException;
@@ -73,11 +73,11 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
         throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         String oid = getOid( entry );
         LdapSyntax syntax = factory.getSyntax( schemaManager, targetEntry, schemaManager.getRegistries(),
             getSchemaName( name ) );
@@ -98,7 +98,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -198,7 +198,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void delete( ServerEntry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws Exception
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -252,7 +252,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -266,7 +266,7 @@ public class SyntaxSynchronizer extends 
                     getNames( dependees ) ) );
         }
 
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
@@ -290,7 +290,7 @@ public class SyntaxSynchronizer extends 
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -306,7 +306,7 @@ public class SyntaxSynchronizer extends 
                 I18n.err( I18n.ERR_401, oldOid, getNames( dependees ) ) );
         }
 
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         String newOid = ( String ) newRn.getNormValue();
         checkOidIsUnique( newOid );
 
@@ -335,7 +335,7 @@ public class SyntaxSynchronizer extends 
     }
 
 
-    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -344,7 +344,7 @@ public class SyntaxSynchronizer extends 
 
         // schema dep check before delete to be handled by the SchemaPartition
         //        
-        //        Set<ServerEntry> dependees = dao.listSyntaxDependents( oid );
+        //        Set<Entry> dependees = dao.listSyntaxDependents( oid );
         //        
         //        if ( dependees != null && dependees.size() > 0 )
         //        {

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,6 @@ import java.util.Set;
 import org.apache.directory.server.i18n.I18n;
 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.Value;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -46,13 +45,13 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ClonedServerEntry implements ServerEntry
+public class ClonedServerEntry implements Entry
 {
     /** The original entry as returned by the backend */
-    private final ServerEntry originalEntry;
+    private final Entry originalEntry;
     
     /** The copied entry */
-    private final ServerEntry clonedEntry;
+    private final Entry clonedEntry;
 
     
     /**
@@ -62,17 +61,17 @@ public class ClonedServerEntry implement
      *
      * @param originalEntry The original entry
      */
-    public ClonedServerEntry( ServerEntry originalEntry )
+    public ClonedServerEntry( Entry originalEntry )
     {
-        this.originalEntry = ( ServerEntry )originalEntry.clone();
-        this.clonedEntry = ( ServerEntry ) originalEntry.clone();
+        this.originalEntry = ( Entry )originalEntry.clone();
+        this.clonedEntry = ( Entry ) originalEntry.clone();
     }
     
     
     /**
      * @return the originalEntry
      */
-    public ServerEntry getOriginalEntry()
+    public Entry getOriginalEntry()
     {
         return originalEntry;
     }
@@ -443,9 +442,9 @@ public class ClonedServerEntry implement
     }
     
     
-    public ServerEntry clone()
+    public Entry clone()
     {
-        return ( ServerEntry ) clonedEntry.clone();
+        return ( Entry ) clonedEntry.clone();
     }
     
     
@@ -466,9 +465,9 @@ public class ClonedServerEntry implement
         {
             other = ((ClonedServerEntry)obj).getClonedEntry();
         }
-        else if ( obj instanceof ServerEntry )
+        else if ( obj instanceof Entry )
         {
-            other = (ServerEntry)obj;
+            other = (Entry)obj;
         }
         else 
         {
@@ -485,7 +484,7 @@ public class ClonedServerEntry implement
     }
     
     
-    class EmptyEntry implements ServerEntry
+    class EmptyEntry implements Entry
     {
         DN dn;
         
@@ -751,7 +750,7 @@ public class ClonedServerEntry implement
         }
     
         
-        public ServerEntry clone()
+        public Entry clone()
         {
             return new EmptyEntry( dn );
         }

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java Wed Apr 28 08:44:42 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 
 import javax.naming.NamingException;
 
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -45,5 +45,5 @@ public interface ServerEntryFactory
      * Creates a new ServerEntry which has not yet been added to the 
      * directory.
      */
-    ServerEntry newEntry( DN dn ) throws NamingException;
+    Entry newEntry( DN dn ) throws NamingException;
 }

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Wed Apr 28 08:44:42 2010
@@ -39,11 +39,11 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 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.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
@@ -91,7 +91,7 @@ public class ServerEntryUtils
      *
      * @return An instance of a AttributesImpl() object
      */
-    public static Attributes toBasicAttributes( ServerEntry entry )
+    public static Attributes toBasicAttributes( Entry entry )
     {
         if ( entry == null )
         {
@@ -207,14 +207,14 @@ public class ServerEntryUtils
      * 
      * @throws LdapInvalidAttributeTypeException If we get an invalid attribute
      */
-    public static ServerEntry toServerEntry( Attributes attributes, DN dn, SchemaManager schemaManager ) 
+    public static Entry toServerEntry( Attributes attributes, DN dn, SchemaManager schemaManager ) 
             throws LdapInvalidAttributeTypeException
     {
         if ( attributes instanceof BasicAttributes )
         {
             try 
             {
-                ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+                Entry entry = new DefaultClientEntry( schemaManager, dn );
     
                 for ( NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMoreElements(); )
                 {
@@ -256,9 +256,9 @@ public class ServerEntryUtils
      * @return the resultant entry after the modification has taken place
      * @throws LdapException if there are problems accessing attributes
      */
-    public static ServerEntry getTargetEntry( Modification mod, ServerEntry entry, SchemaManager schemaManager ) throws LdapException
+    public static Entry getTargetEntry( Modification mod, Entry entry, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry targetEntry = ( ServerEntry ) entry.clone();
+        Entry targetEntry = ( Entry ) entry.clone();
         ModificationOperation modOp = mod.getOperation();
         String id = mod.getAttribute().getId();
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 
 
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.DN;
 
 /**
@@ -37,7 +37,7 @@ public class ServerSearchResult
     private DN dn;
     
     /** The associated entry */
-    private ServerEntry serverEntry;
+    private Entry serverEntry;
     
     /** Tells if the name is relative to the target context */
     private boolean isRelative;
@@ -46,7 +46,7 @@ public class ServerSearchResult
     private Object object;
     
 
-    public ServerSearchResult( DN dn, Object obj, ServerEntry serverEntry )
+    public ServerSearchResult( DN dn, Object obj, Entry serverEntry )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -54,7 +54,7 @@ public class ServerSearchResult
     }
 
 
-    public ServerSearchResult( DN dn, Object obj, ServerEntry serverEntry, boolean isRelative )
+    public ServerSearchResult( DN dn, Object obj, Entry serverEntry, boolean isRelative )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -63,7 +63,7 @@ public class ServerSearchResult
     }
 
 
-    public ServerSearchResult( DN dn, String className, Object obj, ServerEntry serverEntry )
+    public ServerSearchResult( DN dn, String className, Object obj, Entry serverEntry )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -71,7 +71,7 @@ public class ServerSearchResult
     }
 
 
-    public ServerSearchResult( DN dn, String className, Object obj, ServerEntry serverEntry, boolean isRelative ) 
+    public ServerSearchResult( DN dn, String className, Object obj, Entry serverEntry, boolean isRelative ) 
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -91,7 +91,7 @@ public class ServerSearchResult
     /**
      * @return The entry
      */
-    public ServerEntry getServerEntry()
+    public Entry getServerEntry()
     {
         return serverEntry;
     }
@@ -109,7 +109,7 @@ public class ServerSearchResult
     }
 
 
-    public void setServerEntry( ServerEntry serverEntry ) 
+    public void setServerEntry( Entry serverEntry ) 
     {
         this.serverEntry = serverEntry;
     }



Mime
View raw message