directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r648932 [6/7] - in /directory/sandbox/akarasulu/bigbang/apacheds: ./ apacheds-xbean-spring/ benchmarks/ bootstrap-extract/ bootstrap-partition/ bootstrap-plugin/ btree-base/ core-constants/ core-constants/src/main/java/org/apache/directory/...
Date Thu, 17 Apr 2008 02:55:58 GMT
Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Wed Apr 16 19:55:38 2008
@@ -26,13 +26,13 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
 import org.apache.directory.server.schema.registries.NormalizerRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -85,14 +85,14 @@
         description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
         description.setFqcn( entry.get( fqcnAT ).getString() );
         
-        ServerAttribute desc = entry.get( descAT );
+        EntryAttribute desc = entry.get( descAT );
         
         if ( ( desc != null ) && ( desc.size() > 0 ) )
         {
             description.setDescription( desc.getString() );
         }
         
-        ServerAttribute bytecode =  entry.get( byteCodeAT );
+        EntryAttribute bytecode =  entry.get( byteCodeAT );
         
         if ( ( bytecode != null ) && ( bytecode.size() > 0 ) )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java Wed Apr 16 19:55:38 2008
@@ -28,6 +28,7 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SchemaObjectRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.Value;
@@ -89,7 +90,7 @@
     public void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, 
         ServerEntry targetEntry, boolean cascade ) throws NamingException
     {
-        ServerAttribute disabledInMods = mods.get( disabledAT );
+        EntryAttribute disabledInMods = mods.get( disabledAT );
         
         if ( disabledInMods != null )
         {
@@ -98,7 +99,7 @@
         
         // check if the new schema is enabled or disabled
         boolean isEnabled = false;
-        ServerAttribute disabled = targetEntry.get( this.disabledAT );
+        EntryAttribute disabled = targetEntry.get( this.disabledAT );
         
         if ( disabled == null )
         {
@@ -109,7 +110,7 @@
             isEnabled = true;
         }
 
-        ServerAttribute dependencies = mods.get( dependenciesAT );
+        EntryAttribute dependencies = mods.get( dependenciesAT );
         
         if ( dependencies != null )
         {
@@ -130,7 +131,7 @@
     public void modify( LdapDN name, List<Modification> mods, ServerEntry entry,
         ServerEntry targetEntry, boolean cascade ) throws NamingException
     {
-        ServerAttribute disabledInEntry = entry.get( disabledAT );
+        EntryAttribute disabledInEntry = entry.get( disabledAT );
         Modification disabledModification = ServerEntryUtils.getModificationItem( mods, disabledAT );
         
         if ( disabledModification != null )
@@ -143,7 +144,7 @@
 
         // check if the new schema is enabled or disabled
         boolean isEnabled = false;
-        ServerAttribute disabled = targetEntry.get( disabledAT );
+        EntryAttribute disabled = targetEntry.get( disabledAT );
         
         if ( disabled == null )
         {
@@ -188,7 +189,7 @@
 
         // check if the new schema is enabled or disabled
         boolean isEnabled = false;
-        ServerAttribute disabled = entry.get( disabledAT );
+        EntryAttribute disabled = entry.get( disabledAT );
         
         if ( disabled == null )
         {
@@ -244,7 +245,7 @@
      */
     public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
     {
-        ServerAttribute cn = entry.get( cnAT );
+        EntryAttribute cn = entry.get( cnAT );
         String schemaName = cn.getString();
 
         // Before allowing a schema object to be deleted we must check
@@ -314,7 +315,7 @@
 
         // check if the new schema is enabled or disabled
         boolean isEnabled = false;
-        ServerAttribute disabled = entry.get( disabledAT );
+        EntryAttribute disabled = entry.get( disabledAT );
         
         if ( disabled == null )
         {
@@ -379,7 +380,7 @@
     // -----------------------------------------------------------------------
 
     
-    private void disable( LdapDN name, ModificationOperation modOp, ServerAttribute disabledInMods, ServerAttribute disabledInEntry )
+    private void disable( LdapDN name, ModificationOperation modOp, EntryAttribute disabledInMods, EntryAttribute disabledInEntry )
         throws NamingException
     {
         switch ( modOp )
@@ -487,7 +488,7 @@
      */
     private void checkForDependencies( boolean isEnabled, ServerEntry entry ) throws NamingException
     {
-        ServerAttribute dependencies = entry.get( this.dependenciesAT );
+        EntryAttribute dependencies = entry.get( this.dependenciesAT );
 
         if ( dependencies == null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Wed Apr 16 19:55:38 2008
@@ -26,13 +26,13 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -84,14 +84,14 @@
         description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
         description.setFqcn( entry.get( fqcnAT ).getString() );
         
-        ServerAttribute desc = entry.get( descAT );
+        EntryAttribute desc = entry.get( descAT );
         
         if ( desc != null && desc.size() > 0 )
         {
             description.setDescription( desc.getString() );
         }
         
-        ServerAttribute bytecode = entry.get( byteCodeAT );
+        EntryAttribute bytecode = entry.get( byteCodeAT );
         
         if ( bytecode != null && bytecode.size() > 0 )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Wed Apr 16 19:55:38 2008
@@ -37,7 +37,6 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
@@ -50,6 +49,7 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -203,7 +203,7 @@
         {
             ServerEntry entry = ne.next().getServerEntry();
             String oid = entry.get( mOidAT ).getString();
-            ServerAttribute names = entry.get( mNameAT );
+            EntryAttribute names = entry.get( mNameAT );
             targetRegistries.getOidRegistry().register( oid, oid );
             
             for ( Value<?> value:names )
@@ -255,7 +255,7 @@
         
         for ( ServerSearchResult sr: results )
         {
-            ServerAttribute cn = sr.getServerEntry().get( cnAT );
+            EntryAttribute cn = sr.getServerEntry().get( cnAT );
             dependees.add( cn.getString() );
         }
         
@@ -283,7 +283,7 @@
         
         for ( ServerSearchResult sr: results )
         {
-            ServerAttribute cn = sr.getServerEntry().get( cnAT );
+            EntryAttribute cn = sr.getServerEntry().get( cnAT );
             dependees.add( cn.getString() );
         }
         
@@ -740,7 +740,7 @@
 
     private String getOid( ServerEntry entry ) throws NamingException
     {
-        ServerAttribute oid = entry.get( mOidAT );
+        EntryAttribute oid = entry.get( mOidAT );
         
         if ( oid == null )
         {
@@ -760,13 +760,13 @@
         description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
         description.setFqcn( entry.get( fqcnAT ).getString() );
         
-        ServerAttribute desc = entry.get( descAT );
+        EntryAttribute desc = entry.get( descAT );
         if ( desc != null && desc.size() > 0 )
         {
             description.setDescription( desc.getString() );
         }
         
-        ServerAttribute bytecode = entry.get( byteCodeAT );
+        EntryAttribute bytecode = entry.get( byteCodeAT );
         
         if ( bytecode != null && bytecode.size() > 0 )
         {
@@ -825,14 +825,14 @@
         description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
         description.setFqcn( entry.get( fqcnAT ).getString() );
         
-        ServerAttribute desc = entry.get( descAT );
+        EntryAttribute desc = entry.get( descAT );
         
         if ( desc != null && desc.size() > 0 )
         {
             description.setDescription( desc.getString() );
         }
         
-        ServerAttribute bytecode = entry.get( byteCodeAT );
+        EntryAttribute bytecode = entry.get( byteCodeAT );
         
         if ( bytecode != null && bytecode.size() > 0 )
         {
@@ -854,14 +854,14 @@
         description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
         description.setFqcn( entry.get( fqcnAT ).getString() );
         
-        ServerAttribute desc = entry.get( descAT );
+        EntryAttribute desc = entry.get( descAT );
         
         if ( desc != null && desc.size() > 0 )
         {
             description.setDescription( desc.getString() );
         }
         
-        ServerAttribute bytecode = entry.get( byteCodeAT );
+        EntryAttribute bytecode = entry.get( byteCodeAT );
         
         if ( bytecode != null && bytecode.size() > 0 )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Wed Apr 16 19:55:38 2008
@@ -25,6 +25,7 @@
 import org.apache.directory.server.schema.registries.ObjectClassRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -200,14 +201,14 @@
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyRemove( ObjectClassRegistry registry, LdapDN name, ModificationOperation mod,
-        ServerAttribute attribute, ServerAttribute entryObjectClasses ) throws NamingException
+        EntryAttribute attribute, EntryAttribute entryObjectClasses ) throws NamingException
     {
         if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )
         {
             return;
         }
 
-        if ( !attribute.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !((ServerAttribute)attribute).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             return;
         }
@@ -472,7 +473,7 @@
 
             if ( rdnAttributes.contains( id ) )
             {
-                ServerAttribute rdnAttr = entry.get( id );
+                EntryAttribute rdnAttr = entry.get( id );
 
                 // if the attribute values to delete are not specified then all values
                 // for the attribute are to be deleted in which case we must just throw
@@ -643,7 +644,7 @@
                 // of the Rdn attribute so we must check if one of those values
                 // are used by the Rdn attribute value pair for the name of the entry
                 String rdnValue = getRdnValue( id, name, oidRegistry );
-                ServerAttribute rdnAttr = entry.get( id );
+                EntryAttribute rdnAttr = entry.get( id );
                 
                 for ( Value<?> value:rdnAttr )
                 {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java Wed Apr 16 19:55:38 2008
@@ -36,6 +36,7 @@
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -124,7 +125,7 @@
         if ( entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT ) != null )
         {
             Set<String> depsSet = new HashSet<String>();
-            ServerAttribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
+            EntryAttribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
             
             for ( Value<?> value:depsAttr )
             {
@@ -138,7 +139,7 @@
     }
     
     
-    private SyntaxChecker getSyntaxChecker( String syntaxOid, String className, ServerAttribute bytecode, Registries targetRegistries )
+    private SyntaxChecker getSyntaxChecker( String syntaxOid, String className, EntryAttribute bytecode, Registries targetRegistries )
         throws NamingException
     {
         Class<?> clazz = null;
@@ -235,7 +236,7 @@
     }
     
     
-    private Comparator getComparator( String className, ServerAttribute bytecode, Registries targetRegistries ) 
+    private Comparator getComparator( String className, EntryAttribute bytecode, Registries targetRegistries ) 
         throws NamingException
     {
         Comparator comparator = null;
@@ -337,7 +338,7 @@
     }
     
     
-    private Normalizer getNormalizer( String className, ServerAttribute bytecode, Registries targetRegistries ) 
+    private Normalizer getNormalizer( String className, EntryAttribute bytecode, Registries targetRegistries ) 
         throws NamingException
     {
         Class<?> clazz = null;
@@ -578,7 +579,7 @@
     }
     
     
-    private String[] getStrings( ServerAttribute attr ) throws NamingException
+    private String[] getStrings( EntryAttribute attr ) throws NamingException
     {
         if ( attr == null )
         {
@@ -707,7 +708,7 @@
             mso.setDescription( entry.get( MetaSchemaConstants.M_DESCRIPTION_AT ).getString() ); 
         }
 
-        ServerAttribute names = entry.get( MetaSchemaConstants.M_NAME_AT );
+        EntryAttribute names = entry.get( MetaSchemaConstants.M_NAME_AT );
         
         if ( names != null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Wed Apr 16 19:55:38 2008
@@ -50,6 +50,8 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -809,7 +811,7 @@
      * @return true if the objectClass values require the attribute, false otherwise
      * @throws NamingException if the attribute is not recognized
      */
-    private boolean isRequired( String attrId, ServerAttribute objectClasses ) throws NamingException
+    private boolean isRequired( String attrId, EntryAttribute objectClasses ) throws NamingException
     {
         OidRegistry oidRegistry = registries.getOidRegistry();
         ObjectClassRegistry registry = registries.getObjectClassRegistry();
@@ -878,7 +880,7 @@
      * @return
      * @throws NamingException
      */
-    private ServerAttribute getResultantObjectClasses( ModificationOperation modOp, ServerAttribute changes, ServerAttribute existing ) throws NamingException
+    private EntryAttribute getResultantObjectClasses( ModificationOperation modOp, EntryAttribute changes, EntryAttribute existing ) throws NamingException
     {
         if ( ( changes == null ) && ( existing == null ) )
         {
@@ -927,7 +929,7 @@
     }
 
 
-    private boolean getObjectClasses( ServerAttribute objectClasses, List<ObjectClass> result ) throws NamingException
+    private boolean getObjectClasses( EntryAttribute objectClasses, List<ObjectClass> result ) throws NamingException
     {
         Set<String> ocSeen = new HashSet<String>();
         ObjectClassRegistry registry = registries.getObjectClassRegistry();
@@ -967,7 +969,7 @@
     }
 
     
-    private Set<String> getAllMust( ServerAttribute objectClasses ) throws NamingException
+    private Set<String> getAllMust( EntryAttribute objectClasses ) throws NamingException
     {
         Set<String> must = new HashSet<String>();
 
@@ -992,7 +994,7 @@
         return must;
     }
 
-    private Set<String> getAllAllowed( ServerAttribute objectClasses, Set<String> must ) throws NamingException
+    private Set<String> getAllAllowed( EntryAttribute objectClasses, Set<String> must ) throws NamingException
     {
         Set<String> allowed = new HashSet<String>( must );
 
@@ -1031,7 +1033,7 @@
      * @param objectClassAttr the objectClass attribute to modify
      * @throws NamingException if there are problems 
      */
-    private void alterObjectClasses( ServerAttribute objectClassAttr ) throws NamingException
+    private void alterObjectClasses( EntryAttribute objectClassAttr ) throws NamingException
     {
         Set<String> objectClasses = new HashSet<String>();
         Set<String> objectClassesUP = new HashSet<String>();
@@ -1214,7 +1216,7 @@
         }
         
         // Get the objectClass attribute.
-        ServerAttribute objectClass;
+        EntryAttribute objectClass;
 
         if ( objectClassMod == null )
         {
@@ -1230,25 +1232,12 @@
         {
             objectClass = getResultantObjectClasses( 
                 objectClassMod.getOperation(), 
-                (ServerAttribute)objectClassMod.getAttribute(),
+                objectClassMod.getAttribute(),
                 entry.get( SchemaConstants.OBJECT_CLASS_AT ) );
         }
 
         ObjectClassRegistry ocRegistry = this.registries.getObjectClassRegistry();
 
-        // -------------------------------------------------------------------
-        // DIRSERVER-646 Fix: Replacing an unknown attribute with no values 
-        // (deletion) causes an error
-        // -------------------------------------------------------------------
-        
-        if ( ( mods.size() == 1 ) && 
-             ( mods.get( 0 ).getAttribute().size() == 0 ) && 
-             ( mods.get( 0 ).getOperation() == ModificationOperation.REPLACE_ATTRIBUTE ) &&
-             ! atRegistry.hasAttributeType( mods.get( 0 ).getAttribute().getId() ) )
-        {
-            return;
-        }
-        
         // Now, apply the modifications on the cloned entry before applying it on the
         // real object.
         for ( Modification mod:mods )
@@ -1274,7 +1263,7 @@
             switch ( modOp )
             {
                 case ADD_ATTRIBUTE :
-                    ServerAttribute attr = tmpEntry.get( change.getUpId() );
+                    EntryAttribute attr = tmpEntry.get( change.getUpId() );
                     
                     if ( attr != null ) 
                     {
@@ -1326,7 +1315,7 @@
                         }
 
                         // Now remove the attribute and all its values
-                        ServerAttribute modified = tmpEntry.remove( change.getUpId() ).get(0);
+                        EntryAttribute modified = tmpEntry.removeAttributes( change.getUpId() ).get(0);
                         
                         // And inject back the values except the ones to remove
                         for ( Value<?> value:change )
@@ -1364,7 +1353,7 @@
                     
                     if ( attr != null )
                     {
-                        tmpEntry.remove( change.getUpId() );
+                        tmpEntry.removeAttributes( change.getUpId() );
                     }
                     
                     attr = new DefaultServerAttribute( change.getUpId(), attributeType );
@@ -1472,15 +1461,15 @@
     private void filterObjectClass( ServerEntry entry ) throws NamingException
     {
         List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
-        ServerAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
         
         if ( oc != null )
         {
             getObjectClasses( oc, objectClasses );
 
-            entry.remove( SchemaConstants.OBJECT_CLASS_AT );
+            entry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT );
 
-            ServerAttribute newOc = new DefaultServerAttribute( oc.getAttributeType() );
+            ServerAttribute newOc = new DefaultServerAttribute( ((ServerAttribute)oc).getAttributeType() );
 
             for ( ObjectClass currentOC:objectClasses )
             {
@@ -1499,9 +1488,9 @@
          * start converting values of attributes to byte[]s which are not
          * human readable and those that are in the binaries set
          */
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
-            if ( !attribute.getAttributeType().getSyntax().isHumanReadable() )
+            if ( !((ServerAttribute)attribute).getAttributeType().getSyntax().isHumanReadable() )
             {
                 List<Value<?>> binaries = new ArrayList<Value<?>>();
                 
@@ -1511,12 +1500,12 @@
                 
                     if ( attrValue instanceof String )
                     {
-                        binaries.add( new ServerBinaryValue( attribute.getAttributeType(), 
+                        binaries.add( new ServerBinaryValue( ((ServerAttribute)attribute).getAttributeType(), 
                             StringTools.getBytesUtf8( ( String ) attrValue ) ) );
                     }
                     else
                     {
-                        binaries.add( new ServerBinaryValue( attribute.getAttributeType(),
+                        binaries.add( new ServerBinaryValue( ((ServerAttribute)attribute).getAttributeType(),
                             (byte[])attrValue ) );
                     }
                 }
@@ -1588,7 +1577,7 @@
         // 3-1) Except if the extensibleObject ObjectClass is used
         // 3-2) or if the AttributeType is COLLECTIVE
         // 4) We also check that for H-R attributes, we have a valid String in the values
-        ServerAttribute objectClassAttr = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClassAttr = entry.get( SchemaConstants.OBJECT_CLASS_AT );
         
         // Protect the server against a null objectClassAttr
         // It can be the case if the user forgot to add it to the entry ...
@@ -1657,18 +1646,18 @@
     {
         // Never check the attributes if the extensibleObject objectClass is
         // declared for this entry
-        ServerAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
         if ( objectClass.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
         {
             return;
         }
 
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
-            String attrOid = attribute.getAttributeType().getOid();
+            String attrOid = ((ServerAttribute)attribute).getAttributeType().getOid();
 
-            AttributeType attributeType = attribute.getAttributeType();
+            AttributeType attributeType = ((ServerAttribute)attribute).getAttributeType();
 
             if ( !attributeType.isCollective() && ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS ) )
             {
@@ -1700,9 +1689,9 @@
     /**
      * Checks to see number of values of an attribute conforms to the schema
      */
-    private void assertNumberOfAttributeValuesValid( ServerEntry entry ) throws InvalidAttributeValueException, NamingException
+    private void assertNumberOfAttributeValuesValid( Entry entry ) throws InvalidAttributeValueException, NamingException
     {
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
             assertNumberOfAttributeValuesValid( attribute );
         }
@@ -1711,9 +1700,9 @@
     /**
      * Checks to see numbers of values of attributes conforms to the schema
      */
-    private void assertNumberOfAttributeValuesValid( ServerAttribute attribute ) throws InvalidAttributeValueException, NamingException
+    private void assertNumberOfAttributeValuesValid( EntryAttribute attribute ) throws InvalidAttributeValueException, NamingException
     {
-        if ( attribute.size() > 1 && attribute.getAttributeType().isSingleValue() )
+        if ( attribute.size() > 1 && ((ServerAttribute)attribute).getAttributeType().isSingleValue() )
         {                
             throw new LdapInvalidAttributeValueException( "More than one value has been provided " +
                 "for the single-valued attribute: " + attribute.getUpId(), ResultCodeEnum.CONSTRAINT_VIOLATION );
@@ -1723,12 +1712,12 @@
     /**
      * Checks to see the presence of all required attributes within an entry.
      */
-    private void assertRequiredAttributesPresent( LdapDN dn, ServerEntry entry, Set<String> must )
+    private void assertRequiredAttributesPresent( LdapDN dn, Entry entry, Set<String> must )
         throws NamingException
     {
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
-            must.remove( attribute.getAttributeType().getOid() );
+            must.remove( ((ServerAttribute)attribute).getAttributeType().getOid() );
         }
 
         if ( must.size() != 0 )
@@ -1815,12 +1804,12 @@
     /**
      * Check the entry attributes syntax, using the syntaxCheckers
      */
-    private void assertSyntaxes( ServerEntry entry ) throws NamingException
+    private void assertSyntaxes( Entry entry ) throws NamingException
     {
         // First, loop on all attributes
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
-            AttributeType attributeType = attribute.getAttributeType();
+            AttributeType attributeType = ((ServerAttribute)attribute).getAttributeType();
             SyntaxChecker syntaxChecker =  attributeType.getSyntax().getSyntaxChecker();
             
             if ( syntaxChecker instanceof AcceptAllSyntaxChecker )
@@ -1855,7 +1844,7 @@
      * 
      * If this is the case, try to change it to a String value.
      */
-    private boolean checkHumanReadable( ServerAttribute attribute ) throws NamingException
+    private boolean checkHumanReadable( EntryAttribute attribute ) throws NamingException
     {
         boolean isModified = false;
 
@@ -1896,7 +1885,7 @@
      * 
      * If this is the case, try to change it to a binary value.
      */
-    private boolean checkNotHumanReadable( ServerAttribute attribute ) throws NamingException
+    private boolean checkNotHumanReadable( EntryAttribute attribute ) throws NamingException
     {
         boolean isModified = false;
 
@@ -1950,9 +1939,9 @@
         ServerEntry clonedEntry = null;
 
         // Loops on all attributes
-        for ( ServerAttribute attribute:entry )
+        for ( EntryAttribute attribute:entry )
         {
-            AttributeType attributeType = attribute.getAttributeType();
+            AttributeType attributeType = ((ServerAttribute)attribute).getAttributeType();
 
             // If the attributeType is H-R, check all of its values
             if ( attributeType.getSyntax().isHumanReadable() )

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java Wed Apr 16 19:55:38 2008
@@ -51,6 +51,7 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.Value;
@@ -288,7 +289,7 @@
 
     public void add( LdapDN name, ServerEntry entry ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -337,7 +338,7 @@
 
     public void delete( LdapDN name, ServerEntry entry, boolean doCascadeDelete ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -386,7 +387,7 @@
     public void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, 
         ServerEntry targetEntry, boolean cascade ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -415,7 +416,7 @@
     public void modify( LdapDN name, List<Modification> mods, ServerEntry entry, ServerEntry targetEntry,
         boolean doCascadeModify ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -446,7 +447,7 @@
     public void modifyRn( LdapDN name, Rdn newRdn, boolean deleteOldRn, ServerEntry entry, boolean doCascadeModify ) 
         throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -475,7 +476,7 @@
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, 
         boolean cascade ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -504,7 +505,7 @@
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
         ServerEntry entry, boolean cascade ) throws NamingException
     {
-        ServerAttribute oc = entry.get( objectClassAT );
+        EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -659,7 +660,7 @@
      * @throws NamingException if there are problems updating the registries and the
      * schema partition
      */
-    private void modifyRemoveOperation( String opAttrOid, ServerAttribute mods, boolean doCascadeModify ) 
+    private void modifyRemoveOperation( String opAttrOid, EntryAttribute mods, boolean doCascadeModify ) 
         throws NamingException
     {
         int index = opAttr2handlerIndex.get( opAttrOid );
@@ -793,7 +794,7 @@
      * @throws NamingException if there are problems updating the registries and the
      * schema partition
      */
-    private void modifyAddOperation( String opAttrOid, ServerAttribute mods, boolean doCascadeModify ) throws NamingException
+    private void modifyAddOperation( String opAttrOid, EntryAttribute mods, boolean doCascadeModify ) throws NamingException
     {
         if ( doCascadeModify )
         {
@@ -802,6 +803,7 @@
 
         int index = opAttr2handlerIndex.get( opAttrOid );
         SchemaChangeHandler handler = opAttr2handlerMap.get( opAttrOid );
+        
         switch( index )
         {
             case( COMPARATOR_INDEX ):

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Wed Apr 16 19:55:38 2008
@@ -30,7 +30,6 @@
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerModification;
 import org.apache.directory.server.core.entry.ServerSearchResult;
@@ -43,6 +42,7 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -571,7 +571,7 @@
         LdapDN dn = new LdapDN( "cn=" + schemaName + ",ou=schema" );
         dn.normalize( attrRegistry.getNormalizerMapping() );
         ServerEntry entry = partition.lookup( new LookupOperationContext( registries, dn ) );
-        ServerAttribute disabledAttr = entry.get( disabledAttributeType );
+        EntryAttribute disabledAttr = entry.get( disabledAttributeType );
         List<Modification> mods = new ArrayList<Modification>( 3 );
         
         if ( disabledAttr == null )
@@ -865,7 +865,7 @@
             while( ne.hasMore() )
             {
             	ServerSearchResult sr = ne.next();
-                ServerAttribute disabled = sr.getServerEntry().get( disabledAttributeType );
+            	EntryAttribute disabled = sr.getServerEntry().get( disabledAttributeType );
                 
                 if ( disabled == null )
                 {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Wed Apr 16 19:55:38 2008
@@ -29,6 +29,7 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -335,7 +336,7 @@
         // Add the createTimestamp
         AttributeType createTimestampAT = registries.
             getAttributeTypeRegistry().lookup( SchemaConstants.CREATE_TIMESTAMP_AT );
-        ServerAttribute createTimestamp = mods.get( createTimestampAT );
+        EntryAttribute createTimestamp = mods.get( createTimestampAT );
         attrs.put( SchemaConstants.CREATE_TIMESTAMP_AT, createTimestamp.get() );
 
         // Add the creatorsName
@@ -344,13 +345,13 @@
         // Add the modifyTimestamp
         AttributeType schemaModifyTimestampAT = registries.
             getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT );
-        ServerAttribute schemaModifyTimestamp = mods.get( schemaModifyTimestampAT );
+        EntryAttribute schemaModifyTimestamp = mods.get( schemaModifyTimestampAT );
         attrs.put( SchemaConstants.MODIFY_TIMESTAMP_AT, schemaModifyTimestamp.get() );
 
         // Add the modifiersName
         AttributeType schemaModifiersNameAT = registries.
             getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT );
-        ServerAttribute schemaModifiersName = mods.get( schemaModifiersNameAT );
+        EntryAttribute schemaModifiersName = mods.get( schemaModifiersNameAT );
         attrs.put( SchemaConstants.MODIFIERS_NAME_AT, schemaModifiersName.get() );
 
         // don't swap out if a request for the subentry is in progress or we
@@ -364,7 +365,7 @@
 
     private void addAttribute( ServerEntry attrs, String id ) throws NamingException
     {
-        ServerAttribute attr = schemaSubentry.get( id );
+        EntryAttribute attr = schemaSubentry.get( id );
 
         if ( attr != null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java Wed Apr 16 19:55:38 2008
@@ -43,9 +43,9 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.x509.X509V1CertificateGenerator;
 import org.slf4j.Logger;
@@ -73,7 +73,22 @@
     public static final String CERTIFICATE_PRINCIPAL_DN =
         "CN=ApacheDS, OU=Directory, O=ASF, C=US";
     private static final String ALGORITHM = "RSA";
-    private static final int KEY_SIZE = 1024;
+    
+    /* 
+     * Eventually we have to make several of these parameters configurable,
+     * however note to pass export restrictions we must use a key size of
+     * 512 or less here as the default.  Users can configure this setting
+     * later based on their own legal situations.  This is required to 
+     * classify ApacheDS in the ECCN 5D002 category.  Please see the following
+     * page for more information:
+     * 
+     *    http://www.apache.org/dev/crypto.html
+     * 
+     * Also ApacheDS must be classified on the following page:
+     * 
+     *    http://www.apache.org/licenses/exports
+     */ 
+    private static final int KEY_SIZE = 512;
     private static final long YEAR_MILLIS = 365*24*3600*1000;
     
 
@@ -193,7 +208,8 @@
      */
     public static void addKeyPair( ServerEntry entry ) throws NamingException
     {
-        ServerAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        
         if ( objectClass == null )
         {
             entry.put( SchemaConstants.OBJECT_CLASS_AT, TLS_KEY_INFO_OC, SchemaConstants.INET_ORG_PERSON_OC );

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java Wed Apr 16 19:55:38 2008
@@ -34,6 +34,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.sp.StoredProcEngine;
 import org.apache.directory.server.core.sp.StoredProcUtils;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.util.DirectoryClassUtils;
 
 
@@ -56,7 +57,7 @@
      */
     public Object invokeProcedure( LdapContext rootCtx, String fullSPName, Object[] spArgs ) throws NamingException
     {
-        ServerAttribute javaByteCode = spUnit.get( "javaByteCode" );
+        EntryAttribute javaByteCode = spUnit.get( "javaByteCode" );
         String spName = StoredProcUtils.extractStoredProcName( fullSPName );
         String className = StoredProcUtils.extractStoredProcUnitName( fullSPName );
 

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java Wed Apr 16 19:55:38 2008
@@ -23,7 +23,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.core.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 
 
 /**
@@ -34,10 +34,10 @@
  */
 public class LdapJavaStoredProcClassLoader extends ClassLoader
 {
-    private ServerAttribute javaByteCodeAttr;
+    private EntryAttribute javaByteCodeAttr;
 
 
-    public LdapJavaStoredProcClassLoader( ServerAttribute javaByteCodeAttr )
+    public LdapJavaStoredProcClassLoader( EntryAttribute javaByteCodeAttr )
     {
         // Critical call to super class constructor. Required for true plumbing of class loaders.
         super( LdapJavaStoredProcClassLoader.class.getClassLoader() );

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Wed Apr 16 19:55:38 2008
@@ -22,6 +22,7 @@
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -54,7 +55,7 @@
     }
 
 
-    public boolean evaluate( ExprNode node, ServerAttribute objectClasses ) throws NamingException
+    public boolean evaluate( ExprNode node, EntryAttribute objectClasses ) throws NamingException
     {
         if ( node == null )
         {
@@ -66,7 +67,7 @@
             throw new IllegalArgumentException( "objectClasses cannot be null" );
         }
         
-        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( "Attribute objectClasses should be of id 'objectClass'" );
         }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Wed Apr 16 19:55:38 2008
@@ -23,6 +23,7 @@
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -66,7 +67,7 @@
      * if it rejects the entry
      * @throws NamingException
      */
-    public boolean evaluate( SimpleNode node, ServerAttribute objectClasses ) throws NamingException
+    public boolean evaluate( SimpleNode node, EntryAttribute objectClasses ) throws NamingException
     {
         if ( node == null )
         {
@@ -88,7 +89,7 @@
             throw new IllegalArgumentException( "objectClasses argument cannot be null" );
         }
         
-        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( "objectClasses attribute must be for ID 'objectClass'" );
         }
@@ -123,7 +124,8 @@
         
         if ( Character.isDigit( value.charAt( 0 ) ) )
         {
-            Iterator list = registry.getNameSet( value ).iterator();
+            Iterator<String> list = registry.getNameSet( value ).iterator();
+            
             while ( list.hasNext() )
             {
                 String objectClass = ( String ) list.next();

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Wed Apr 16 19:55:38 2008
@@ -49,6 +49,7 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.Value;
@@ -203,7 +204,7 @@
     {
         int types = 0;
         
-        ServerAttribute oc = subentry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute oc = subentry.get( SchemaConstants.OBJECT_CLASS_AT );
         
         if ( oc == null )
         {
@@ -340,7 +341,7 @@
 
             if ( evaluator.evaluate( ss, apDn, dn, entryAttrs ) )
             {                
-                ServerAttribute operational;
+                EntryAttribute operational;
                 
                 if ( subentry.isAccessControlSubentry() )
                 {
@@ -410,7 +411,7 @@
     	LdapDN name = addContext.getDn();
         ServerEntry entry = addContext.getEntry();
     	
-        ServerAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
@@ -418,7 +419,7 @@
             LdapDN apName = ( LdapDN ) name.clone();
             apName.remove( name.size() - 1 );
             ServerEntry ap = nexus.lookup( new LookupOperationContext( registries, apName ) );
-            ServerAttribute administrativeRole = ap.get( "administrativeRole" );
+            EntryAttribute administrativeRole = ap.get( "administrativeRole" );
 
             // check that administrativeRole has something valid in it for us
             if ( administrativeRole == null || administrativeRole.size() <= 0 )
@@ -516,7 +517,7 @@
 
                 if ( evaluator.evaluate( ss, apDn, name, entry ) )
                 {
-                    ServerAttribute operational;
+                    EntryAttribute operational;
                     
                     if ( subentry.isAccessControlSubentry() )
                     {
@@ -591,7 +592,7 @@
     {
     	LdapDN name = opContext.getDn();
     	ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, name ) );
-        ServerAttribute objectClasses = entry.get( objectClassType );
+    	EntryAttribute objectClasses = entry.get( objectClassType );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
@@ -711,7 +712,7 @@
                 for ( String aSUBENTRY_OPATTRS : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
-                    ServerAttribute opAttr = entry.get( aSUBENTRY_OPATTRS );
+                    EntryAttribute opAttr = entry.get( aSUBENTRY_OPATTRS );
                     
                     if ( opAttr != null )
                     {
@@ -752,7 +753,7 @@
 
         ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, name ) );
         
-        ServerAttribute objectClasses = entry.get( objectClassType );
+        EntryAttribute objectClasses = entry.get( objectClassType );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
@@ -828,7 +829,7 @@
 
         ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, oriChildName ) );
         
-        ServerAttribute objectClasses = entry.get( objectClassType );
+        EntryAttribute objectClasses = entry.get( objectClassType );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
@@ -903,7 +904,7 @@
         
         ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, oriChildName ) );
 
-        ServerAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
@@ -1021,7 +1022,7 @@
         ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, name ) );
         
         ServerEntry oldEntry = (ServerEntry) entry.clone();
-        ServerAttribute objectClasses = entry.get( objectClassType );
+        EntryAttribute objectClasses = entry.get( objectClassType );
         boolean isSubtreeSpecificationModification = false;
         Modification subtreeMod = null;
 
@@ -1294,7 +1295,7 @@
 
         for ( String opAttrId : SUBENTRY_OPATTRS )
         {
-            ServerAttribute opAttr = candidate.get( opAttrId );
+            EntryAttribute opAttr = candidate.get( opAttrId );
 
             if ( ( opAttr != null ) && opAttr.contains( dn ) )
             {
@@ -1331,9 +1332,9 @@
         for ( AttributeType attributeType:operational.getAttributeTypes() )
         {
             ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
-            ServerAttribute result = new DefaultServerAttribute( attributeType );
-            ServerAttribute opAttrAdditions = operational.get( attributeType );
-            ServerAttribute opAttrInEntry = entry.get( attributeType );
+            EntryAttribute result = new DefaultServerAttribute( attributeType );
+            EntryAttribute opAttrAdditions = operational.get( attributeType );
+            EntryAttribute opAttrInEntry = entry.get( attributeType );
 
             for ( Value<?> value:opAttrAdditions )
             {
@@ -1375,7 +1376,7 @@
             }
 
             // see if we can use objectclass if present
-            ServerAttribute objectClasses = 
+            EntryAttribute objectClasses = 
                 result.getServerEntry().get( SchemaConstants.OBJECT_CLASS_AT );
             
             if ( objectClasses != null )
@@ -1419,7 +1420,7 @@
             }
 
             // see if we can use objectclass if present
-            ServerAttribute objectClasses = 
+            EntryAttribute objectClasses = 
                 result.getServerEntry().get( SchemaConstants.OBJECT_CLASS_AT);
             
             if ( objectClasses != null )
@@ -1472,7 +1473,7 @@
                 for ( String aSUBENTRY_OPATTRS : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
-                    ServerAttribute opAttr = oldEntry.get( aSUBENTRY_OPATTRS );
+                    EntryAttribute opAttr = oldEntry.get( aSUBENTRY_OPATTRS );
                     
                     if ( opAttr != null )
                     {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Wed Apr 16 19:55:38 2008
@@ -22,7 +22,6 @@
 
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
@@ -46,6 +45,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -140,7 +140,7 @@
             entry = proxy.lookup( new LookupOperationContext( registries, parentDn ), PartitionNexusProxy.LOOKUP_BYPASS );
         }
 
-        ServerAttribute subentries = entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT );
+        EntryAttribute subentries = entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT );
         
         if ( subentries == null )
         {
@@ -165,7 +165,7 @@
      */
     private void addEntryTriggerSpecs( List<TriggerSpecification> triggerSpecs, ServerEntry entry ) throws NamingException
     {
-        ServerAttribute entryTrigger = entry.get( ENTRY_TRIGGER_ATTR );
+        EntryAttribute entryTrigger = entry.get( ENTRY_TRIGGER_ATTR );
         
         if ( entryTrigger == null )
         {
@@ -462,7 +462,7 @@
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
         ServerEntry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry );
         
-        for ( ServerAttribute attribute:importedEntry )
+        for ( EntryAttribute attribute:importedEntry )
         {
             fakeImportedEntry.put( attribute );
         }
@@ -538,7 +538,7 @@
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
         ServerEntry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry );
         
-        for ( ServerAttribute attribute:importedEntry )
+        for ( EntryAttribute attribute:importedEntry )
         {
             fakeImportedEntry.put( attribute );
         }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Wed Apr 16 19:55:38 2008
@@ -31,6 +31,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -123,7 +124,7 @@
             	ServerSearchResult result = results.next();
                 LdapDN subentryDn = result.getDn();
                 ServerEntry resultEntry = result.getServerEntry();
-                ServerAttribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR );
+                EntryAttribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR );
                 
                 if ( triggerSpec == null )
                 {
@@ -143,7 +144,7 @@
     private boolean hasPrescriptiveTrigger( ServerEntry entry ) throws NamingException
     {
         // only do something if the entry contains prescriptiveTrigger
-        ServerAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
+        EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
 
         return triggerSpec != null;
     }
@@ -152,7 +153,7 @@
     public void subentryAdded( LdapDN normName, ServerEntry entry ) throws NamingException
     {
         // only do something if the entry contains prescriptiveTrigger
-        ServerAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
+        EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
         
         if ( triggerSpec == null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Wed Apr 16 19:55:38 2008
@@ -342,7 +342,7 @@
         assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
             null, null, null, "cn", null, entry, null, null ).size() );
 
-        entry.remove( "cn" );
+        entry.removeAttributes( "cn" );
         assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
             null, null, null, "cn", null, entry, null, null ).size() );
 

Modified: directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/pom.xml?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/pom.xml Wed Apr 16 19:55:38 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-interceptor-kerberos</artifactId>
   <name>ApacheDS Interceptors for Kerberos</name>

Modified: directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Wed Apr 16 19:55:38 2008
@@ -69,6 +69,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.Value;
@@ -311,7 +312,7 @@
             throw new LdapAuthenticationException( "Failed to authenticate user '" + principalDn + "'." );
         }
 
-        ServerAttribute objectClass = userEntry.get( SchemaConstants.OBJECT_CLASS_AT );
+        EntryAttribute objectClass = userEntry.get( SchemaConstants.OBJECT_CLASS_AT );
         
         if ( !objectClass.contains( SchemaConstants.KRB5_PRINCIPAL_OC ) )
         {
@@ -325,13 +326,13 @@
 
         if ( subContext.getPrincipalName() == null )
         {
-            ServerAttribute principalAttribute = userEntry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
+            EntryAttribute principalAttribute = userEntry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
             String principalName = principalAttribute.getString();
             subContext.setPrincipalName( principalName );
             log.debug( "Found principal '{}' from lookup.", principalName );
         }
 
-        ServerAttribute keyVersionNumberAttr = userEntry.get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
+        EntryAttribute keyVersionNumberAttr = userEntry.get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
 
         if ( keyVersionNumberAttr == null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/pom.xml?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/pom.xml Wed Apr 16 19:55:38 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-jdbm-store</artifactId>
   <name>ApacheDS JDBM Store</name>

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Wed Apr 16 19:55:38 2008
@@ -36,6 +36,7 @@
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.*;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.Value;
@@ -1414,7 +1415,7 @@
 
         for ( AttributeType attributeType:mods.getAttributeTypes() )
         {
-            ServerAttribute attr = mods.get( attributeType );
+            EntryAttribute attr = mods.get( attributeType );
 
             switch ( modOp )
             {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/kerberos-shared/pom.xml?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/kerberos-shared/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/kerberos-shared/pom.xml Wed Apr 16 19:55:38 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-kerberos-shared</artifactId>
   <name>ApacheDS Protocol Kerberos Shared</name>

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/pom.xml?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/pom.xml Wed Apr 16 19:55:38 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>mitosis</artifactId>
   <name>ApacheDS replication</name>

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java Wed Apr 16 19:55:38 2008
@@ -23,11 +23,11 @@
 import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 
 
 /**
@@ -65,7 +65,7 @@
             throws NamingException
         {
             ServerEntry entry = result.getServerEntry();
-            ServerAttribute deleted = entry.get( ENTRY_DELETED );
+            EntryAttribute deleted = entry.get( ENTRY_DELETED );
             Object value = deleted == null ? null : deleted.get();
             return ( value == null || !"TRUE".equalsIgnoreCase( value.toString() ) );
         }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java Wed Apr 16 19:55:38 2008
@@ -39,6 +39,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+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.filter.PresenceNode;
@@ -125,8 +126,8 @@
 
         // Insert 'entryUUID' and 'entryDeleted'.
         ServerEntry cloneEntry = ( ServerEntry ) entry.clone();
-        cloneEntry.remove( Constants.ENTRY_UUID );
-        cloneEntry.remove( Constants.ENTRY_DELETED );
+        cloneEntry.removeAttributes( Constants.ENTRY_UUID );
+        cloneEntry.removeAttributes( Constants.ENTRY_DELETED );
         cloneEntry.put( Constants.ENTRY_UUID, uuidFactory.newInstance().toOctetString() );
         cloneEntry.put( Constants.ENTRY_DELETED, "FALSE" );
 
@@ -301,7 +302,7 @@
                 {
                     // Delete the old RDN attribute value
                     String oldRDNAttributeID = oldName.getRdn().getUpType();
-                    ServerAttribute oldRDNAttribute = entry.get( oldRDNAttributeID );
+                    EntryAttribute oldRDNAttribute = entry.get( oldRDNAttributeID );
                     
                     if ( oldRDNAttribute != null )
                     {
@@ -310,7 +311,7 @@
                         if ( removed && oldRDNAttribute.size() == 0 )
                         {
                             // Now an empty attribute, remove it.
-                            entry.remove( oldRDNAttributeID );
+                            entry.removeAttributes( oldRDNAttributeID );
                         }
                     }
                 }
@@ -318,7 +319,7 @@
                 // Add the new RDN attribute value.
                 String newRDNAttributeID = newRdn.getUpType();
                 String newRDNAttributeValue = ( String ) newRdn.getUpValue();
-                ServerAttribute newRDNAttribute = entry.get( newRDNAttributeID );
+                EntryAttribute newRDNAttribute = entry.get( newRDNAttributeID );
                 
                 if ( newRDNAttribute != null )
                 {
@@ -366,7 +367,7 @@
         if ( nexus.hasEntry( new EntryOperationContext( registries, newEntryName ) ) )
         {
             ServerEntry entry = nexus.lookup( new LookupOperationContext( registries, newEntryName ) );
-            ServerAttribute deleted = entry.get( Constants.ENTRY_DELETED );
+            EntryAttribute deleted = entry.get( Constants.ENTRY_DELETED );
             Object value = deleted == null ? null : deleted.get();
 
             /*

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java Wed Apr 16 19:55:38 2008
@@ -24,7 +24,6 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
@@ -32,6 +31,7 @@
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -52,7 +52,7 @@
             return true;
         }
 
-        ServerAttribute entryCSNAttr = entry.get( Constants.ENTRY_CSN );
+        EntryAttribute entryCSNAttr = entry.get( Constants.ENTRY_CSN );
 
         if ( entryCSNAttr == null )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Wed Apr 16 19:55:38 2008
@@ -33,7 +33,6 @@
 import org.apache.directory.mitosis.service.protocol.handler.ReplicationServerProtocolHandler;
 import org.apache.directory.mitosis.store.ReplicationStore;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
@@ -56,6 +55,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -303,7 +303,7 @@
     public void purgeAgedData() throws NamingException
     {
         ServerEntry rootDSE = nexus.getRootDSE( null );
-        ServerAttribute namingContextsAttr = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+        EntryAttribute namingContextsAttr = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
         
         if ( ( namingContextsAttr == null ) || ( namingContextsAttr.size() == 0 ) )
         {

Modified: directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=648932&r1=648931&r2=648932&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Wed Apr 16 19:55:38 2008
@@ -42,11 +42,11 @@
 import org.apache.directory.mitosis.service.protocol.message.LoginMessage;
 import org.apache.directory.mitosis.store.ReplicationLogIterator;
 import org.apache.directory.mitosis.store.ReplicationStore;
-import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -350,7 +350,7 @@
     {
         ServerEntry rootDSE = ctx.getDirectoryService().getPartitionNexus().getRootDSE( null );
 
-        ServerAttribute namingContextsAttr = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+        EntryAttribute namingContextsAttr = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
         
         if ( namingContextsAttr == null || namingContextsAttr.size() == 0 )
         {
@@ -395,7 +395,7 @@
                 ServerEntry attrs = sr.getServerEntry(); 
 
                 // Skip entries without entryCSN attribute.
-                ServerAttribute entryCSNAttr = attrs.get( org.apache.directory.mitosis.common.Constants.ENTRY_CSN );
+                EntryAttribute entryCSNAttr = attrs.get( org.apache.directory.mitosis.common.Constants.ENTRY_CSN );
                 
                 if ( entryCSNAttr == null )
                 {



Mime
View raw message