directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r493916 [4/7] - in /directory/branches: apacheds/1.0/core-unit/ apacheds/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/ apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/ apacheds/1.0/core-unit/src/te...
Date Mon, 08 Jan 2007 02:44:40 GMT
Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sun Jan  7 18:44:33 2007
@@ -20,13 +20,19 @@
 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.Hashtable;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 
 import javax.naming.NamingException;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.SearchControls;
 
 import junit.framework.Assert;
@@ -41,6 +47,7 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -58,7 +65,7 @@
     private static final LdapDN ROOTDSE_NAME = new LdapDN();
     private static final LdapDN ENTRY_NAME;
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new BasicAttributes();
+    private static final Attributes ENTRY = new AttributesImpl();
 
     static
     {

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Sun Jan  7 18:44:33 2007
@@ -28,8 +28,6 @@
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -40,6 +38,8 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -54,8 +54,8 @@
     private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
 
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new BasicAttributes();
-    private static final Attributes FULL_ENTRY = new BasicAttributes();
+    private static final Attributes ENTRY = new AttributesImpl();
+    private static final Attributes FULL_ENTRY = new AttributesImpl();
 
     static
     {
@@ -65,7 +65,7 @@
 
         ENTRY.put( "testAttr", "1" );
 
-        Attribute attr = new BasicAttribute( "testAttr" );
+        Attribute attr = new AttributeImpl( "testAttr" );
         attr.add( "1" );
         attr.add( "2" );
         FULL_ENTRY.put( attr );

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Sun Jan  7 18:44:33 2007
@@ -28,7 +28,6 @@
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -46,7 +45,8 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
-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.name.LdapDN;
 
 
@@ -201,7 +201,7 @@
     public void testAttributeValue() throws Exception
     {
         Collection attributes = new ArrayList();
-        attributes.add( new BasicAttribute( "attrA", "valueA" ) );
+        attributes.add( new AttributeImpl( "attrA", "valueA" ) );
         Collection tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
 
         // Test wrong scope
@@ -313,7 +313,7 @@
         attrTypes.add( "attrA" );
         Collection tuples = getTuples( new ProtectedItem.SelfValue( attrTypes ) );
 
-        Attributes entry = new LockableAttributesImpl();
+        Attributes entry = new AttributesImpl();
         entry.put( "attrA", USER_NAME.toNormName() );
 
         // Test wrong scope

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Sun Jan  7 18:44:33 2007
@@ -28,8 +28,6 @@
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -40,6 +38,8 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -54,7 +54,7 @@
     private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
 
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new BasicAttributes();
+    private static final Attributes ENTRY = new AttributesImpl();
 
     static
     {
@@ -62,7 +62,7 @@
         mvcItems.add( new RestrictedByItem( "choice", "option" ) );
         PROTECTED_ITEMS.add( new ProtectedItem.RestrictedBy( mvcItems ) );
 
-        Attribute attr = new BasicAttribute( "option" );
+        Attribute attr = new AttributeImpl( "option" );
         attr.add( "1" );
         attr.add( "2" );
 

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Sun Jan  7 18:44:33 2007
@@ -33,13 +33,13 @@
 import org.apache.directory.server.core.jndi.DeadContext;
 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 javax.naming.NamingException;
 import javax.naming.NamingEnumeration;
 import javax.naming.Context;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import java.util.*;
 
@@ -351,7 +351,7 @@
         }
 
 
-        public void modify( NextInterceptor next, LdapDN name, ModificationItem[] items ) throws NamingException
+        public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] items ) throws NamingException
         {
             interceptors.add( this );
             next.modify( name, items );

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java Sun Jan  7 18:44:33 2007
@@ -25,7 +25,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 org.apache.directory.shared.ldap.util.ArrayUtils;
 
 import junit.framework.TestCase;
@@ -190,7 +190,7 @@
     
     public void testFullCycleNonBinaryAttribute() throws IOException
     {
-        LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
+        AttributeImpl attr = new AttributeImpl( "testing" );
         AttributeSerializer serializer = new AttributeSerializer();
         attr.add( "value0" );
         attr.add( "val1" );
@@ -204,7 +204,7 @@
     
     public void testFullCycleBinaryAttribute() throws IOException, NamingException
     {
-        LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
+        AttributeImpl attr = new AttributeImpl( "testing" );
         AttributeSerializer serializer = new AttributeSerializer();
         byte[] ba0 = new byte[2];
         ba0[0] = 7;
@@ -229,7 +229,7 @@
         long start = System.currentTimeMillis();
         for ( int ii = 0; ii < limit; ii++ )
         {
-            LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
+            AttributeImpl attr = new AttributeImpl( "testing" );
             AttributeSerializer serializer = new AttributeSerializer();
             attr.add( "value0" );
             attr.add( "val1" );

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java Sun Jan  7 18:44:33 2007
@@ -22,8 +22,8 @@
 
 import java.io.IOException;
 
-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.util.ArrayUtils;
 
 import junit.framework.TestCase;
@@ -39,13 +39,13 @@
 {
     public void testFullCycle() throws IOException
     {
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
-        LockableAttributeImpl attr0 = new LockableAttributeImpl( "attr0" );
+        AttributesImpl attrs = new AttributesImpl();
+        AttributeImpl attr0 = new AttributeImpl( "attr0" );
         attr0.add( "value0" );
         attr0.add( "val1" );
         attr0.add( "anything over here!" );
         
-        LockableAttributeImpl attr1 = new LockableAttributeImpl( "attr1" );
+        AttributeImpl attr1 = new AttributeImpl( "attr1" );
         byte[] ba0 = new byte[2];
         ba0[0] = 7;
         ba0[1] = 23;
@@ -60,14 +60,14 @@
         attrs.put( attr1 );
         AttributesSerializer serializer = new AttributesSerializer();
         byte[] buf = serializer.serialize( attrs );
-        LockableAttributesImpl deserialized = ( LockableAttributesImpl ) serializer.deserialize( buf );
+        AttributesImpl deserialized = ( AttributesImpl ) serializer.deserialize( buf );
 
-        LockableAttributeImpl attrDeserialized0 = ( LockableAttributeImpl ) deserialized.get( "attr0" );
+        AttributeImpl attrDeserialized0 = ( AttributeImpl ) deserialized.get( "attr0" );
         assertEquals( "value0", attrDeserialized0.get() );
         assertEquals( "val1", attrDeserialized0.get( 1 ) );
         assertEquals( "anything over here!", attrDeserialized0.get( 2 ) );
         
-        LockableAttributeImpl attrDeserialized1 = ( LockableAttributeImpl ) deserialized.get( "attr1" );
+        AttributeImpl attrDeserialized1 = ( AttributeImpl ) deserialized.get( "attr1" );
         ArrayUtils.isEquals( ba0, ( byte[] ) attrDeserialized1.get() );
         ArrayUtils.isEquals( ba1, ( byte[] ) attrDeserialized1.get( 1 ) );
     }

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Sun Jan  7 18:44:33 2007
@@ -22,14 +22,18 @@
 
 import junit.framework.TestCase;
 
-import javax.naming.directory.*;
 import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
 
 import org.apache.directory.server.core.schema.GlobalRegistries;
 import org.apache.directory.server.core.schema.ObjectClassRegistry;
 import org.apache.directory.server.core.schema.SchemaChecker;
 import org.apache.directory.server.core.schema.bootstrap.*;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
+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.util.StringTools;
@@ -120,8 +124,8 @@
     {
         LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         int mod = DirContext.REPLACE_ATTRIBUTE;
-        Attributes modifyAttributes = new BasicAttributes( true );
-        modifyAttributes.put( new BasicAttribute( "cn" ) );
+        Attributes modifyAttributes = new AttributesImpl( true );
+        modifyAttributes.put( new AttributeImpl( "cn" ) );
 
         ObjectClassRegistry ocRegistry = registries.getObjectClassRegistry();
 
@@ -130,14 +134,14 @@
 
         // this should succeed since person is still in replaced set and is structural
         modifyAttributes.remove( "cn" );
-        BasicAttribute objectClassesReplaced = new BasicAttribute( "objectClass" );
+        Attribute objectClassesReplaced = new AttributeImpl( "objectClass" );
         objectClassesReplaced.add( "top" );
         objectClassesReplaced.add( "person" );
         modifyAttributes.put( objectClassesReplaced );
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, mod, modifyAttributes );
 
         // this should fail since only top is left
-        objectClassesReplaced = new BasicAttribute( "objectClass" );
+        objectClassesReplaced = new AttributeImpl( "objectClass" );
         objectClassesReplaced.add( "top" );
         modifyAttributes.put( objectClassesReplaced );
         try
@@ -153,7 +157,7 @@
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
         modifyAttributes.remove( "cn" );
-        objectClassesReplaced = new BasicAttribute( "objectClass" );
+        objectClassesReplaced = new AttributeImpl( "objectClass" );
         modifyAttributes.put( objectClassesReplaced );
         try
         {
@@ -175,12 +179,12 @@
     {
         LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         int mod = DirContext.REMOVE_ATTRIBUTE;
-        Attributes modifyAttributes = new BasicAttributes( true );
-        Attribute entryObjectClasses = new BasicAttribute( "objectClass" );
+        Attributes modifyAttributes = new AttributesImpl( true );
+        Attribute entryObjectClasses = new AttributeImpl( "objectClass" );
         entryObjectClasses.add( "top" );
         entryObjectClasses.add( "person" );
         entryObjectClasses.add( "organizationalPerson" );
-        modifyAttributes.put( new BasicAttribute( "cn" ) );
+        modifyAttributes.put( new AttributeImpl( "cn" ) );
 
         ObjectClassRegistry ocRegistry = registries.getObjectClassRegistry();
 
@@ -190,7 +194,7 @@
 
         // this should succeed since person is left and is structural
         modifyAttributes.remove( "cn" );
-        BasicAttribute objectClassesRemoved = new BasicAttribute( "objectClass" );
+        Attribute objectClassesRemoved = new AttributeImpl( "objectClass" );
         objectClassesRemoved.add( "person" );
         modifyAttributes.put( objectClassesRemoved );
         SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, mod, modifyAttributes,
@@ -198,7 +202,7 @@
 
         // this should fail since only top is left
         modifyAttributes.remove( "cn" );
-        objectClassesRemoved = new BasicAttribute( "objectClass" );
+        objectClassesRemoved = new AttributeImpl( "objectClass" );
         objectClassesRemoved.add( "person" );
         objectClassesRemoved.add( "organizationalPerson" );
         modifyAttributes.put( objectClassesRemoved );
@@ -216,7 +220,7 @@
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
         modifyAttributes.remove( "cn" );
-        objectClassesRemoved = new BasicAttribute( "objectClass" );
+        objectClassesRemoved = new AttributeImpl( "objectClass" );
         modifyAttributes.put( objectClassesRemoved );
         try
         {
@@ -239,14 +243,14 @@
     {
         int mod = DirContext.REMOVE_ATTRIBUTE;
         LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
-        Attributes attributes = new BasicAttributes( true );
+        Attributes attributes = new AttributesImpl( true );
         attributes.put( "cn", "does not matter" );
 
         // postive test which should pass
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, registries.getOidRegistry() );
 
         // test should fail since we are removing the ou attribute
-        attributes.put( new BasicAttribute( "ou" ) );
+        attributes.put( new AttributeImpl( "ou" ) );
         try
         {
             SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, registries.getOidRegistry() );
@@ -259,12 +263,12 @@
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
         name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "sn", "does not matter" );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, registries.getOidRegistry() );
 
         // test for failure when modifying Rdn attribute in multi attribute Rdn
-        attributes.put( new BasicAttribute( "cn" ) );
+        attributes.put( new AttributeImpl( "cn" ) );
         try
         {
             SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, registries.getOidRegistry() );
@@ -277,12 +281,12 @@
 
         // should succeed since the value being deleted from the rdn attribute is
         // is not used when composing the Rdn
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "ou", "container" );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, registries.getOidRegistry() );
 
         // now let's make it fail again just by providing the right value for ou (users)
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "ou", "users" );
         try
         {
@@ -304,14 +308,14 @@
     {
         int mod = DirContext.REPLACE_ATTRIBUTE;
         LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
-        Attributes attributes = new BasicAttributes( true );
+        Attributes attributes = new AttributesImpl( true );
         attributes.put( "cn", "does not matter" );
 
         // postive test which should pass
         SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, registries.getOidRegistry() );
 
         // test should fail since we are removing the ou attribute
-        attributes.put( new BasicAttribute( "ou" ) );
+        attributes.put( new AttributeImpl( "ou" ) );
         try
         {
             SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, registries.getOidRegistry() );
@@ -324,12 +328,12 @@
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
         name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "sn", "does not matter" );
         SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, registries.getOidRegistry() );
 
         // test for failure when modifying Rdn attribute in multi attribute Rdn
-        attributes.put( new BasicAttribute( "cn" ) );
+        attributes.put( new AttributeImpl( "cn" ) );
         try
         {
             SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, registries.getOidRegistry() );
@@ -342,13 +346,13 @@
 
         // should succeed since the values being replaced from the rdn attribute is
         // is includes the old Rdn attribute value
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "ou", "container" );
         attributes.put( "ou", "users" );
         SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, registries.getOidRegistry() );
 
         // now let's make it fail by not including the old value for ou (users)
-        attributes = new BasicAttributes( true );
+        attributes = new AttributesImpl( true );
         attributes.put( "ou", "container" );
         try
         {
@@ -377,16 +381,16 @@
         // this should pass
         LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         int mod = DirContext.REPLACE_ATTRIBUTE;
-        SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, mod, new BasicAttribute( "cn" ) );
+        SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, mod, new AttributeImpl( "cn" ) );
 
         // this should succeed since person is still in replaced set and is structural
