directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r494169 [1/3] - in /directory/trunks/apacheds/core/src: main/java/org/apache/directory/server/core/ main/java/org/apache/directory/server/core/authn/ main/java/org/apache/directory/server/core/authz/ main/java/org/apache/directory/server/co...
Date Mon, 08 Jan 2007 19:41:50 GMT
Author: elecharny
Date: Mon Jan  8 11:41:45 2007
New Revision: 494169

URL: http://svn.apache.org/viewvc?view=rev&rev=494169
Log:
Patch for DIRSERVER-783.
- No more BasicAttribute and BasicAttributes. Use AttributeImpl and AttributesImpl now.
- No more ModificationItem. use ModificationItemImpl now
- lot of refactoring of imports : no more import xxx.*;

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Jan  8 11:41:45 2007
@@ -64,8 +64,8 @@
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.ldif.Entry;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -450,8 +450,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "person" );
             objectClass.add( "organizationalPerson" );
@@ -483,8 +483,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -507,8 +507,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -532,8 +532,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "groupOfUniqueNames" );
             attributes.put( objectClass );
@@ -558,8 +558,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -582,8 +582,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -606,8 +606,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -630,8 +630,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -654,8 +654,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new LockableAttributesImpl();
-            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+            Attributes attributes = new AttributesImpl();
+            Attribute objectClass = new AttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -806,7 +806,7 @@
         schemaPartitionConfig.setOptimizerEnabled( true );
         schemaPartitionConfig.setSuffix( "ou=schema" );
         
-        Attributes entry = new LockableAttributesImpl();
+        Attributes entry = new AttributesImpl();
         entry.put( "objectClass", "top" );
         entry.get( "objectClass" ).add( "organizationalUnit" );
         entry.put( "ou", "schema" );
@@ -939,7 +939,7 @@
             log.debug( "binary ids used: " + binaries );
         }
 
-        partitionNexus = new DefaultPartitionNexus( new LockableAttributesImpl() );
+        partitionNexus = new DefaultPartitionNexus( new AttributesImpl() );
         partitionNexus.init( configuration, null );
         partitionNexus.addContextPartition( schemaPartitionConfig );
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Mon Jan  8 11:41:45 2007
@@ -33,7 +33,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -48,6 +47,7 @@
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 import org.slf4j.Logger;
@@ -353,7 +353,7 @@
     }
 
     
-    public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         if ( IS_DEBUG )
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Mon Jan  8 11:41:45 2007
@@ -44,6 +44,7 @@
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -54,9 +55,18 @@
 
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;
-import javax.naming.directory.*;
-import java.util.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
 import java.text.ParseException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -528,7 +538,7 @@
     }
 
 
-    public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         // Access the principal requesting the operation, and bypass checks if it is the admin
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -943,7 +953,7 @@
         groupCache.groupRenamed( oriChildName, newName );
     }
 
-    public static final SearchControls DEFUALT_SEARCH_CONTROLS = new SearchControls();
+    public static final SearchControls DEFAULT_SEARCH_CONTROLS = new SearchControls();
 
 
     public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
@@ -957,7 +967,7 @@
             return e;
         }
         AuthorizationFilter authzFilter = new AuthorizationFilter();
-        return new SearchResultFilteringEnumeration( e, DEFUALT_SEARCH_CONTROLS, invocation, authzFilter );
+        return new SearchResultFilteringEnumeration( e, DEFAULT_SEARCH_CONTROLS, invocation, authzFilter );
     }
 
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Mon Jan  8 11:41:45 2007
@@ -30,7 +30,6 @@
 import javax.naming.NoPermissionException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
@@ -48,6 +47,7 @@
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -262,7 +262,7 @@
      * self access these resources.  As far as we're concerned no one but the admin
      * needs access.
      */
