directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r691083 - in /directory/apacheds/trunk: protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/ protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/ server-integ/src/test/java/org/apache/direct...
Date Tue, 02 Sep 2008 00:02:30 GMT
Author: elecharny
Date: Mon Sep  1 17:02:29 2008
New Revision: 691083

URL: http://svn.apache.org/viewvc?rev=691083&view=rev
Log:
Removed the references to Attribute(s)Impl in dns, kerberos and server-integ

Modified:
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java Mon Sep  1 17:02:29 2008
@@ -28,6 +28,8 @@
 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;
 
@@ -38,8 +40,6 @@
 import org.apache.directory.server.dns.messages.ResourceRecordModifier;
 import org.apache.directory.server.dns.store.DnsAttribute;
 import org.apache.directory.server.dns.store.jndi.DnsOperation;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -78,11 +78,11 @@
             return null;
         }
 
-        Attributes matchAttrs = new AttributesImpl( true );
+        Attributes matchAttrs = new BasicAttributes( true );
 
-        matchAttrs.put( new AttributeImpl( DnsAttribute.NAME, question.getDomainName() ) );
-        matchAttrs.put( new AttributeImpl( DnsAttribute.TYPE, question.getRecordType().name() ) );
-        matchAttrs.put( new AttributeImpl( DnsAttribute.CLASS, question.getRecordClass().name() ) );
+        matchAttrs.put( new BasicAttribute( DnsAttribute.NAME, question.getDomainName() ) );
+        matchAttrs.put( new BasicAttribute( DnsAttribute.TYPE, question.getRecordType().name() ) );
+        matchAttrs.put( new BasicAttribute( DnsAttribute.CLASS, question.getRecordClass().name() ) );
 
         Set<ResourceRecord> record = new HashSet<ResourceRecord>();
 

Modified: directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Mon Sep  1 17:02:29 2008
@@ -31,8 +31,6 @@
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.LdapDN;
 
@@ -40,6 +38,8 @@
 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 java.util.HashSet;
@@ -110,7 +110,7 @@
         // if krb5kdc is disabled then enable it
         if ( isKrb5KdcDisabled )
         {
-            Attribute disabled = new AttributeImpl( "m-disabled" );
+            Attribute disabled = new BasicAttribute( "m-disabled" );
             ModificationItemImpl[] mods = new ModificationItemImpl[]
                     {new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, disabled )};
             schemaRoot.modifyAttributes( "cn=Krb5kdc", mods );
@@ -184,8 +184,8 @@
      */
     protected Attributes getPrincipalAttributes( String sn, String cn, String uid, String userPassword, String principal )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" ); // sn $ cn
         ocls.add( "inetOrgPerson" ); // uid
@@ -211,8 +211,8 @@
      */
     protected Attributes getOrgUnitAttributes( String ou )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes();
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Mon Sep  1 17:02:29 2008
@@ -51,8 +51,6 @@
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-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.mina.util.AvailablePortFinder;
 import org.junit.Before;
@@ -67,6 +65,8 @@
 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 java.io.IOException;
@@ -197,7 +197,7 @@
         // if krb5kdc is disabled then enable it
         if ( isKrb5KdcDisabled )
         {
-            Attribute disabled = new AttributeImpl( "m-disabled" );
+            Attribute disabled = new BasicAttribute( "m-disabled" );
             ModificationItemImpl[] mods = new ModificationItemImpl[]
                 { new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, disabled ) };
             schemaRoot.modifyAttributes( "cn=Krb5kdc", mods );