-        BasicAttribute objectClassesReplaced = new BasicAttribute( "objectClass" );
+        Attribute objectClassesReplaced = new AttributeImpl( "objectClass" );
         objectClassesReplaced.add( "top" );
         objectClassesReplaced.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, mod, objectClassesReplaced );
 
         // this should fail since only top is left
-        objectClassesReplaced = new BasicAttribute( "objectClass" );
+        objectClassesReplaced = new AttributeImpl( "objectClass" );
         objectClassesReplaced.add( "top" );
         try
         {
@@ -400,7 +404,7 @@
 
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
-        objectClassesReplaced = new BasicAttribute( "objectClass" );
+        objectClassesReplaced = new AttributeImpl( "objectClass" );
         try
         {
             SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, mod, objectClassesReplaced );
@@ -421,7 +425,7 @@
     {
         LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         int mod = DirContext.REMOVE_ATTRIBUTE;
-        Attribute entryObjectClasses = new BasicAttribute( "objectClass" );
+        Attribute entryObjectClasses = new AttributeImpl( "objectClass" );
         entryObjectClasses.add( "top" );
         entryObjectClasses.add( "person" );
         entryObjectClasses.add( "organizationalPerson" );
@@ -429,17 +433,17 @@
         ObjectClassRegistry ocRegistry = registries.getObjectClassRegistry();
 
         // this should pass
-        SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, mod, new BasicAttribute( "cn" ),
+        SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, mod, new AttributeImpl( "cn" ),
             entryObjectClasses );
 
         // this should succeed since person is left and is structural
-        BasicAttribute objectClassesRemoved = new BasicAttribute( "objectClass" );
+        Attribute objectClassesRemoved = new AttributeImpl( "objectClass" );
         objectClassesRemoved.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, mod, objectClassesRemoved,
             entryObjectClasses );
 
         // this should fail since only top is left