-    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
     {
         if ( enabled )
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Mon Jan  8 11:41:45 2007
@@ -20,11 +20,20 @@
 package org.apache.directory.server.core.authz;
 
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.filter.AssertionEnum;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,8 +41,11 @@
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;
-import javax.naming.directory.*;
-import java.util.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 
 
 /**
@@ -340,7 +352,7 @@
      * @param entry the group entry being modified
      * @throws NamingException if there are problems accessing attribute  values
      */
-    public void groupModified( Name name, ModificationItem[] mods, Attributes entry ) throws NamingException
+    public void groupModified( Name name, ModificationItemImpl[] mods, Attributes entry ) throws NamingException
     {
         Attribute members = null;
         String memberAttrId = null;

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon Jan  8 11:41:45 2007
@@ -21,14 +21,19 @@
 
 
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
@@ -43,6 +48,7 @@
 import org.apache.directory.shared.ldap.filter.AssertionEnum;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
@@ -205,7 +211,7 @@
     }
 
 
-    public void subentryModified( LdapDN normName, ModificationItem[] mods, Attributes entry ) throws NamingException
+    public void subentryModified( LdapDN normName, ModificationItemImpl[] mods, Attributes entry ) throws NamingException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Mon Jan  8 11:41:45 2007
@@ -20,7 +20,11 @@
 package org.apache.directory.server.core.authz.support;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Mon Jan  8 11:41:45 2007
@@ -20,7 +20,11 @@
 package org.apache.directory.server.core.authz.support;
 
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Mon Jan  8 11:41:45 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.server.core.subtree.SubentryService;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
@@ -168,7 +168,7 @@
                     // if entry does not have attribute for colattr then create it
                     if ( entryColAttr == null )
                     {
-                        entryColAttr = new LockableAttributeImpl( attrId );
+                        entryColAttr = new AttributeImpl( attrId );
                         entry.put( entryColAttr );
                     }
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Mon Jan  8 11:41:45 2007
@@ -32,13 +32,13 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.shared.ldap.ldif.LdifComposer;
 import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.util.MultiMap;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -183,7 +183,7 @@
         BufferedReader in = new BufferedReader( strIn );
 
         String line = null;
-        Attributes attributes = new BasicAttributes( true );
+        Attributes attributes = new AttributesImpl( true );
 
         try
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Mon Jan  8 11:41:45 2007
@@ -26,12 +26,12 @@
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
@@ -52,7 +52,7 @@
     private int cacheSize = -1;
     private String suffix;
     private Set indexedAttributes; // Set<String> or <IndexConfiguration>
-    private Attributes contextEntry = new BasicAttributes( true );
+    private Attributes contextEntry = new AttributesImpl( true );
     private Partition contextPartition = new JdbmPartition();
 
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Mon Jan  8 11:41:45 2007
@@ -20,6 +20,15 @@
 package org.apache.directory.server.core.event;
 
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
@@ -38,6 +47,7 @@
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 
@@ -48,12 +58,14 @@
 import javax.naming.NamingException;
 import javax.naming.Binding;
 import javax.naming.NamingEnumeration;
-import javax.naming.event.*;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.Attribute;
-import java.util.*;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamespaceChangeListener;
+import javax.naming.event.NamingEvent;
+import javax.naming.event.NamingListener;
+import javax.naming.event.ObjectChangeListener;
 
 
 /**
@@ -270,7 +282,7 @@
     }
 
 
-    private void notifyOnModify( LdapDN name, ModificationItem[] mods, Attributes oriEntry ) throws NamingException
+    private void notifyOnModify( LdapDN name, ModificationItemImpl[] mods, Attributes oriEntry ) throws NamingException
     {
         Attributes entry = nexus.lookup( name );
         Set selecting = getSelectingSources( name, entry );
@@ -305,17 +317,17 @@
         super.modify( next, name, modOp, mods );
 
         // package modifications in ModItem format for event delivery
-        ModificationItem[] modItems = new ModificationItem[mods.size()];
+        ModificationItemImpl[] modItems = new ModificationItemImpl[mods.size()];
         NamingEnumeration list = mods.getAll();
         for ( int ii = 0; ii < modItems.length; ii++ )
         {
-            modItems[ii] = new ModificationItem( modOp, ( Attribute ) list.next() );
+            modItems[ii] = new ModificationItemImpl( modOp, ( Attribute ) list.next() );
         }
         notifyOnModify( name, modItems, oriEntry );
     }
 
 
-    public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Mon Jan  8 11:41:45 2007
@@ -24,7 +24,10 @@
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
@@ -35,8 +38,13 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.shared.ldap.exception.*;
+import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
+import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
+import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -238,7 +246,7 @@
     /**
      * Checks to see the entry being modified exists, otherwise throws the appropriate LdapException.
      */
-    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
     {
         // check if entry to modify exists
         String msg = "Attempt to modify non-existant entry: ";

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Mon Jan  8 11:41:45 2007
@@ -28,7 +28,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.ldap.LdapContext;
 
@@ -39,6 +38,7 @@
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -171,7 +171,7 @@
     }
 
 
-    public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         next.modify( name, mods );
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Mon Jan  8 11:41:45 2007
@@ -27,7 +27,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -36,6 +35,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -93,7 +93,7 @@
  * public void delete( NextInterceptor nextInterceptor, Name name )
  * {
  *     // transform deletion into modification.
- *     Attribute mark = new BasicAttribute( "entryDeleted", "true" );
+ *     Attribute mark = new AttributeImpl( "entryDeleted", "true" );
  *     nextInterceptor.modify( name, DirContext.REPLACE_ATTRIBUTE, mark );
  * }
  * </pre>
@@ -181,7 +181,7 @@
     /**
      * Filters {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} call.
      */
-    void modify( NextInterceptor next, LdapDN name, ModificationItem[] items ) throws NamingException;
+    void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] items ) throws NamingException;
 
 
     /**

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Mon Jan  8 11:41:45 2007
@@ -20,13 +20,17 @@
 package org.apache.directory.server.core.interceptor;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 
 import javax.naming.ConfigurationException;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -38,6 +42,7 @@
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,7 +126,7 @@
         }
 
 
-        public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+        public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
         {
             nexus.modify( name, mods );
         }
@@ -776,7 +781,7 @@
     }
 
 
-    public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         Entry entry = getStartingEntry();
         Interceptor head = entry.configuration.getInterceptor();
@@ -1211,7 +1216,7 @@
                 }
 
 
-                public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+                public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
                 {
                     Entry next = getNextEntry();
                     Interceptor interceptor = next.configuration.getInterceptor();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Mon Jan  8 11:41:45 2007
@@ -27,12 +27,12 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -109,7 +109,7 @@
     /**
      * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])}.
      */