@@ -307,10 +307,10 @@
         String newUserPassword = "secretsecret";
 
         // Modify password.
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attr = new AttributeImpl( "userPassword", newUserPassword );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
-        attr = new AttributeImpl( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
+        attr = new BasicAttribute( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
         attributes.put( attr );
 
         DirContext person = ( DirContext ) ctx.lookup( RDN );
@@ -358,10 +358,10 @@
         newUserPassword = "secretsecretsecret";
 
         // Modify password.
-        attributes = new AttributesImpl( true );
-        attr = new AttributeImpl( "userPassword", newUserPassword );
+        attributes = new BasicAttributes( true );
+        attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
-        attr = new AttributeImpl( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
+        attr = new BasicAttribute( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
         attributes.put( attr );
 
         person = ( DirContext ) ctx.lookup( RDN );
@@ -389,10 +389,10 @@
         newUserPassword = "secretsecretsecretsecret";
 
         // Modify password.
-        attributes = new AttributesImpl( true );
-        attr = new AttributeImpl( "userPassword", newUserPassword );
+        attributes = new BasicAttributes( true );
+        attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
-        attr = new AttributeImpl( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
+        attr = new BasicAttribute( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, newPrincipalName );
         attributes.put( attr );
 
         person = ( DirContext ) ctx.lookup( RDN );
@@ -444,8 +444,8 @@
         String newUserPassword = "secretsecret";
 
         // Modify password.
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attr = new AttributeImpl( "userPassword", newUserPassword );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
 
         DirContext person = ( DirContext ) ctx.lookup( RDN );
@@ -493,8 +493,8 @@
         newUserPassword = "secretsecretsecret";
 
         // Modify password.
-        attributes = new AttributesImpl( true );
-        attr = new AttributeImpl( "userPassword", newUserPassword );
+        attributes = new BasicAttributes( true );
+        attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
 
         person = ( DirContext ) ctx.lookup( RDN );
@@ -522,8 +522,8 @@
         newUserPassword = "secretsecretsecretsecret";
 
         // Modify password.
-        attributes = new AttributesImpl( true );
-        attr = new AttributeImpl( "userPassword", newUserPassword );
+        attributes = new BasicAttributes( true );
+        attr = new BasicAttribute( "userPassword", newUserPassword );
         attributes.put( attr );
 
         person = ( DirContext ) ctx.lookup( RDN );
@@ -668,8 +668,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn, String uid, String userPassword, String principal )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" ); // sn $ cn
         ocls.add( "inetOrgPerson" ); // uid
@@ -695,8 +695,8 @@
      */
     protected Attributes getOrgUnitAttributes( String ou )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java Mon Sep  1 17:02:29 2008
@@ -46,8 +46,6 @@
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.After;
 import org.junit.Before;
@@ -60,6 +58,8 @@
 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;
 
@@ -350,8 +350,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn, String uid, String userPassword )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" ); // sn $ cn
         ocls.add( "inetOrgPerson" ); // uid
@@ -370,8 +370,8 @@
      */
     protected Attributes getOrgUnitAttributes( String ou )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Mon Sep  1 17:02:29 2008
@@ -25,6 +25,8 @@
 import javax.naming.ReferralException;
 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.InvalidAttributeValueException;
 import javax.naming.directory.SchemaViolationException;
@@ -54,8 +56,6 @@
 
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.junit.Test;
 import org.junit.runner.RunWith;
@@ -133,8 +133,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // modify object classes, add two more
-        Attributes attributes = new AttributesImpl( true );
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "organizationalPerson" );
         ocls.add( "inetOrgPerson" );
         attributes.put( ocls );
@@ -169,8 +169,8 @@
         String newDescription = "More info on the user ...";
 
         // modify object classes, add two more
-        Attributes attributes = new AttributesImpl( true );
-        Attribute desc = new AttributeImpl( "description", newDescription );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute desc = new BasicAttribute( "description", newDescription );
         attributes.put( desc );
 
         DirContext person = ( DirContext ) ctx.lookup( RDN );
@@ -196,8 +196,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // person without sn
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         attrs.put( ocls );
@@ -355,14 +355,14 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // add inetOrgPerson with two displayNames
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "inetOrgPerson" );
         attrs.put( ocls );
         attrs.put( "cn", "Fiona Apple" );
         attrs.put( "sn", "Apple" );
-        Attribute displayName = new AttributeImpl( "displayName" );
+        Attribute displayName = new BasicAttribute( "displayName" );
         displayName.add( "Fiona" );
         displayName.add( "Fiona A." );
         attrs.put( displayName );
@@ -389,8 +389,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // Create entry
-        Attributes entry = new AttributesImpl();
-        Attribute entryOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes entry = new BasicAttributes( true );
+        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -400,8 +400,8 @@
 
         // Create Alias
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
-        Attributes alias = new AttributesImpl();
-        Attribute aliasOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes alias = new BasicAttributes( true );
+        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -429,8 +429,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // Create container
-        Attributes container = new AttributesImpl();
-        Attribute containerOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes container = new BasicAttributes( true );
+        Attribute containerOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         containerOcls.add( SchemaConstants.TOP_OC );
         containerOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         container.put( containerOcls );
@@ -439,8 +439,8 @@
         DirContext containerCtx = ctx.createSubcontext( containerRdn, container );
 
         // Create entry
-        Attributes entry = new AttributesImpl();
-        Attribute entryOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes entry = new BasicAttributes( true );
+        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -450,8 +450,8 @@
 
         // Create alias ou=bestFruit,ou=Fruits to entry ou=favorite,ou=Fruits
         String aliasedObjectName = entryRdn + "," + containerCtx.getNameInNamespace();
-        Attributes alias = new AttributesImpl();
-        Attribute aliasOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes alias = new BasicAttributes( true );
+        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -518,8 +518,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // Create entry ou=favorite,dc=example,dc=com
-        Attributes entry = new AttributesImpl();
-        Attribute entryOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes entry = new BasicAttributes( true );
+        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -529,8 +529,8 @@
 
         // Create Alias ou=bestFruit,dc=example,dc=com to ou=favorite
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
-        Attributes alias = new AttributesImpl();
-        Attribute aliasOcls = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+        Attributes alias = new BasicAttributes( true );
+        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -656,7 +656,7 @@
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         
         // add failure
-        Attributes attrs = new AttributesImpl( "objectClass", "organizationalUnit" );
+        Attributes attrs = new BasicAttributes( "objectClass", "organizationalUnit", true );
         attrs.put( "ou", "UnderReferral" );
         
         try
@@ -683,7 +683,7 @@
     public void testDIRSERVER_1183() throws Exception
     {
         LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
-    	Attributes attrs = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+    	Attributes attrs = new BasicAttributes( "objectClass", "inetOrgPerson", true );
     	attrs.get( "objectClass" ).add( "organizationalPerson" );
     	attrs.get( "objectClass" ).add( "person" );
     	attrs.put( "givenName", "Jim" );
@@ -703,7 +703,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person
-        Attributes person = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+        Attributes person = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         person.get( "objectClass" ).add( "top" );
         person.get( "objectClass" ).add( "person" );
         person.get( "objectClass" ).add( "organizationalperson" );
@@ -741,7 +741,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person
-        Attributes person = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+        Attributes person = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         person.get( "objectClass" ).add( "top" );
         person.get( "objectClass" ).add( "person" );
         person.get( "objectClass" ).add( "organizationalperson" );
@@ -786,7 +786,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person
-        Attributes person = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+        Attributes person = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         person.get( "objectClass" ).add( "top" );
         person.get( "objectClass" ).add( "person" );
         person.get( "objectClass" ).add( "organizationalperson" );
@@ -827,7 +827,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person
-        Attributes person = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+        Attributes person = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         person.get( "objectClass" ).add( "top" );
         person.get( "objectClass" ).add( "person" );
         person.get( "objectClass" ).add( "organizationalperson" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Mon Sep  1 17:02:29 2008
@@ -24,6 +24,8 @@
 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.SearchControls;
 import javax.naming.directory.SearchResult;
@@ -33,8 +35,6 @@
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,8 +58,8 @@
 
     protected Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         attrs.put( ocls );
@@ -72,8 +72,8 @@
 
     protected Attributes getOrgUnitAttributes( String ou )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Mon Sep  1 17:02:29 2008
@@ -31,6 +31,8 @@
 import javax.naming.OperationNotSupportedException;
 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 javax.naming.directory.SearchControls;
@@ -58,8 +60,6 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.MutableControl;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 import org.apache.mina.util.AvailablePortFinder;
@@ -217,8 +217,8 @@
         {
         }
 
-        Attributes attrs = new AttributesImpl( true );
-        Attribute oc = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute oc = new BasicAttribute( "objectClass" );
         attrs.put( oc );
         oc.add( "top" );
         oc.add( "organizationalUnit" );
@@ -327,8 +327,8 @@
         env.put( "java.naming.ldap.version", "3" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
 
-        Attributes attributes = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute objectClass = new BasicAttribute( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "organizationalUnit" );
         attributes.put( objectClass );
@@ -369,8 +369,8 @@
         Attributes attrs = ctx.getAttributes( "" );
         assertTrue( attrs.get( "dc" ).get().equals( "aPache" ) );
 
-        Attributes user = new AttributesImpl( "cn", "Kate Bush", true );
-        Attribute oc = new AttributeImpl( "objectClass" );
+        Attributes user = new BasicAttributes( "cn", "Kate Bush", true );
+        Attribute oc = new BasicAttribute( "objectClass" );
         oc.add( "top" );
         oc.add( "person" );
         oc.add( "organizationalPerson" );
@@ -459,8 +459,8 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         InitialLdapContext ctx = new InitialLdapContext( env, null );
 
-        Attributes user = new AttributesImpl( "cn", "Kate Bush", true );
-        Attribute oc = new AttributeImpl( "objectClass" );
+        Attributes user = new BasicAttributes( "cn", "Kate Bush", true );
+        Attribute oc = new BasicAttribute( "objectClass" );
         oc.add( "top" );
         oc.add( "person" );
         oc.add( "organizationalPerson" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Mon Sep  1 17:02:29 2008
@@ -29,6 +29,8 @@
 import javax.naming.OperationNotSupportedException;
 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;
 
@@ -37,8 +39,6 @@
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 import static org.junit.Assert.fail;
 import static org.junit.Assert.assertTrue;
@@ -82,8 +82,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn, String uid, String userPassword )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" ); // sn $ cn
         ocls.add( "inetOrgPerson" ); // uid
@@ -102,8 +102,8 @@
      */
     protected Attributes getOrgUnitAttributes( String ou )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Mon Sep  1 17:02:29 2008
@@ -39,7 +39,6 @@
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.OidNormalizer;
 import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils;
@@ -49,6 +48,7 @@
 import org.junit.runner.RunWith;
 
 import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
@@ -139,7 +139,7 @@
         env.put( "java.naming.security.authentication", "simple" );
         ctx = new InitialLdapContext( env, null );
         
-        Attributes spContainer = new AttributesImpl( "objectClass", "top", true );
+        Attributes spContainer = new BasicAttributes( "objectClass", "top", true );
         spContainer.get( "objectClass" ).add( "organizationalUnit" );
         spContainer.put( "ou", "Stored Procedures" );
         spCtx = ( LdapContext ) ctx.createSubcontext( "ou=Stored Procedures", spContainer );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java Mon Sep  1 17:02:29 2008
@@ -30,6 +30,7 @@
 import javax.naming.directory.AttributeModificationException;
 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.ModificationItem;
@@ -52,8 +53,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 
 
@@ -102,8 +101,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attribute.add( "organizationalperson" );
@@ -126,7 +125,7 @@
         
         // Add telephoneNumber attribute
         String newValue = "1234567890";
-        Attributes attrs = new AttributesImpl( "telephoneNumber", newValue );
+        Attributes attrs = new BasicAttributes( "telephoneNumber", newValue, true );
         ctx.modifyAttributes( RDN_TORI_AMOS, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Verify, that attribute value is added
@@ -149,10 +148,10 @@
         // Add telephoneNumber attribute
         String[] newValues =
             { "1234567890", "999999999" };
-        Attribute attr = new AttributeImpl( "telephoneNumber" );
+        Attribute attr = new BasicAttribute( "telephoneNumber" );
         attr.add( newValues[0] );
         attr.add( newValues[1] );
-        Attributes attrs = new AttributesImpl();
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
         ctx.modifyAttributes( RDN_TORI_AMOS, DirContext.ADD_ATTRIBUTE, attrs );
 
@@ -177,7 +176,7 @@
         // A new description attribute value
         String newValue = "A new description for this person";
         assertFalse( newValue.equals( PERSON_DESCRIPTION ) );
-        Attributes attrs = new AttributesImpl( "description", newValue );
+        Attributes attrs = new BasicAttributes( "description", newValue, true );
 
         ctx.modifyAttributes( RDN_TORI_AMOS, DirContext.ADD_ATTRIBUTE, attrs );
 
@@ -205,7 +204,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Change description attribute
-        Attributes attrs = new AttributesImpl( "description", PERSON_DESCRIPTION );
+        Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION, true );
         
         try
         {
@@ -242,23 +241,23 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Change description attribute
-        Attributes attrs = new AttributesImpl( true );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 1" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 2" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 3" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 4" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 5" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 6" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 7" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 8" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 9" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 10" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 11" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 12" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 13" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber", "attr 14" ) );
+        Attributes attrs = new BasicAttributes( true );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 1" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 2" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 3" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 4" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 5" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 6" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 7" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 8" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 9" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 10" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 11" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 12" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 13" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber", "attr 14" ) );
         
-        Attribute attr = new AttributeImpl( "description", PERSON_DESCRIPTION );
+        Attribute attr = new BasicAttribute( "description", PERSON_DESCRIPTION );
 
         attrs.put( attr );
         
@@ -290,8 +289,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Change description attribute
-        Attributes attrs = new AttributesImpl( true );
-        Attribute attr = new AttributeImpl( "description", "a British singer-songwriter with an expressive four-octave voice" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute attr = new BasicAttribute( "description", "a British singer-songwriter with an expressive four-octave voice" );
         attr.add( "one of the most influential female artists of the twentieth century" );
         attrs.put( attr );
         
@@ -319,7 +318,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // modify object classes, add a new value twice
-        Attribute ocls = new AttributeImpl( "objectClass", "organizationalPerson" );
+        Attribute ocls = new BasicAttribute( "objectClass", "organizationalPerson" );
         ModificationItemImpl[] modItems = new ModificationItemImpl[2];
         modItems[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, ocls );
         modItems[1] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, ocls );
@@ -352,7 +351,7 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // add the same description value twice
-        Attribute desc = new AttributeImpl( "description", "another description value besides songwriter" );
+        Attribute desc = new BasicAttribute( "description", "another description value besides songwriter" );
         ModificationItemImpl[] modItems = new ModificationItemImpl[2];
         modItems[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, desc );
         modItems[1] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, desc );