-        objectClassesRemoved = new BasicAttribute( "objectClass" );
+        objectClassesRemoved = new AttributeImpl( "objectClass" );
         objectClassesRemoved.add( "person" );
         objectClassesRemoved.add( "organizationalPerson" );
         try
@@ -455,7 +459,7 @@
 
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
-        objectClassesRemoved = new BasicAttribute( "objectClass" );
+        objectClassesRemoved = new AttributeImpl( "objectClass" );
         try
         {
             SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, mod, objectClassesRemoved,
@@ -481,12 +485,12 @@
 
         // postive test which should pass
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-            new BasicAttribute( "cn", "does not matter", true ), registry );
+            new AttributeImpl( "cn", "does not matter" ), registry );
 
         // test should fail since we are removing the ou attribute
         try
         {
-            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new BasicAttribute( "ou", true ), registry );
+            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new AttributeImpl( "ou" ), registry );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )
@@ -497,12 +501,12 @@
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
         name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-            new BasicAttribute( "sn", "does not matter" ), registry );
+            new AttributeImpl( "sn", "does not matter" ), registry );
 
         // test for failure when modifying Rdn attribute in multi attribute Rdn
         try
         {
-            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new BasicAttribute( "cn" ), registry );
+            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new AttributeImpl( "cn" ), registry );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )
@@ -512,12 +516,12 @@
 
         // should succeed since the value being deleted from the rdn attribute is
         // is not used when composing the Rdn