-    void modify( LdapDN name, ModificationItem[] items ) throws NamingException;
+    void modify( LdapDN name, ModificationItemImpl[] items ) throws NamingException;
 
 
     /**

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Mon Jan  8 11:41:45 2007
@@ -41,6 +41,7 @@
 
 import org.apache.directory.server.core.configuration.SyncConfiguration;
 import org.apache.directory.shared.ldap.exception.LdapServiceUnavailableException;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 
@@ -113,6 +114,12 @@
     }
 
 
+    public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
+    {
+        throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
+    }
+
+
     public Attributes getAttributes( Name name ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
@@ -125,6 +132,11 @@
     }
 
 
+    public void modifyAttributes( Name name, ModificationItem[] mods ) throws NamingException
+    {
+        throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
+    }
+
     public DirContext getSchema( String name ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
@@ -149,13 +161,13 @@
     }
 
 
-    public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
+    public void modifyAttributes( String name, ModificationItemImpl[] mods ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public void modifyAttributes( Name name, ModificationItem[] mods ) throws NamingException
+    public void modifyAttributes( Name name, ModificationItemImpl[] mods ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Mon Jan  8 11:41:45 2007
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -173,7 +173,7 @@
          * objectClass: javaContainer
          * objectClass: javaSerializedObject
          */
-        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+        Attribute objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( TOP_ATTR );
         objectClass.add( JOBJECT_ATTR );
         objectClass.add( JCONTAINER_ATTR );
@@ -186,7 +186,7 @@
 
         // Add all the class names this object can be cast to:
         Class[] classes = obj.getClass().getClasses();