@@ -381,7 +380,7 @@
         
         // Add a not existing attribute
         String newValue = "unbelievable";
-        Attributes attrs = new AttributesImpl( "voice", newValue );
+        Attributes attrs = new BasicAttributes( "voice", newValue, true );
 
         try
         {
@@ -416,14 +415,14 @@
         String[] descriptions = {
                 "Kate Bush is a British singer-songwriter.",
                 "She has become one of the most influential female artists of the twentieth century." };
-        Attribute desc1 = new AttributeImpl("description");
+        Attribute desc1 = new BasicAttribute("description");
         desc1.add(descriptions[0]);
         desc1.add(descriptions[1]);
 
         ModificationItemImpl addModOp = new ModificationItemImpl(
                 DirContext.ADD_ATTRIBUTE, desc1);
 
-        Attribute desc2 = new AttributeImpl("description");
+        Attribute desc2 = new BasicAttribute("description");
         desc2.add(descriptions[1]);
         ModificationItemImpl delModOp = new ModificationItemImpl(
                 DirContext.REMOVE_ATTRIBUTE, desc2);
@@ -499,7 +498,7 @@
         ctx.createSubcontext(rdn, attrs);
 
         // Try to modify the cn attribute
-        Attribute desc1 = new AttributeImpl( "cn", "Georges Bush" );
+        Attribute desc1 = new BasicAttribute( "cn", "Georges Bush" );
 
         ModificationItem addModOp = new ModificationItem(
                 DirContext.REPLACE_ATTRIBUTE, desc1);
@@ -534,8 +533,8 @@
     {
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "inetOrgPerson" );
         attrs.put( ocls );
@@ -544,8 +543,8 @@
         ctx.createSubcontext( "cn=Fiona Apple", attrs );
         
         // add two displayNames to an inetOrgPerson
-        attrs = new AttributesImpl();
-        Attribute displayName = new AttributeImpl( "displayName" );
+        attrs = new BasicAttributes( true );
+        Attribute displayName = new BasicAttribute( "displayName" );
         displayName.add( "Fiona" );
         displayName.add( "Fiona A." );
         attrs.put( displayName );
@@ -572,7 +571,7 @@
         
         // Add a binary attribute
         byte[] newValue = new byte[]{0x00, 0x01, 0x02, 0x03};
-        Attributes attrs = new AttributesImpl( "userCertificate;binary", newValue );
+        Attributes attrs = new BasicAttributes( "userCertificate;binary", newValue, true );
         ctx.modifyAttributes( RDN_TORI_AMOS, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Verify, that attribute value is added

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java Mon Sep  1 17:02:29 2008
@@ -23,6 +23,8 @@
 import javax.naming.NamingEnumeration;
 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.InvalidAttributeIdentifierException;
 import javax.naming.directory.InvalidAttributeValueException;
@@ -47,8 +49,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 
 
@@ -85,8 +85,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );
@@ -102,8 +102,8 @@
      */
     protected Attributes getInetOrgPersonAttributes( String sn, String cn )
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute ocls = new AttributeImpl( "objectClass" );
+        Attributes attrs = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         ocls.add( "organizationalPerson" );
@@ -137,7 +137,7 @@
         assertNotNull( tori.get( "sn" ) );
         
         // Test an add operation first
-        ModificationItem mod = new ModificationItem( DirContext.ADD_ATTRIBUTE, new AttributeImpl( "cn", "foo" ) );
+        ModificationItem mod = new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "cn", "foo" ) );
         ctx.modifyAttributes( RDN, new ModificationItem[] { mod } );
         tori = ctx.getAttributes( RDN );
         assertNotNull( tori.get( "objectClass" ) );