-        SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new BasicAttribute( "ou", "container" ), registry );
+        SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new AttributeImpl( "ou", "container" ), registry );
 
         // now let's make it fail again just by providing the right value for ou (users)
         try
         {
-            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new BasicAttribute( "ou", "users" ), registry );
+            SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, new AttributeImpl( "ou", "users" ), registry );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Sun Jan  7 18:44:33 2007
@@ -26,7 +26,6 @@
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.BasicAttribute;
 
 import org.apache.directory.server.core.schema.SchemaService;
 import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
@@ -37,6 +36,7 @@
 import org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema;
 import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
@@ -92,7 +92,7 @@
 
     public void testAlterObjectClassesBogusAttr() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "blah", "blah" );
+        Attribute attr = new AttributeImpl( "blah", "blah" );
 
         try
         {
@@ -104,7 +104,7 @@
             assertEquals( ResultCodeEnum.OPERATIONSERROR, e.getResultCode() );
         }
 
-        attr = new BasicAttribute( "objectClass" );
+        attr = new AttributeImpl( "objectClass" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
         assertEquals( 0, attr.size() );
     }
@@ -112,7 +112,7 @@
 
     public void testAlterObjectClassesNoAttrValue() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "objectClass" );
+        Attribute attr = new AttributeImpl( "objectClass" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
         assertEquals( 0, attr.size() );
     }
@@ -120,7 +120,7 @@
 
     public void testAlterObjectClassesTopAttrValue() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "objectClass", "top" );
+        Attribute attr = new AttributeImpl( "objectClass", "top" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
         assertEquals( 0, attr.size() );
     }
@@ -128,7 +128,7 @@
 
     public void testAlterObjectClassesInetOrgPersonAttrValue() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "objectClass", "inetOrgPerson" );
+        Attribute attr = new AttributeImpl( "objectClass", "inetOrgPerson" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
         assertEquals( 3, attr.size() );
         assertTrue( attr.contains( "person" ) );
@@ -139,7 +139,7 @@
 
     public void testAlterObjectClassesOverlapping() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "objectClass", "inetOrgPerson" );