-        Attribute javaClassNames = new LockableAttributeImpl( JCLASSNAMES_ATTR );
+        Attribute javaClassNames = new AttributeImpl( JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon Jan  8 11:41:45 2007
@@ -54,7 +54,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -297,7 +297,7 @@
      */
     public Context createSubcontext( Name name ) throws NamingException
     {
-        Attributes attributes = new LockableAttributesImpl();
+        Attributes attributes = new AttributesImpl();
         LdapDN target = buildTarget( name );
         injectRdnAttributeValues( target, attributes );
         
@@ -399,7 +399,7 @@
         else if ( obj instanceof Serializable )
         {
             // Serialize and add outAttrs
-            Attributes attributes = new LockableAttributesImpl();
+            Attributes attributes = new AttributesImpl();
             if ( outAttrs != null && outAttrs.size() > 0 )
             {
                 NamingEnumeration list = outAttrs.getAll();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Mon Jan  8 11:41:45 2007
@@ -51,6 +51,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParserImpl;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -158,13 +159,29 @@
         getNexusProxy().modify( buildTarget( name ), modOp, attrs );
     }
 
-
     /**
      * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
      *      javax.naming.directory.ModificationItem[])
      */
     public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
     {
+        ModificationItemImpl[] newMods = new ModificationItemImpl[ mods.length ];
+        
+        for ( int i = 0; i < mods.length; i++ )
+        {
+            newMods[i] = new ModificationItemImpl( mods[i] );
+        }
+        
+        modifyAttributes( new LdapDN( name ), newMods );
+    }
+
+
+    /**
+     * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
+     *      javax.naming.directory.ModificationItem[])
+     */
+    public void modifyAttributes( String name, ModificationItemImpl[] mods ) throws NamingException
+    {
         modifyAttributes( new LdapDN( name ), mods );
     }
 
@@ -174,6 +191,23 @@
      * javax.naming.Name, javax.naming.directory.ModificationItem[])
      */
     public void modifyAttributes( Name name, ModificationItem[] mods ) throws NamingException
+    {
+        ModificationItemImpl[] newMods = new ModificationItemImpl[ mods.length ];
+        
+        for ( int i = 0; i < mods.length; i++ )
+        {
+            newMods[i] = new ModificationItemImpl( mods[i] );
+        }
+        
+        getNexusProxy().modify( buildTarget( name ), newMods );
+    }
+
+
+    /**
+     * @see javax.naming.directory.DirContext#modifyAttributes(
+     * javax.naming.Name, javax.naming.directory.ModificationItem[])
+     */
+    public void modifyAttributes( Name name, ModificationItemImpl[] mods ) throws NamingException
     {
         getNexusProxy().modify( buildTarget( name ), mods );
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Mon Jan  8 11:41:45 2007
@@ -27,7 +27,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -48,6 +47,7 @@
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -120,7 +120,7 @@
     }
 
 
-    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
     {
         LdapDN normalized = LdapDN.normalize( name, attributeRegistry.getNormalizerMapping() );
         nextInterceptor.modify( normalized, items );

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Mon Jan  8 11:41:45 2007
@@ -23,16 +23,14 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
@@ -52,6 +50,9 @@
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -138,11 +139,11 @@
     {
         String principal = getPrincipal().getName();
 
-        BasicAttribute attribute = new BasicAttribute( "creatorsName" );
+        Attribute attribute = new AttributeImpl( "creatorsName" );
         attribute.add( principal );
         entry.put( attribute );
 
-        attribute = new BasicAttribute( "createTimestamp" );
+        attribute = new AttributeImpl( "createTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         entry.put( attribute );
 
@@ -156,12 +157,12 @@
         nextInterceptor.modify( name, modOp, attrs );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new BasicAttributes( true );
-        BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new BasicAttribute( "modifyTimestamp" );
+        attribute = new AttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -169,17 +170,17 @@
     }
 
 
-    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
     {
         nextInterceptor.modify( name, items );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new BasicAttributes( true );
-        BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new BasicAttribute( "modifyTimestamp" );
+        attribute = new AttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -193,12 +194,12 @@
         nextInterceptor.modifyRn( name, newRn, deleteOldRn );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new BasicAttributes( true );
-        BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new BasicAttribute( "modifyTimestamp" );
+        attribute = new AttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -215,12 +216,12 @@
         nextInterceptor.move( name, newParentName );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new BasicAttributes( true );
-        BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new BasicAttribute( "modifyTimestamp" );
+        attribute = new AttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -234,12 +235,12 @@
         nextInterceptor.move( name, newParentName, newRn, deleteOldRn );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new BasicAttributes( true );
-        BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new BasicAttribute( "modifyTimestamp" );
+        attribute = new AttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -341,11 +342,11 @@
 
         if ( dn.size() == 0 )
         {
-            HashSet idsSet = new HashSet( ids.length );
+            Set<String> idsSet = new HashSet<String>( ids.length );
 
-            for ( int ii = 0; ii < ids.length; ii++ )
+            for ( String id:ids  )
             {
-                idsSet.add( ids[ii].toLowerCase() );
+                idsSet.add( id.toLowerCase() );
             }
 
             NamingEnumeration list = entry.getIDs();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Mon Jan  8 11:41:45 2007
@@ -29,10 +29,10 @@
 import javax.naming.OperationNotSupportedException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -222,21 +222,21 @@
 
     /**
      * This method forwards the request to
-     * {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} after
-     * translating parameters to {@link ModificationItem}<tt>[]</tt> by default.
+     * {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItemImpl[])} after
+     * translating parameters to {@link ModificationItemImpl}<tt>[]</tt> by default.
      * Please override this method if there is more effactive way for your
      * implementation.
      */
     public void modify( LdapDN name, int modOp, Attributes mods ) throws NamingException
     {
-        List<ModificationItem> items = new ArrayList<ModificationItem>( mods.size() );
+        List<ModificationItemImpl> items = new ArrayList<ModificationItemImpl>( mods.size() );
         NamingEnumeration e = mods.getAll();
         while ( e.hasMore() )
         {
-            items.add( new ModificationItem( modOp, ( Attribute ) e.next() ) );
+            items.add( new ModificationItemImpl( modOp, ( Attribute ) e.next() ) );
         }
 
-        ModificationItem[] itemsArray = new ModificationItem[items.size()];
+        ModificationItemImpl[] itemsArray = new ModificationItemImpl[items.size()];
         itemsArray = items.toArray( itemsArray );
         modify( name, itemsArray );
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Jan  8 11:41:45 2007
@@ -38,7 +38,6 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
@@ -57,9 +56,10 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.EntryChangeControl;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.PersistentSearchControl;
 import org.apache.directory.shared.ldap.message.SubentriesControl;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
@@ -132,38 +132,38 @@
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
-        Attribute attr = new LockableAttributeImpl( "subschemaSubentry" );
+        Attribute attr = new AttributeImpl( "subschemaSubentry" );
         attr.add( "cn=schema,ou=system" );
         rootDSE.put( attr );
 
-        attr = new LockableAttributeImpl( "supportedLDAPVersion" );
+        attr = new AttributeImpl( "supportedLDAPVersion" );
         rootDSE.put( attr );
         attr.add( "3" );
 
-        attr = new LockableAttributeImpl( "supportedFeatures" );
+        attr = new AttributeImpl( "supportedFeatures" );
         rootDSE.put( attr );
         attr.add( "1.3.6.1.4.1.4203.1.5.1" );
 
-        attr = new LockableAttributeImpl( "supportedExtension" );
+        attr = new AttributeImpl( "supportedExtension" );
         rootDSE.put( attr );
         attr.add( NoticeOfDisconnect.EXTENSION_OID );
 
-        attr = new LockableAttributeImpl( "supportedControl" );
+        attr = new AttributeImpl( "supportedControl" );
         rootDSE.put( attr );
         attr.add( PersistentSearchControl.CONTROL_OID );
         attr.add( EntryChangeControl.CONTROL_OID );
         attr.add( SubentriesControl.CONTROL_OID );
         attr.add( ManageDsaITControl.CONTROL_OID );
 
-        attr = new LockableAttributeImpl( "objectClass" );
+        attr = new AttributeImpl( "objectClass" );
         rootDSE.put( attr );
         attr.add( "top" );
         attr.add( "extensibleObject" );
 
-        attr = new LockableAttributeImpl( NAMINGCTXS_ATTR );
+        attr = new AttributeImpl( NAMINGCTXS_ATTR );
         rootDSE.put( attr );
 
-        attr = new LockableAttributeImpl( VENDORNAME_ATTR );
+        attr = new AttributeImpl( VENDORNAME_ATTR );
         attr.add( ASF );
         rootDSE.put( attr );
 
@@ -177,7 +177,7 @@
             log.error( "failed to log version properties" );
         }
 
-        attr = new LockableAttributeImpl( VENDORVERSION_ATTR );
+        attr = new AttributeImpl( VENDORVERSION_ATTR );
         attr.add( props.getProperty( "apacheds.version", "UNKNOWN" ) );
         rootDSE.put( attr );
     }
@@ -256,7 +256,7 @@
             Attribute objectClassAttr = systemEntry.get( "objectClass" );
             if ( objectClassAttr == null )
             {
-                objectClassAttr = new LockableAttributeImpl(  "objectClass" );
+                objectClassAttr = new AttributeImpl(  "objectClass" );
                 systemEntry.put( objectClassAttr );
             }
             objectClassAttr.add( "top" );
@@ -346,8 +346,8 @@
             systemCfg.setIndexedAttributes( indexedSystemAttrs );
     
             // Add context entry for system partition
-            Attributes systemEntry = new LockableAttributesImpl();
-            Attribute objectClassAttr = new LockableAttributeImpl( "objectClass" );
+            Attributes systemEntry = new AttributesImpl();
+            Attribute objectClassAttr = new AttributeImpl( "objectClass" );
             objectClassAttr.add( "top" );
             objectClassAttr.add( "organizationalUnit" );
             objectClassAttr.add( "extensibleObject" );
@@ -705,7 +705,7 @@
     /**
      * @see Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])
      */
-    public void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException
+    public void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException
     {
         Partition backend = getBackend( dn );
         backend.modify( dn, mods );
@@ -794,7 +794,7 @@
                 // return nothing
                 if ( containsOneDotOne )
                 {
-                    SearchResult result = new SearchResult( "", null, new LockableAttributesImpl(), false );
+                    SearchResult result = new SearchResult( "", null, new AttributesImpl(), false );
                     return new SingletonEnumeration( result );
                 }
                 
@@ -805,7 +805,7 @@
                     return new SingletonEnumeration( result );
                 }
                 
-                Attributes attrs = new LockableAttributesImpl();
+                Attributes attrs = new AttributesImpl();
                 if ( containsAsterisk )
                 {
                     for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
@@ -890,7 +890,7 @@
     {
         if ( dn.size() == 0 )
         {
-            Attributes retval = new LockableAttributesImpl();
+            Attributes retval = new AttributesImpl();
             NamingEnumeration list = rootDSE.getIDs();
             while ( list.hasMore() )
             {
@@ -1003,7 +1003,7 @@
         Attribute supportedExtension = rootDSE.get( "supportedExtension" );
         if ( supportedExtension == null )
         {
-            supportedExtension = new LockableAttributeImpl( "supportedExtension" );
+            supportedExtension = new AttributeImpl( "supportedExtension" );
             rootDSE.put( supportedExtension );
         }
         for ( Iterator oids = extensionOids.iterator(); oids.hasNext(); )

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Mon Jan  8 11:41:45 2007
@@ -27,13 +27,13 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -151,7 +151,7 @@
      * @throws NamingException if there are any problems
      * @see ModificationItem
      */
-    void modify( LdapDN name, ModificationItem[] items ) throws NamingException;
+    void modify( LdapDN name, ModificationItemImpl[] items ) throws NamingException;
 
 
     /**

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Mon Jan  8 11:41:45 2007
@@ -20,7 +20,13 @@
 package org.apache.directory.server.core.partition;
 
 
-import java.util.*; 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.naming.Context;
 import javax.naming.Name;
@@ -28,7 +34,6 @@
 import javax.naming.NamingException;
 import javax.naming.ServiceUnavailableException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchResult;
@@ -48,6 +53,7 @@
 import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
 import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -372,13 +378,13 @@
     }
 
 
-    public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+    public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
     {
         modify( name, mods, null );
     }
 
 
-    public void modify( LdapDN name, ModificationItem[] mods, Collection bypass ) throws NamingException
+    public void modify( LdapDN name, ModificationItemImpl[] mods, Collection bypass ) throws NamingException
     {
         ensureStarted();
         InvocationStack stack = InvocationStack.getInstance();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Jan  8 11:41:45 2007
@@ -30,7 +30,6 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -45,7 +44,8 @@
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -408,7 +408,7 @@
     public abstract void modify( LdapDN dn, int modOp, Attributes mods ) throws NamingException;
 
 
-    public abstract void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException;
+    public abstract void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException;
 
 
     private static final String[] ENTRY_DELETED_ATTRS = new String[] { "entrydeleted" };
@@ -447,7 +447,7 @@
         }
 
         Attributes entry = lookup( dn );
-        Attributes retval = new LockableAttributesImpl();
+        Attributes retval = new AttributesImpl();
 
         for ( int ii = 0; ii < attrIds.length; ii++ )
         {

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Jan  8 11:41:45 2007
@@ -29,7 +29,7 @@
 
 import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -121,7 +121,7 @@
         }
         else if ( attrIdsHasPlus )
         {
-            entry = new LockableAttributesImpl();
+            entry = new AttributesImpl();
 
             // add all listed attributes
             for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -158,7 +158,7 @@
         }
         else if ( attrIdsHasStar )
         {
-            entry = new LockableAttributesImpl();
+            entry = new AttributesImpl();
 
             // add all listed operational attributes
             for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -193,7 +193,7 @@
         }
         else
         {
-            entry = new LockableAttributesImpl();
+            entry = new AttributesImpl();
 
             Attributes attrs = rec.getAttributes();
             

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java Mon Jan  8 11:41:45 2007
@@ -40,7 +40,7 @@
 import javax.swing.JTable;
 import javax.swing.JTextField;
 
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,7 +71,7 @@
     private JButton m_cancelBut = new JButton();
     private JPopupMenu m_popup;
 
-    private Attributes m_childEntry = new LockableAttributesImpl();
+    private Attributes m_childEntry = new AttributesImpl();
 
 
     /**

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java Mon Jan  8 11:41:45 2007
@@ -26,7 +26,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 
 import jdbm.helper.Serializer;
 
@@ -64,7 +64,7 @@
     public final Object deserialize( byte[] buf ) throws IOException
     {
         String id = readString( buf );
-        LockableAttributeImpl attr = new LockableAttributeImpl( id );
+        AttributeImpl attr = new AttributeImpl( id );
         int pos = ( id.length() << 1 ) + 4;
         
         // read the type of the objects stored in this attribute
@@ -101,7 +101,7 @@
     public static final DeserializedAttribute deserialize( byte[] buf, int offset ) throws IOException
     {
         final String id = readString( buf, offset );
-        final LockableAttributeImpl attr = new LockableAttributeImpl( id );
+        final AttributeImpl attr = new AttributeImpl( id );
         int pos = ( id.length() << 1 ) + 4 + offset;
         
         // read the type of the objects stored in this attribute

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java Mon Jan  8 11:41:45 2007
@@ -27,8 +27,8 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 import jdbm.helper.Serializer;
 
@@ -51,15 +51,15 @@
     {
         if ( buf.length == 0 )
         {
-            return new LockableAttributesImpl();
+            return new AttributesImpl();
         }
 
         int pos = 0;
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
+        AttributesImpl attrs = new AttributesImpl();
         while ( pos < buf.length )
         {
             String id = AttributeSerializer.readString( buf, pos );
-            LockableAttributeImpl attr = new LockableAttributeImpl( id );
+            AttributeImpl attr = new AttributeImpl( id );
             pos += ( id.length() << 1 ) + 4;
 
             // read the type of the objects stored in this attribute

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=494169&r1=494168&r2=494169
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Jan  8 11:41:45 2007
@@ -28,7 +28,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
@@ -40,6 +39,7 @@
 import org.apache.directory.server.schema.registries.Registries;
 
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -378,7 +378,7 @@
     }
 
 
-    public final void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException
+    public final void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException
     {
         store.modify( dn, mods );
     }



Mime
View raw message