@@ -148,7 +148,7 @@
         assertNotNull( tori.get( "sn" ) );
         
         // Now test remove of value ( bar ) that does not exist in cn
-        mod = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, new AttributeImpl( "cn", "bar" ) );
+        mod = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, new BasicAttribute( "cn", "bar" ) );
         ctx.modifyAttributes( RDN, new ModificationItem[] { mod } );
         tori = ctx.getAttributes( RDN );
         assertNotNull( tori.get( "objectClass" ) );
@@ -172,8 +172,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove description Attribute
-        Attribute attr = new AttributeImpl( "description" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "description" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
         ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
 
@@ -196,13 +196,13 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // add telephoneNumber to entry
-        Attributes tn = new AttributesImpl( "telephoneNumber", "12345678" );
+        Attributes tn = new BasicAttributes( "telephoneNumber", "12345678", true );
         ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, tn );
 
         // Remove description and telephoneNumber to Attribute
-        Attributes attrs = new AttributesImpl();
-        attrs.put( new AttributeImpl( "description" ) );
-        attrs.put( new AttributeImpl( "telephoneNumber" ) );
+        Attributes attrs = new BasicAttributes( true );
+        attrs.put( new BasicAttribute( "description" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber" ) );
         ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
 
         // Verify, that attributes are deleted
@@ -226,8 +226,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove sn attribute
-        Attribute attr = new AttributeImpl( "sn" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "sn" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
 
         try
@@ -253,8 +253,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove sn attribute
-        Attribute attr = new AttributeImpl( "cn" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "cn" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
 
         try
@@ -285,8 +285,8 @@
         ctx.rename( RDN, newRdn );
 
         // Remove description, which is now RDN attribute
-        Attribute attr = new AttributeImpl( "description" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "description" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
 
         try
@@ -317,8 +317,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove telephoneNumber Attribute
-        Attribute attr = new AttributeImpl( "telephoneNumber" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "telephoneNumber" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
 
         try
@@ -345,16 +345,16 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove telephoneNumber Attribute
-        Attribute attr = new AttributeImpl( "telephoneNumber", "12345" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "telephoneNumber", "12345" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
         
         // Inject the new attribute
         ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Now try to remove a value which is not present
-        Attribute attr2 = new AttributeImpl( "telephoneNumber", "7890" );
-        Attributes attrs2 = new AttributesImpl();
+        Attribute attr2 = new BasicAttribute( "telephoneNumber", "7890" );
+        Attributes attrs2 = new BasicAttributes( true );
         attrs2.put( attr2 );
     	
         ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs2 );
@@ -375,8 +375,8 @@
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove phantasy attribute
-        Attribute attr = new AttributeImpl( "XXX" );
-        Attributes attrs = new AttributesImpl();
+        Attribute attr = new BasicAttribute( "XXX" );
+        Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
 
         try
@@ -410,7 +410,7 @@
         ctx.createSubcontext( rdn, attrs );
 
         // replace attribute givenName with empty value (=> deletion)
-        Attribute attr = new AttributeImpl( "givenname" );
+        Attribute attr = new BasicAttribute( "givenname" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
         ctx.modifyAttributes( rdn, new ModificationItemImpl[] { item } );
 
@@ -455,7 +455,7 @@
         ctx.createSubcontext( rdn, attrs );
 
         // replace attribute cn with empty value (=> deletion)
-        Attribute attr = new AttributeImpl( "cn" );
+        Attribute attr = new BasicAttribute( "cn" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
 
         try
@@ -487,7 +487,7 @@
         ctx.createSubcontext( rdn, attrs );
 
         // replace attribute cn with empty value (=> deletion)
-        Attribute attr = new AttributeImpl( "cn" );
+        Attribute attr = new BasicAttribute( "cn" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
 
         try
@@ -519,7 +519,7 @@
         ctx.createSubcontext( rdn, attrs );
 
         // replace attribute cn with empty value (=> deletion)
-        Attribute attr = new AttributeImpl( "cn", "Kate Bush" );
+        Attribute attr = new BasicAttribute( "cn", "Kate Bush" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
 
         try
@@ -550,7 +550,7 @@
         String rdn = "cn=Kate Bush";
         ctx.createSubcontext(rdn, attrs);
 
-        ModificationItemImpl delModOp = new ModificationItemImpl(DirContext.REMOVE_ATTRIBUTE, new AttributeImpl("objectclass", ""));
+        ModificationItemImpl delModOp = new ModificationItemImpl(DirContext.REMOVE_ATTRIBUTE, new BasicAttribute("objectclass", ""));
 
         try {
             ctx.modifyAttributes(rdn, new ModificationItemImpl[] { delModOp });
@@ -583,7 +583,7 @@
         String rdn = "cn=Kate Bush";
         ctx.createSubcontext(rdn, attrs);
 
-        ModificationItemImpl delModOp = new ModificationItemImpl(DirContext.REMOVE_ATTRIBUTE, new AttributeImpl("objectclass"));
+        ModificationItemImpl delModOp = new ModificationItemImpl(DirContext.REMOVE_ATTRIBUTE, new BasicAttribute("objectclass"));
 
         try {
             ctx.modifyAttributes(rdn, new ModificationItemImpl[] { delModOp });

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Mon Sep  1 17:02:29 2008
@@ -26,14 +26,13 @@
 import javax.naming.NoPermissionException;
 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.SchemaViolationException;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
-
 import org.apache.directory.server.core.integ.Level;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
@@ -71,8 +70,8 @@
      */
     private Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );
@@ -89,8 +88,8 @@
      */
     private Attributes getOrganizationalUnitAttributes( String ou )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );
@@ -1029,8 +1028,8 @@
     {
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Mon Sep  1 17:02:29 2008
@@ -27,6 +27,8 @@
 import javax.naming.NamingEnumeration;
 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;
 import javax.naming.event.EventDirContext;
@@ -50,8 +52,6 @@
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.PersistentSearchControl;
 
 import org.junit.Test;
@@ -99,8 +99,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );
@@ -205,7 +205,7 @@
     {
         setUpListener();
         ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, 
-            new AttributesImpl( "description", PERSON_DESCRIPTION, true ) );
+            new BasicAttributes( "description", PERSON_DESCRIPTION, true ) );
         waitForThreadToDie( t );
         assertNotNull( listener.result );
         assertEquals( RDN, listener.result.getName() );
@@ -266,7 +266,7 @@
     public void testPsearchModifyWithEC() throws Exception
     {
         setUpListenerReturnECs();
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new AttributesImpl( "description", PERSON_DESCRIPTION,
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
             true ) );
         waitForThreadToDie( t );
         assertNotNull( listener.result );
@@ -354,7 +354,7 @@
         assertNull( listener.result );
 
         // thread is still waiting for notifications try a modify
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new AttributesImpl( "description", PERSON_DESCRIPTION,
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
             true ) );
         waitForThreadToDie( t );
         

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java Mon Sep  1 17:02:29 2008
@@ -22,6 +22,7 @@
 
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
@@ -31,7 +32,6 @@
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -255,7 +255,7 @@
         DirContext ctx = getWiredContext( ldapServer );
         
         // create an entry with the schema objectClass personActiveDirectory
-        AttributesImpl person = new AttributesImpl( "objectClass", "top", true );
+        Attributes person = new BasicAttributes( "objectClass", "top", true );
         person.get( "objectClass" ).add( "person" );
         person.get( "objectClass" ).add( "personActiveDirectory" );
         person.put( "cn", "foobar" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Mon Sep  1 17:02:29 2008
@@ -30,6 +30,8 @@
 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.SearchControls;
 import javax.naming.directory.SearchResult;
@@ -46,8 +48,6 @@
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.SubentriesControl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -230,8 +230,8 @@
      */
     private Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attribute.add( "organizationalPerson" );
@@ -655,13 +655,13 @@
         Attribute administrativeRole = ap.get( "administrativeRole" );
         if ( administrativeRole == null || !administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
         {
-            Attributes changes = new AttributesImpl( "administrativeRole", SubentryInterceptor.AC_AREA, true );
+            Attributes changes = new BasicAttributes( "administrativeRole", SubentryInterceptor.AC_AREA, true );
             adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
         }
 
         // now add the A/C subentry below ou=system
-        Attributes subentry = new AttributesImpl( "cn", cn, true );
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new BasicAttributes( "cn", cn, true );
+        Attribute objectClass = new BasicAttribute( "objectClass" );
         subentry.put( objectClass );
         objectClass.add( "top" );
         objectClass.add( SchemaConstants.SUBENTRY_OC );
@@ -1064,8 +1064,8 @@
         LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // create administrative area
-        Attributes aaAttrs = new AttributesImpl();
-        Attribute aaObjectClass = new AttributeImpl( "objectClass" );
+        Attributes aaAttrs = new BasicAttributes( true );
+        Attribute aaObjectClass = new BasicAttribute( "objectClass" );
         aaObjectClass.add( "top" );
         aaObjectClass.add( "organizationalUnit" );
         aaObjectClass.add( "extensibleObject" );
@@ -1075,8 +1075,8 @@
         DirContext aaCtx = ctx.createSubcontext( "ou=Collective Area", aaAttrs );
         
         // create subentry
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new BasicAttributes( true );
+        Attribute objectClass = new BasicAttribute( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( SchemaConstants.SUBENTRY_OC );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -1389,7 +1389,7 @@
     public void testMissingAnyInSubstring_DIRSERVER_1180() throws Exception
     {
         LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
-        Attributes attrs = new AttributesImpl( "objectClass", "inetOrgPerson", true );
+        Attributes attrs = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         attrs.get( "objectClass" ).add( "organizationalPerson" );
         attrs.get( "objectClass" ).add( "person" );
         attrs.put( "givenName", "Jim" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java Mon Sep  1 17:02:29 2008
@@ -39,8 +39,6 @@
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.server.ssl.SSLSocketFactory;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +47,8 @@
 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;
 
@@ -147,8 +147,8 @@
     public void testLdapS() throws Exception
     {
         // Create a person
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=691083&r1=691082&r2=691083&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Mon Sep  1 17:02:29 2008
@@ -37,6 +37,8 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingEnumeration;
 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;
@@ -55,8 +57,6 @@
 import org.apache.directory.server.integ.ServerIntegrationUtils;
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.After;
 import org.junit.Before;
@@ -244,7 +244,7 @@
     	// do add and confirm
     	// -------------------------------------------------------------------
 
-    	AttributesImpl attrs = new AttributesImpl( "objectClass", "person", true );
+    	Attributes attrs = new BasicAttributes( "objectClass", "person", true );
     	attrs.put( "sn", "foo" );
     	attrs.put( "cn", "foo bar" );
     	ctx.createSubcontext( "cn=foo bar,ou=system", attrs );
@@ -255,7 +255,7 @@
     	// -------------------------------------------------------------------
 
     	ModificationItem[] mods = new ModificationItem[] {
-    			new ModificationItem( DirContext.ADD_ATTRIBUTE, new AttributeImpl( "cn", "fbar" ) )
+    			new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "cn", "fbar" ) )
     	};
     	ctx.modifyAttributes( "cn=foo bar,ou=system", mods );
     	Attributes reread = ( Attributes ) ctx.getAttributes( "cn=foo bar,ou=system" );



Mime
View raw message