+        Attribute attr = new AttributeImpl( "objectClass", "inetOrgPerson" );
         attr.add( "residentialPerson" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
         assertEquals( 4, attr.size() );
@@ -152,7 +152,7 @@
 
     public void testAlterObjectClassesOverlappingAndDsa() throws NamingException
     {
-        Attribute attr = new BasicAttribute( "objectClass", "inetOrgPerson" );
+        Attribute attr = new AttributeImpl( "objectClass", "inetOrgPerson" );
         attr.add( "residentialPerson" );
         attr.add( "dSA" );
         SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Sun Jan  7 18:44:33 2007
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 import javax.naming.NamingException;
-import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.Attribute;
 
 import org.apache.directory.server.core.schema.GlobalRegistries;
 import org.apache.directory.server.core.schema.OidRegistry;
@@ -36,6 +36,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParserImpl;
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -106,7 +107,7 @@
     {
         try
         {
-            assertFalse( evaluator.evaluate( null, new BasicAttribute( "objectClass" ) ) );
+            assertFalse( evaluator.evaluate( null, new AttributeImpl( "objectClass" ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -124,7 +125,7 @@
 
         try
         {
-            assertFalse( evaluator.evaluate( new SimpleNode( "", "", LeafNode.EQUALITY ), new BasicAttribute( "blah" ) ) );
+            assertFalse( evaluator.evaluate( new SimpleNode( "", "", LeafNode.EQUALITY ), new AttributeImpl( "blah" ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -135,44 +136,44 @@
 
     public void testMatchByName() throws Exception
     {
-        BasicAttribute objectClasses = null;
+        Attribute objectClasses = null;
 
         // positive test
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass" );
+        objectClasses = new AttributeImpl( "objectClass" );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
 
         // negative tests
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "blah", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass", "blah" );
+        objectClasses = new AttributeImpl( "objectClass", "blah" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
     }
 
 
     public void testMatchByOID() throws Exception
     {
-        BasicAttribute objectClasses = null;
+        Attribute objectClasses = null;
 
         // positive test
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.6", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass" );
+        objectClasses = new AttributeImpl( "objectClass" );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.6", LeafNode.EQUALITY ), objectClasses ) );
 
         // negative tests
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.5", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass", "blah" );
+        objectClasses = new AttributeImpl( "objectClass", "blah" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.5", LeafNode.EQUALITY ), objectClasses ) );
     }
 
@@ -180,15 +181,15 @@
     public void testComplexOrRefinement() throws Exception
     {
         ExprNode refinement = null;
-        BasicAttribute objectClasses = new BasicAttribute( "objectClass", "person" );
+        Attribute objectClasses = new AttributeImpl( "objectClass", "person" );
         FilterParser parser = new FilterParserImpl();
         String refStr = "(| (objectClass=person) (objectClass=organizationalUnit) )";
         refinement = parser.parse( refStr );
 
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "organizationalUnit" );
+        objectClasses = new AttributeImpl( "objectClass", "organizationalUnit" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "domain" );
+        objectClasses = new AttributeImpl( "objectClass", "domain" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
     }
 
@@ -196,18 +197,18 @@
     public void testComplexAndRefinement() throws Exception
     {
         ExprNode refinement = null;
-        BasicAttribute objectClasses = new BasicAttribute( "objectClass", "person" );
+        Attribute objectClasses = new AttributeImpl( "objectClass", "person" );
         objectClasses.add( "organizationalUnit" );
         FilterParser parser = new FilterParserImpl();
         String refStr = "(& (objectClass=person) (objectClass=organizationalUnit) )";
         refinement = parser.parse( refStr );
 
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "organizationalUnit" );
+        objectClasses = new AttributeImpl( "objectClass", "organizationalUnit" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "domain" );
+        objectClasses = new AttributeImpl( "objectClass", "domain" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
     }
 
@@ -215,20 +216,20 @@
     public void testComplexNotRefinement() throws Exception
     {
         ExprNode refinement = null;
-        BasicAttribute objectClasses = new BasicAttribute( "objectClass", "person" );
+        Attribute objectClasses = new AttributeImpl( "objectClass", "person" );
         FilterParser parser = new FilterParserImpl();
         String refStr = "(! (objectClass=person) )";
         refinement = parser.parse( refStr );
 
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "organizationalUnit" );
+        objectClasses = new AttributeImpl( "objectClass", "organizationalUnit" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
-        objectClasses = new BasicAttribute( "objectClass", "domain" );
+        objectClasses = new AttributeImpl( "objectClass", "domain" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
 
         try
         {
-            assertFalse( evaluator.evaluate( new BranchNode( 1000 ), new BasicAttribute( "objectClass" ) ) );
+            assertFalse( evaluator.evaluate( new BranchNode( 1000 ), new AttributeImpl( "objectClass" ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -237,7 +238,7 @@
 
         try
         {
-            assertFalse( evaluator.evaluate( new BranchNode( BranchNode.NOT ), new BasicAttribute( "objectClass" ) ) );
+            assertFalse( evaluator.evaluate( new BranchNode( BranchNode.NOT ), new AttributeImpl( "objectClass" ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Sun Jan  7 18:44:33 2007
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 import javax.naming.NamingException;
-import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.Attribute;
 
 import org.apache.directory.server.core.schema.GlobalRegistries;
 import org.apache.directory.server.core.schema.OidRegistry;
@@ -31,6 +31,7 @@
 import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -98,7 +99,7 @@
      */
     public void testForBadArguments() throws Exception
     {
-        BasicAttribute objectClasses = null;
+        Attribute objectClasses = null;
 
         try
         {
@@ -138,7 +139,7 @@
 
         try
         {
-            objectClasses = new BasicAttribute( "incorrectAttrId" );
+            objectClasses = new AttributeImpl( "incorrectAttrId" );
             assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "", LeafNode.EQUALITY ), objectClasses ) );
             fail( "should never get here due to an IAE" );
         }
@@ -150,44 +151,44 @@
 
     public void testMatchByName() throws Exception
     {
-        BasicAttribute objectClasses = null;
+        Attribute objectClasses = null;
 
         // positive test
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass" );
+        objectClasses = new AttributeImpl( "objectClass" );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
 
         // negative tests
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "blah", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass", "blah" );
+        objectClasses = new AttributeImpl( "objectClass", "blah" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "person", LeafNode.EQUALITY ), objectClasses ) );
     }
 
 
     public void testMatchByOID() throws Exception
     {
-        BasicAttribute objectClasses = null;
+        Attribute objectClasses = null;
 
         // positive test
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.6", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass" );
+        objectClasses = new AttributeImpl( "objectClass" );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.6", LeafNode.EQUALITY ), objectClasses ) );
 
         // negative tests
-        objectClasses = new BasicAttribute( "objectClass", "person" );
+        objectClasses = new AttributeImpl( "objectClass", "person" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.5", LeafNode.EQUALITY ), objectClasses ) );
 
-        objectClasses = new BasicAttribute( "objectClass", "blah" );
+        objectClasses = new AttributeImpl( "objectClass", "blah" );
         assertFalse( evaluator.evaluate( new SimpleNode( "objectClass", "2.5.6.5", LeafNode.EQUALITY ), objectClasses ) );
     }
 }

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Sun Jan  7 18:44:33 2007
@@ -29,6 +29,7 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.FilterParserImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier;
@@ -36,7 +37,7 @@
 import javax.naming.NamingException;
 import javax.naming.Name;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.BasicAttribute;
+
 import java.util.Set;
 import java.util.HashSet;
 
@@ -90,7 +91,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass" );
+        Attribute objectClasses = new AttributeImpl( "objectClass" );
 
         assertTrue( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -109,7 +110,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass" );
+        Attribute objectClasses = new AttributeImpl( "objectClass" );
 
         assertTrue( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -130,7 +131,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass" );
+        Attribute objectClasses = new AttributeImpl( "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -164,7 +165,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass" );
+        Attribute objectClasses = new AttributeImpl( "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -198,7 +199,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass" );
+        Attribute objectClasses = new AttributeImpl( "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -232,7 +233,7 @@
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
         Name apDn = new LdapDN( "ou=system" );
         Name entryDn = new LdapDN( "ou=users,ou=system" );
-        Attribute objectClasses = new BasicAttribute( "objectClass", "person" );
+        Attribute objectClasses = new AttributeImpl( "objectClass", "person" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
@@ -252,7 +253,7 @@
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 
         // now change the refinement so the entry is rejected
-        objectClasses = new BasicAttribute( "objectClass", "organizationalUnit" );
+        objectClasses = new AttributeImpl( "objectClass", "organizationalUnit" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, objectClasses ) );
 

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Sun Jan  7 18:44:33 2007
@@ -28,16 +28,16 @@
 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.SearchResult;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 
 
 /**
@@ -73,9 +73,9 @@
             return null;
         }
 
-        ModificationItem[] mods = new ModificationItem[1];
-        Attribute newKeyAttribute = new BasicAttribute( "krb5key", newKey.getEncoded() );
-        mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, newKeyAttribute );
+        ModificationItemImpl[] mods = new ModificationItemImpl[1];
+        Attribute newKeyAttribute = new AttributeImpl( "krb5key", newKey.getEncoded() );
+        mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, newKeyAttribute );
 
         String dn = null;
 
@@ -99,8 +99,8 @@
         String[] attrIDs =
             { KerberosAttribute.PRINCIPAL, KerberosAttribute.VERSION, KerberosAttribute.TYPE, KerberosAttribute.KEY };
 
-        Attributes matchAttrs = new BasicAttributes( false ); // case-sensitive
-        matchAttrs.put( new BasicAttribute( KerberosAttribute.PRINCIPAL, principal ) );
+        Attributes matchAttrs = new AttributesImpl( false ); // case-sensitive
+        matchAttrs.put( new AttributeImpl( KerberosAttribute.PRINCIPAL, principal ) );
 
         NamingEnumeration answer = ctx.search( "", matchAttrs, attrIDs );
 

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java (original)
+++ directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java Sun Jan  7 18:44:33 2007
@@ -28,14 +28,14 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchResult;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -91,8 +91,8 @@
         String[] attrIDs =
             { KerberosAttribute.PRINCIPAL, KerberosAttribute.VERSION, KerberosAttribute.TYPE, KerberosAttribute.KEY };
 
-        Attributes matchAttrs = new BasicAttributes( false ); // case-sensitive
-        matchAttrs.put( new BasicAttribute( KerberosAttribute.PRINCIPAL, principal ) );
+        Attributes matchAttrs = new AttributesImpl( false ); // case-sensitive
+        matchAttrs.put( new AttributeImpl( KerberosAttribute.PRINCIPAL, principal ) );
 
         // Search for objects that have those matching attributes
         NamingEnumeration answer = ctx.search( searchBaseDn, matchAttrs, attrIDs );

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Sun Jan  7 18:44:33 2007
@@ -26,8 +26,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InvalidAttributeValueException;
 import javax.naming.directory.SearchResult;
@@ -39,6 +37,8 @@
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -80,8 +80,8 @@
                 KerberosAttribute.SAM_TYPE, KerberosAttribute.ACCOUNT_DISABLED, 
                 KerberosAttribute.ACCOUNT_EXPIRATION_TIME, KerberosAttribute.ACCOUNT_LOCKEDOUT };
 
-        Attributes matchAttrs = new BasicAttributes( false ); // case-sensitive
-        matchAttrs.put( new BasicAttribute( KerberosAttribute.PRINCIPAL, principal.getName() ) );
+        Attributes matchAttrs = new AttributesImpl( false ); // case-sensitive
+        matchAttrs.put( new AttributeImpl( KerberosAttribute.PRINCIPAL, principal.getName() ) );
 
         PrincipalStoreEntry entry = null;
 

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java (original)
+++ directory/branches/apacheds/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java Sun Jan  7 18:44:33 2007
@@ -28,13 +28,13 @@
 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.SchemaViolationException;
 import javax.naming.spi.DirStateFactory;
 
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -54,7 +54,7 @@
             Attributes outAttrs;
             if ( inAttrs == null )
             {
-                outAttrs = new BasicAttributes( true );
+                outAttrs = new AttributesImpl( true );
             }
             else
             {
@@ -66,7 +66,7 @@
 
             if ( oc == null )
             {
-                oc = new BasicAttribute( "objectClass" );
+                oc = new AttributeImpl( "objectClass" );
                 outAttrs.put( oc );
             }
 

Modified: directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java (original)
+++ directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java Sun Jan  7 18:44:33 2007
@@ -25,8 +25,6 @@
 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.SearchResult;
 
@@ -37,6 +35,8 @@
 import org.apache.directory.server.dns.messages.ResourceRecordModifier;
 import org.apache.directory.server.dns.store.DnsAttribute;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -73,11 +73,11 @@
             return null;
         }
 
-        Attributes matchAttrs = new BasicAttributes( true );
+        Attributes matchAttrs = new AttributesImpl( true );
 
-        matchAttrs.put( new BasicAttribute( DnsAttribute.NAME, question.getDomainName() ) );
-        matchAttrs.put( new BasicAttribute( DnsAttribute.TYPE, question.getRecordType().getCode() ) );
-        matchAttrs.put( new BasicAttribute( DnsAttribute.CLASS, question.getRecordClass().getCode() ) );
+        matchAttrs.put( new AttributeImpl( DnsAttribute.NAME, question.getDomainName() ) );
+        matchAttrs.put( new AttributeImpl( DnsAttribute.TYPE, question.getRecordType().getCode() ) );
+        matchAttrs.put( new AttributeImpl( DnsAttribute.CLASS, question.getRecordClass().getCode() ) );
 
         ResourceRecord record = null;
 

Modified: directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java (original)
+++ directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java Sun Jan  7 18:44:33 2007
@@ -23,7 +23,6 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.ReferralException;
-import javax.naming.directory.ModificationItem;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.configuration.StartupConfiguration;
@@ -32,6 +31,7 @@
 import org.apache.directory.shared.ldap.message.Control;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ModifyRequest;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -53,7 +53,7 @@
 public class ModifyHandler implements LdapMessageHandler
 {
     private static final Logger log = LoggerFactory.getLogger( ModifyHandler.class );
-    private static final ModificationItem[] EMPTY = new ModificationItem[0];
+    private static final ModificationItemImpl[] EMPTY = new ModificationItemImpl[0];
     private static Control[] EMPTY_CONTROLS = new Control[0];
 
     /** Speedup for logs */
@@ -77,7 +77,7 @@
             }
             ctx.setRequestControls( ( Control[] ) req.getControls().values().toArray( EMPTY_CONTROLS ) );
             Object[] mods = req.getModificationItems().toArray( EMPTY );
-            ctx.modifyAttributes( req.getName(), ( ModificationItem[] ) mods );
+            ctx.modifyAttributes( req.getName(), ( ModificationItemImpl[] ) mods );
         }
         catch ( ReferralException e )
         {

Modified: directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (original)
+++ directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Sun Jan  7 18:44:33 2007
@@ -62,8 +62,8 @@
 import org.apache.directory.server.protocol.shared.store.KerberosAttribute;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -182,8 +182,8 @@
 
         partConfig.setSuffix( "dc=example, dc=com" );
 
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
-        LockableAttributeImpl objectClass = new LockableAttributeImpl( "objectClass" );
+        AttributesImpl attrs = new AttributesImpl();
+        AttributeImpl objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "domain" );
         attrs.put( objectClass );
@@ -209,8 +209,8 @@
 
         partConfig.setSuffix( "dc=apache, dc=org" );
 
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
-        LockableAttributeImpl objectClass = new LockableAttributeImpl( "objectClass" );
+        AttributesImpl attrs = new AttributesImpl();
+        AttributeImpl objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "domain" );
         attrs.put( objectClass );

Modified: directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java (original)
+++ directory/branches/apacheds/1.0/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java Sun Jan  7 18:44:33 2007
@@ -25,11 +25,11 @@
 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 org.apache.directory.server.protocol.shared.AbstractBackingStoreTest;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -60,8 +60,8 @@
         env.put( Context.PROVIDER_URL, "dc=example,dc=com" );
         DirContext ctx = ( DirContext ) factory.getInitialContext( env );
 
-        Attributes matchAttrs = new BasicAttributes( true );
-        matchAttrs.put( new BasicAttribute( "krb5PrincipalName", "kadmin/changepw@EXAMPLE.COM" ) );
+        Attributes matchAttrs = new AttributesImpl( true );
+        matchAttrs.put( new AttributeImpl( "krb5PrincipalName", "kadmin/changepw@EXAMPLE.COM" ) );
 
         Attributes attributes = ctx.getAttributes( "ou=users" );
         System.out.println( attributes );

Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original)
+++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Sun Jan  7 18:44:33 2007
@@ -33,7 +33,6 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
 import org.apache.commons.lang.StringUtils;
@@ -55,6 +54,7 @@
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.common.ExecutorThreadModel;
@@ -219,7 +219,7 @@
 
     private void ensureLdifFileBase( DirContext root )
     {
-        Attributes entry = new BasicAttributes( "ou", "loadedLdifFiles", true );
+        Attributes entry = new AttributesImpl( "ou", "loadedLdifFiles", true );
         entry.put( "objectClass", "top" );
         entry.get( "objectClass" ).add( "organizationalUnit" );
         try
@@ -250,7 +250,7 @@
         buf.append( "," );
         buf.append( LDIF_FILES_DN );
 
-        Attributes entry = new BasicAttributes( rdnAttr, getCanonical( ldif ), true );
+        Attributes entry = new AttributesImpl( rdnAttr, getCanonical( ldif ), true );
         entry.put( "objectClass", "top" );
         entry.get( "objectClass" ).add( oc );
         root.createSubcontext( buf.toString(), entry );

Modified: directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java (original)
+++ directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java Sun Jan  7 18:44:33 2007
@@ -27,13 +27,13 @@
 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.InitialDirContext;
 
 import org.apache.directory.server.ssl.support.SSLSocketFactory;
 import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.mina.util.AvailablePortFinder;
 
 
@@ -115,8 +115,8 @@
     public void testSetUpTearDown() throws NamingException
     {
         // Create a person
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );

Modified: directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java (original)
+++ directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java Sun Jan  7 18:44:33 2007
@@ -28,7 +28,6 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
@@ -37,6 +36,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 
@@ -135,7 +135,7 @@
     
     private boolean createBase( LdapContext ctx ) throws NamingException
     {
-        Attributes attrs = new BasicAttributes( "objectClass", "organizationalUnit", true );
+        Attributes attrs = new AttributesImpl( "objectClass", "organizationalUnit", true );
         attrs.put( "ou", "users" );
         
         try
@@ -152,7 +152,7 @@
 
     private Attributes generateLdif( int counter )
     {
-        BasicAttributes attrs = new BasicAttributes( "objectClass", "top", true );
+        Attributes attrs = new AttributesImpl( "objectClass", "top", true );
         Attribute oc = attrs.get( "objectClass" );
         oc.add( "person" );
         oc.add( "organizationalPerson" );

Modified: directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
    (empty)

Modified: directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/branches/apacheds/1.0/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Sun Jan  7 18:44:33 2007
@@ -34,7 +34,6 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
@@ -47,6 +46,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -427,7 +427,7 @@
         
         while ( modifications.hasNext() )
         {
-            ModificationItem modification = (ModificationItem)modifications.next();
+            ModificationItemImpl modification = (ModificationItemImpl)modifications.next();
             
             switch ( modification.getModificationOp() )
             {

Modified: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/AddITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/AddITest.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/AddITest.java (original)
+++ directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/AddITest.java Sun Jan  7 18:44:33 2007
@@ -20,9 +20,16 @@
 package org.apache.directory.server;
 
 
-import javax.naming.directory.*;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.InvalidAttributeValueException;
+import javax.naming.directory.SchemaViolationException;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 
 import netscape.ldap.LDAPAttribute;
 import netscape.ldap.LDAPAttributeSet;
@@ -31,6 +38,8 @@
 import netscape.ldap.LDAPException;
 
 import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 import java.util.Hashtable;
 
@@ -64,8 +73,8 @@
         ctx = new InitialDirContext( env );
 
         // Create a person
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute attribute = new AttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );
@@ -125,8 +134,8 @@
     {
 
         // modify object classes, add two more
-        Attributes attributes = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute ocls = new AttributeImpl( "objectClass" );
         ocls.add( "organizationalPerson" );
         ocls.add( "inetOrgPerson" );
         attributes.put( ocls );
@@ -159,8 +168,8 @@
         String newDescription = "More info on the user ...";
 
         // modify object classes, add two more
-        Attributes attributes = new BasicAttributes( true );
-        Attribute desc = new BasicAttribute( "description", newDescription );
+        Attributes attributes = new AttributesImpl( true );
+        Attribute desc = new AttributeImpl( "description", newDescription );
         attributes.put( desc );
 
         DirContext person = ( DirContext ) ctx.lookup( RDN );
@@ -181,8 +190,8 @@
     public void testAddWithMissingRequiredAttributes() throws NamingException
     {
         // person without sn
-        Attributes attrs = new BasicAttributes();
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        Attributes attrs = new AttributesImpl();
+        Attribute ocls = new AttributeImpl( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         attrs.put( ocls );
@@ -335,14 +344,14 @@
     public void testAddWithInvalidNumberOfAttributeValues() throws NamingException
     {
         // add inetOrgPerson with two displayNames
-        Attributes attrs = new BasicAttributes();
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        Attributes attrs = new AttributesImpl();
+        Attribute ocls = new AttributeImpl( "objectClass" );
         ocls.add( "top" );
         ocls.add( "inetOrgPerson" );
         attrs.put( ocls );
         attrs.put( "cn", "Fiona Apple" );
         attrs.put( "sn", "Apple" );
-        Attribute displayName = new BasicAttribute( "displayName" );
+        Attribute displayName = new AttributeImpl( "displayName" );
         displayName.add( "Fiona" );
         displayName.add( "Fiona A." );
         attrs.put( displayName );
@@ -366,8 +375,8 @@
     {
 
         // Create entry
-        Attributes entry = new BasicAttributes();
-        Attribute entryOcls = new BasicAttribute( "objectclass" );
+        Attributes entry = new AttributesImpl();
+        Attribute entryOcls = new AttributeImpl( "objectclass" );
         entryOcls.add( "top" );
         entryOcls.add( "organizationalUnit" );
         entry.put( entryOcls );
@@ -377,8 +386,8 @@
 
         // Create Alias
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
-        Attributes alias = new BasicAttributes();
-        Attribute aliasOcls = new BasicAttribute( "objectclass" );
+        Attributes alias = new AttributesImpl();
+        Attribute aliasOcls = new AttributeImpl( "objectclass" );
         aliasOcls.add( "top" );
         aliasOcls.add( "alias" );
         alias.put( aliasOcls );
@@ -401,8 +410,8 @@
     {
 
         // Create container
-        Attributes container = new BasicAttributes();
-        Attribute containerOcls = new BasicAttribute( "objectclass" );
+        Attributes container = new AttributesImpl();
+        Attribute containerOcls = new AttributeImpl( "objectclass" );
         containerOcls.add( "top" );
         containerOcls.add( "organizationalUnit" );
         container.put( containerOcls );
@@ -411,8 +420,8 @@
         DirContext containerCtx = ctx.createSubcontext( containerRdn, container );
 
         // Create entry
-        Attributes entry = new BasicAttributes();
-        Attribute entryOcls = new BasicAttribute( "objectclass" );
+        Attributes entry = new AttributesImpl();
+        Attribute entryOcls = new AttributeImpl( "objectclass" );
         entryOcls.add( "top" );
         entryOcls.add( "organizationalUnit" );
         entry.put( entryOcls );
@@ -422,8 +431,8 @@
 
         // Create alias ou=bestFruit,ou=Fruits to entry ou=favorite,ou=Fruits
         String aliasedObjectName = entryRdn + "," + containerCtx.getNameInNamespace();
-        Attributes alias = new BasicAttributes();
-        Attribute aliasOcls = new BasicAttribute( "objectclass" );
+        Attributes alias = new AttributesImpl();
+        Attribute aliasOcls = new AttributeImpl( "objectclass" );
         aliasOcls.add( "top" );
         aliasOcls.add( "alias" );
         alias.put( aliasOcls );



Mime
View raw message