directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r498847 - in /directory/shared/branches/0.9.5/ldap/src: main/java/org/apache/directory/shared/ldap/codec/add/ main/java/org/apache/directory/shared/ldap/codec/modify/ main/java/org/apache/directory/shared/ldap/codec/search/ main/java/org/ap...
Date Mon, 22 Jan 2007 23:24:53 GMT
Author: elecharny
Date: Mon Jan 22 15:24:46 2007
New Revision: 498847

URL: http://svn.apache.org/viewvc?view=rev&rev=498847
Log:
Rennamed Attribute(s)Impl to LockableAttribute(s)Impl
Removed an useless boolean field in AttributesImpl

Added:
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributeImpl.java
      - copied, changed from r498841, directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributesImpl.java
      - copied, changed from r498841, directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
Removed:
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
Modified:
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributeImplTest.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java
Mon Jan 22 15:24:46 2007
@@ -26,8 +26,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessage;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -127,7 +127,7 @@
      */
     public void initAttributes()
     {
-        attributes = new AttributesImpl( true );
+        attributes = new LockableAttributesImpl( true );
     }
 
 
@@ -156,7 +156,7 @@
         }
         
         // fix this to use LockableAttributeImpl(type.getString().toLowerCase())
-        currentAttribute = new AttributeImpl( type.toLowerCase() );
+        currentAttribute = new LockableAttributeImpl( type.toLowerCase() );
         attributes.put( currentAttribute );
     }
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
Mon Jan 22 15:24:46 2007
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessage;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -180,7 +180,7 @@
      */
     public void addAttributeTypeAndValues( String type )
     {
-        currentAttribute = new AttributeImpl( StringTools.lowerCase( type ) );
+        currentAttribute = new LockableAttributeImpl( StringTools.lowerCase( type ) );
 
         int operation = 0;
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
Mon Jan 22 15:24:46 2007
@@ -30,8 +30,8 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessage;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 import java.io.UnsupportedEncodingException;
@@ -113,7 +113,7 @@
         super();
 
         currentFilter = null;
-        attributes = new AttributesImpl( true );
+        attributes = new LockableAttributesImpl( true );
     }
 
 
@@ -149,7 +149,7 @@
      */
     public void addAttribute( String attribute )
     {
-        attributes.put( new AttributeImpl( attribute ) );
+        attributes.put( new LockableAttributeImpl( attribute ) );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
Mon Jan 22 15:24:46 2007
@@ -26,8 +26,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessage;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -99,7 +99,7 @@
     public SearchResultEntry()
     {
         super();
-        partialAttributeList = new AttributesImpl( true );
+        partialAttributeList = new LockableAttributesImpl( true );
     }
 
 
@@ -166,7 +166,7 @@
      */
     public void addAttributeValues( String type )
     {
-        currentAttributeValue = new AttributeImpl( StringTools.lowerCase( type ) );
+        currentAttributeValue = new LockableAttributeImpl( StringTools.lowerCase( type )
);
 
         partialAttributeList.put( currentAttributeValue );
     }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
Mon Jan 22 15:24:46 2007
@@ -34,8 +34,8 @@
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -96,7 +96,7 @@
         modificationList = new LinkedList();
         modificationItems = new HashMap();
         dn = null;
-        attributeList = new AttributesImpl( true );
+        attributeList = new LockableAttributesImpl( true );
         control = null;
     }
 
@@ -222,7 +222,7 @@
     {
         if ( changeType == MODIFY )
         {
-            Attribute attr = new AttributeImpl( id, value );
+            Attribute attr = new LockableAttributeImpl( id, value );
 
             if ( modificationItems.containsKey( id ) )
             {
@@ -353,7 +353,7 @@
     {
         if ( "dn".equalsIgnoreCase( attributeId ) )
         {
-            return new AttributeImpl( "dn", dn );
+            return new LockableAttributeImpl( "dn", dn );
         }
 
         return attributeList.get( attributeId );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
Mon Jan 22 15:24:46 2007
@@ -46,7 +46,7 @@
 
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.primitives.OID;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.name.LdapDnParser;
 import org.apache.directory.shared.ldap.util.Base64;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -816,7 +816,7 @@
             Object attributeValue = parseSimpleValue( line, colonIndex );
 
             // Create an attribute
-            return new AttributeImpl( attributeType, attributeValue );
+            return new LockableAttributeImpl( attributeType, attributeValue );
         }
         else
         {

Copied: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributeImpl.java
(from r498841, directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributeImpl.java?view=diff&rev=498847&p1=directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java&r1=498841&p2=directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributeImpl.java&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributeImpl.java
Mon Jan 22 15:24:46 2007
@@ -45,9 +45,9 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class AttributeImpl implements Attribute
+public class LockableAttributeImpl implements Attribute
 {
-    private static final Logger log = LoggerFactory.getLogger( AttributeImpl.class );
+    private static final Logger log = LoggerFactory.getLogger( LockableAttributeImpl.class
);
 
     private static final long serialVersionUID = -5158233254341746514L;
 
@@ -74,7 +74,7 @@
      * @param id
      *            the id or name of this attribute.
      */
-    public AttributeImpl( String id )
+    public LockableAttributeImpl( String id )
     {
         upId = id;
         value = null;
@@ -91,7 +91,7 @@
      * @param value
      *            a value for the attribute
      */
-    public AttributeImpl( String id, Object value )
+    public LockableAttributeImpl( String id, Object value )
     {
         upId = id;
         list = null;
@@ -108,7 +108,7 @@
      * @param value
      *            a value for the attribute
      */
-    public AttributeImpl( String id, byte[] value )
+    public LockableAttributeImpl( String id, byte[] value )
     {
         upId = id;
         list = null;
@@ -379,7 +379,7 @@
     {
         try
         {
-            AttributeImpl clone = (AttributeImpl)super.clone();
+            LockableAttributeImpl clone = (LockableAttributeImpl)super.clone();
             
             if ( size < 2 )
             {
@@ -601,7 +601,7 @@
             return true;
         }
 
-        if ( ( obj == null ) || !( obj instanceof AttributeImpl ) )
+        if ( ( obj == null ) || !( obj instanceof LockableAttributeImpl ) )
         {
             return false;
         }

Copied: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributesImpl.java
(from r498841, directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributesImpl.java?view=diff&rev=498847&p1=directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java&r1=498841&p2=directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributesImpl.java&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/LockableAttributesImpl.java
Mon Jan 22 15:24:46 2007
@@ -41,13 +41,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AttributesImpl implements Attributes
+public class LockableAttributesImpl implements Attributes
 {
     static transient final long serialVersionUID = 1L;
     
-    /** This flag is used if the attribute name is not caseSensitive */
-    private boolean ignoreCase;
-
     /**
      * An holder to store <Id, Attribute> couples
      */
@@ -85,7 +82,7 @@
             {
                 // The BasicAttribute clone() method does not
                 // copy the values.
-                clone.attribute = new AttributeImpl( attribute.getID() );
+                clone.attribute = new LockableAttributeImpl( attribute.getID() );
                 
                 try
                 {
@@ -144,7 +141,7 @@
 		private Iterator iterator; 
 		
         /** Create an attribute's iterator */
-		private AttributeIterator( AttributesImpl attributes )
+		private AttributeIterator( LockableAttributesImpl attributes )
 		{
 			iterator = attributes.keyMap.values().iterator();
 		}
@@ -207,39 +204,35 @@
     /**
      * Creates an Attributes
      */
-    public AttributesImpl()
+    public LockableAttributesImpl()
     {
         keyMap = new HashMap();
-        ignoreCase = true;
     }
 
     /**
      * Creates an Attributes
      */
-    public AttributesImpl( boolean ignoreCase )
+    public LockableAttributesImpl( boolean ignoreCase )
     {
         keyMap = new HashMap();
-        this.ignoreCase = ignoreCase;
     }
 
     /**
      * Creates an Attributes with one Attribute
      */
-    public AttributesImpl( String id, Object value )
+    public LockableAttributesImpl( String id, Object value )
     {
         keyMap = new HashMap();
         put( id, value );
-        ignoreCase = true;
     }
 
     /**
      * Creates an Attributes with one attribute
      */
-    public AttributesImpl(  String id, Object value, boolean ignoreCase )
+    public LockableAttributesImpl(  String id, Object value, boolean ignoreCase )
     {
         keyMap = new HashMap();
         put( id, value );
-        this.ignoreCase = ignoreCase;
     }
 
     // ------------------------------------------------------------------------
@@ -336,7 +329,7 @@
      */
     public boolean isCaseIgnored()
     {
-        return ignoreCase;
+        return true;
     }
 
 
@@ -437,7 +430,7 @@
      */
     public Attribute put( String attrId, Object val )
     {
-        Attribute attr = new AttributeImpl( attrId );
+        Attribute attr = new LockableAttributeImpl( attrId );
         attr.add( val );
         
         String key = idToLowerCase( attrId );
@@ -477,13 +470,13 @@
         	old = attr;
         }
 
-        if ( attr instanceof AttributeImpl )
+        if ( attr instanceof LockableAttributeImpl )
         {
         	newAttr = attr;
         }
         else if ( attr instanceof BasicAttribute )
         {
-            newAttr = new AttributeImpl( id );
+            newAttr = new LockableAttributeImpl( id );
         	 
         	try
         	{
@@ -569,7 +562,7 @@
     {
     	try
     	{
-	    	AttributesImpl clone = (AttributesImpl)super.clone();
+	    	LockableAttributesImpl clone = (LockableAttributesImpl)super.clone();
 	
 			clone.keyMap = new HashMap( keyMap.size() );
 			
@@ -633,7 +626,7 @@
             return true;
         }
 
-        if ( ( obj == null ) || !( obj instanceof AttributesImpl ) )
+        if ( ( obj == null ) || !( obj instanceof LockableAttributesImpl ) )
         {
             return false;
         }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
Mon Jan 22 15:24:46 2007
@@ -28,10 +28,10 @@
 /**
  *
  * A specific version of this class, which do a transformation of a
- * BasicAttribute to a AttributeImpl when created.
+ * BasicAttribute to a LockableAttributeImpl when created.
  * 
  * This is necessary because BasicAttribute clone method do not do a
- * deep clone, which is _bad_. AttributeImpl do a deep copy when
+ * deep clone, which is _bad_. LockableAttributeImpl do a deep copy when
  * cloning, which is _good_.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
Mon Jan 22 15:24:46 2007
@@ -32,8 +32,8 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.commons.collections.MultiHashMap;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -883,7 +883,7 @@
     */
    public Attributes toAttributes()
    {
-       Attributes attributes = new AttributesImpl( true );
+       Attributes attributes = new LockableAttributesImpl( true );
        Attribute attribute = null;
 
        switch ( nbAtavs  )
@@ -892,7 +892,7 @@
                break;
 
            case 1 :
-               attribute = new AttributeImpl( atavType );
+               attribute = new LockableAttributeImpl( atavType );
                attribute.add( atav.getValue() );
                attributes.put( attribute );
                break;
@@ -905,7 +905,7 @@
                    String type = ( String ) types.next();
                    List values = ( List ) atavTypes.get( type );
 
-                   attribute = new AttributeImpl( type );
+                   attribute = new LockableAttributeImpl( type );
 
                    Iterator iterValues = values.iterator();
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
Mon Jan 22 15:24:46 2007
@@ -22,8 +22,8 @@
 
 import java.util.Arrays;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -100,23 +100,23 @@
     }
 
     /**
-     * Switch from a BasicAttribute to a AttributeImpl. This is
+     * Switch from a BasicAttribute to a LockableAttributeImpl. This is
      * necessary to allow cloning to be correctly handled.
      * 
      * @param attribute The attribute to transform
-     * @return A instance of AttributeImpl
+     * @return A instance of LockableAttributeImpl
      */
     public final static Attribute toAttributeImpl( Attribute attribute )
     {
-        if ( attribute instanceof AttributeImpl )
+        if ( attribute instanceof LockableAttributeImpl )
         {
             // Just return the attribute
             return attribute;
         }
         else
         {
-            // Create a new AttributeImpl from the original attribute
-            AttributeImpl newAttribute = new AttributeImpl( attribute.getID() );
+            // Create a new LockableAttributeImpl from the original attribute
+            LockableAttributeImpl newAttribute = new LockableAttributeImpl( attribute.getID()
);
             
             try
             {
@@ -137,23 +137,23 @@
     }
     
     /**
-     * Switch from a BasicAttributes to a AttributesImpl. This is
+     * Switch from a BasicAttributes to a LockableAttributesImpl. This is
      * necessary to allow cloning to be correctly handled.
      * 
      * @param attributes The attributes to transform
-     * @return A instance of AttributesImpl
+     * @return A instance of LockableAttributesImpl
      */
     public final static Attributes toAttributesImpl( Attributes attributes )
     {
-        if ( attributes instanceof AttributesImpl )
+        if ( attributes instanceof LockableAttributesImpl )
         {
             // Just return the attribute
             return attributes;
         }
         else
         {
-            // Create a new AttributesImpl from the original attribute
-            AttributesImpl newAttributes = new AttributesImpl( attributes.isCaseIgnored()
);
+            // Create a new LockableAttributesImpl from the original attribute
+            LockableAttributesImpl newAttributes = new LockableAttributesImpl( attributes.isCaseIgnored()
);
             
             try
             {
@@ -434,7 +434,7 @@
         }
         else if ( attr0 == null )
         {
-            return new AttributeImpl( attr1.getID() );
+            return new LockableAttributeImpl( attr1.getID() );
         }
         else if ( attr1 == null )
         {
@@ -449,7 +449,7 @@
             id = attr0.getID();
         }
 
-        Attribute attr = new AttributeImpl( id );
+        Attribute attr = new LockableAttributeImpl( id );
 
         if ( attr0 != null )
         {
@@ -512,7 +512,7 @@
             id = attr0.getID();
         }
 
-        Attribute attr = new AttributeImpl( id );
+        Attribute attr = new LockableAttributeImpl( id );
 
         if ( attr0 != null )
         {

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
Mon Jan 22 15:24:46 2007
@@ -34,7 +34,7 @@
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 
 /**
@@ -688,7 +688,7 @@
         {
             if ( values == null )
             {
-                return new AttributesImpl();
+                return new LockableAttributesImpl();
             }
 
             return values;

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
Mon Jan 22 15:24:46 2007
@@ -32,8 +32,8 @@
 import org.apache.directory.shared.ldap.message.AddRequest;
 import org.apache.directory.shared.ldap.message.AddRequestImpl;
 import org.apache.directory.shared.ldap.message.Control;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.MessageException;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ResultResponse;
@@ -55,9 +55,9 @@
      *            the id for the attribute
      * @return the LockableAttributeImpl assembled for testing
      */
-    private AttributeImpl getAttribute( String id )
+    private LockableAttributeImpl getAttribute( String id )
     {
-        AttributeImpl attr = new AttributeImpl( id );
+        LockableAttributeImpl attr = new LockableAttributeImpl( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );
@@ -70,9 +70,9 @@
      * 
      * @return
      */
-    private AttributesImpl getAttributes()
+    private LockableAttributesImpl getAttributes()
     {
-        AttributesImpl attrs = new AttributesImpl();
+        LockableAttributesImpl attrs = new LockableAttributesImpl();
         attrs.put( getAttribute( "attr0" ) );
         attrs.put( getAttribute( "attr1" ) );
         attrs.put( getAttribute( "attr2" ) );

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributeImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributeImplTest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributeImplTest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributeImplTest.java
Mon Jan 22 15:24:46 2007
@@ -27,7 +27,7 @@
 import junit.framework.TestCase;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -42,9 +42,9 @@
     /**
      * Creates and populates a LockableAttributeImpl instance for tests.
      */
-    private AttributeImpl getAttribute()
+    private LockableAttributeImpl getAttribute()
     {
-        AttributeImpl attr = new AttributeImpl( "test-attr1" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "test-attr1" );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );
@@ -57,7 +57,7 @@
      */
     public void testEqualsSameObj()
     {
-        AttributeImpl attr = getAttribute();
+        LockableAttributeImpl attr = getAttribute();
         assertTrue( "same object should be equal", attr.equals( attr ) );
     }
 
@@ -67,8 +67,8 @@
      */
     public void testEqualsExactCopy()
     {
-        AttributeImpl attr0 = getAttribute();
-        AttributeImpl attr1 = getAttribute();
+        LockableAttributeImpl attr0 = getAttribute();
+        LockableAttributeImpl attr1 = getAttribute();
         assertTrue( "exact copies should be equal", attr0.equals( attr1 ) );
         assertTrue( "exact copies should be equal", attr1.equals( attr0 ) );
     }
@@ -79,8 +79,8 @@
      */
     public void testNotEqualDiffId()
     {
-        AttributeImpl attr0 = getAttribute();
-        AttributeImpl attr1 = new AttributeImpl( "test-attr2" );
+        LockableAttributeImpl attr0 = getAttribute();
+        LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr2" );
         attr1.add( "value0" );
         attr1.add( "value1" );
         attr1.add( "value2" );
@@ -94,8 +94,8 @@
      */
     public void testNotEqualDiffCasedId()
     {
-        AttributeImpl attr0 = getAttribute();
-        AttributeImpl attr1 = new AttributeImpl( "TEST-attr1" );
+        LockableAttributeImpl attr0 = getAttribute();
+        LockableAttributeImpl attr1 = new LockableAttributeImpl( "TEST-attr1" );
         attr1.add( "value0" );
         attr1.add( "value1" );
         attr1.add( "value2" );
@@ -109,8 +109,8 @@
      */
     public void testNotEqualDiffValues()
     {
-        AttributeImpl attr0 = getAttribute();
-        AttributeImpl attr1 = new AttributeImpl( "test-attr1" );
+        LockableAttributeImpl attr0 = getAttribute();
+        LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr1" );
         attr1.add( "value0" );
         attr1.add( "value1" );
         assertFalse( "Attributes with different values should not be equal", attr0.equals(
attr1 ) );
@@ -132,8 +132,8 @@
      */
     public void testNotEqualWithReplicatedValues()
     {
-        AttributeImpl attr0 = getAttribute();
-        AttributeImpl attr1 = new AttributeImpl( "test-attr1" );
+        LockableAttributeImpl attr0 = getAttribute();
+        LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr1" );
         attr1.add( "value0" );
         attr1.add( "value1" );
         assertFalse( "Attributes with different values should not be equal", attr0.equals(
attr1 ) );
@@ -157,8 +157,8 @@
      */
     public void testNotEqualDiffImpl()
     {
-        AttributeImpl attr0 = getAttribute();
-        Attribute attr1 = new AttributeImpl( "test-attr1" );
+        LockableAttributeImpl attr0 = getAttribute();
+        Attribute attr1 = new LockableAttributeImpl( "test-attr1" );
         attr1.add( "value0" );
         attr1.add( "value1" );
         assertFalse( "Attributes with different values should not be equal", attr0.equals(
attr1 ) );
@@ -178,7 +178,7 @@
 
     public void testContains()
     {
-        AttributeImpl attr = getAttribute();
+        LockableAttributeImpl attr = getAttribute();
         assertTrue( attr.contains( "value0" ) );
         assertTrue( attr.contains( "value1" ) );
         assertTrue( attr.contains( "value2" ) );
@@ -187,7 +187,7 @@
     // Test the clone operation
     public void testCloneAttribute() throws NamingException
     {
-        Attribute attr = new AttributeImpl( "test" );
+        Attribute attr = new LockableAttributeImpl( "test" );
 
         String zero = "zero";
         attr.add( zero );
@@ -206,7 +206,7 @@
         Attribute clone = (Attribute)attr.clone();
         
         // Test the atomic elements
-        assertTrue( clone instanceof AttributeImpl );
+        assertTrue( clone instanceof LockableAttributeImpl );
         assertEquals( 4, clone.size() );
         assertEquals( "test", clone.getID() );
         
@@ -265,7 +265,7 @@
     
     public void testEquals()
     {
-        Attribute attr = new AttributeImpl( "test" );
+        Attribute attr = new LockableAttributeImpl( "test" );
 
         String zero = "zero";
         attr.add( zero );

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java
Mon Jan 22 15:24:46 2007
@@ -24,8 +24,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 /**
@@ -43,9 +43,9 @@
      *            the id for the attribute
      * @return the LockableAttributeImpl assembled for testing
      */
-    private AttributeImpl getAttribute( String id )
+    private LockableAttributeImpl getAttribute( String id )
     {
-        AttributeImpl attr = new AttributeImpl( id );
+        LockableAttributeImpl attr = new LockableAttributeImpl( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );
@@ -58,9 +58,9 @@
      * 
      * @return
      */
-    private AttributesImpl getAttributes()
+    private LockableAttributesImpl getAttributes()
     {
-        AttributesImpl attrs = new AttributesImpl();
+        LockableAttributesImpl attrs = new LockableAttributesImpl();
         attrs.put( getAttribute( "attr0" ) );
         attrs.put( getAttribute( "attr1" ) );
         attrs.put( getAttribute( "attr2" ) );
@@ -73,7 +73,7 @@
      */
     public void testToString()
     {
-        AttributesImpl attrs = getAttributes();
+        LockableAttributesImpl attrs = getAttributes();
         attrs.put( "binaryNullAttr", null );
         attrs.put( "binaryEmptyAttr", ArrayUtils.EMPTY_BYTE_ARRAY );
         attrs.put( "binaryFullAttr", new byte[]
@@ -90,7 +90,7 @@
      */
     public void testEqualsSameObj()
     {
-        AttributesImpl attrs = getAttributes();
+        LockableAttributesImpl attrs = getAttributes();
         assertTrue( "same object should return true", attrs.equals( attrs ) );
     }
 
@@ -100,8 +100,8 @@
      */
     public void testEqualsExactCopy()
     {
-        AttributesImpl attrs0 = getAttributes();
-        AttributesImpl attrs1 = getAttributes();
+        LockableAttributesImpl attrs0 = getAttributes();
+        LockableAttributesImpl attrs1 = getAttributes();
         assertTrue( "exact copies should be equal", attrs0.equals( attrs1 ) );
         assertTrue( "exact copies should be equal", attrs1.equals( attrs0 ) );
     }
@@ -113,8 +113,8 @@
      */
     public void testEqualsExactCopyWithReplicas()
     {
-        AttributesImpl attrs0 = getAttributes();
-        AttributesImpl attrs1 = getAttributes();
+        LockableAttributesImpl attrs0 = getAttributes();
+        LockableAttributesImpl attrs1 = getAttributes();
         attrs1.put( getAttribute( "attr0" ) );
         attrs1.put( getAttribute( "attr0" ) );
         assertTrue( "exact copies with repeated adds should be equal", attrs0.equals( attrs1
) );
@@ -127,8 +127,8 @@
      */
     public void testNotEqualDiffAttr()
     {
-        AttributesImpl attrs0 = getAttributes();
-        AttributesImpl attrs1 = getAttributes();
+        LockableAttributesImpl attrs0 = getAttributes();
+        LockableAttributesImpl attrs1 = getAttributes();
         attrs1.put( getAttribute( "blah" ) );
         assertFalse( "different attributes should not be equal", attrs0.equals( attrs1 )
);
         assertFalse( "different attributes should not be equal", attrs1.equals( attrs0 )
);
@@ -140,8 +140,8 @@
      */
     public void testEqualsDiffImpl()
     {
-        AttributesImpl attrs0 = getAttributes();
-        Attributes attrs1 = new AttributesImpl( true );
+        LockableAttributesImpl attrs0 = getAttributes();
+        Attributes attrs1 = new LockableAttributesImpl( true );
         attrs1.put( getAttribute( "attr0" ) );
         attrs1.put( getAttribute( "attr1" ) );
         attrs1.put( getAttribute( "attr2" ) );
@@ -153,13 +153,13 @@
 
     public void testCompareToBasicAttributes()
     {
-        AttributesImpl attrs0 = new AttributesImpl();
+        LockableAttributesImpl attrs0 = new LockableAttributesImpl();
         attrs0.put( "attr0", "value0" );
         attrs0.put( "attr1", "value1" );
         attrs0.put( "attr2", "value2" );
         attrs0.put( "attr2", "value3" );
 
-        Attributes attrs1 = new AttributesImpl( true );
+        Attributes attrs1 = new LockableAttributesImpl( true );
         attrs1.put( "attr0", "value0" );
         attrs1.put( "attr1", "value1" );
         attrs1.put( "attr2", "value2" );

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
Mon Jan 22 15:24:46 2007
@@ -27,7 +27,7 @@
 
 import org.apache.directory.shared.ldap.message.AbandonListener;
 import org.apache.directory.shared.ldap.message.Control;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.message.MessageException;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ModifyRequest;
@@ -68,19 +68,19 @@
             // do nothing
         }
 
-        AttributeImpl attr = new AttributeImpl( "attr0" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "attr0" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr
);
         req.addModification( item );
 
-        attr = new AttributeImpl( "attr1" );
+        attr = new LockableAttributeImpl( "attr1" );
         attr.add( "val3" );
         item = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
         req.addModification( item );
 
-        attr = new AttributeImpl( "attr2" );
+        attr = new LockableAttributeImpl( "attr2" );
         attr.add( "val4" );
         attr.add( "val5" );
         item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
@@ -149,7 +149,7 @@
     public void testNotEqualDiffModOps() throws InvalidNameException
     {
         ModifyRequestImpl req0 = getRequest();
-        AttributeImpl attr = new AttributeImpl( "attr3" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -157,7 +157,7 @@
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new AttributeImpl( "attr3" );
+        attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -175,7 +175,7 @@
     public void testNotEqualDiffModCount() throws InvalidNameException
     {
         ModifyRequestImpl req0 = getRequest();
-        AttributeImpl attr = new AttributeImpl( "attr3" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -195,7 +195,7 @@
     public void testNotEqualDiffModIds() throws InvalidNameException
     {
         ModifyRequestImpl req0 = getRequest();
-        AttributeImpl attr = new AttributeImpl( "attr3" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -203,7 +203,7 @@
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new AttributeImpl( "attr4" );
+        attr = new LockableAttributeImpl( "attr4" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -221,7 +221,7 @@
     public void testNotEqualDiffModValues() throws InvalidNameException
     {
         ModifyRequestImpl req0 = getRequest();
-        AttributeImpl attr = new AttributeImpl( "attr3" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -229,7 +229,7 @@
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new AttributeImpl( "attr3" );
+        attr = new LockableAttributeImpl( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -252,19 +252,19 @@
             public Collection getModificationItems()
             {
                 ArrayList list = new ArrayList();
-                AttributeImpl attr = new AttributeImpl( "attr0" );
+                LockableAttributeImpl attr = new LockableAttributeImpl( "attr0" );
                 attr.add( "val0" );
                 attr.add( "val1" );
                 attr.add( "val2" );
                 ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
attr );
                 list.add( item );
 
-                attr = new AttributeImpl( "attr1" );
+                attr = new LockableAttributeImpl( "attr1" );
                 attr.add( "val3" );
                 item = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
                 list.add( item );
 
-                attr = new AttributeImpl( "attr2" );
+                attr = new LockableAttributeImpl( "attr2" );
                 attr.add( "val4" );
                 attr.add( "val5" );
                 item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?view=diff&rev=498847&r1=498846&r2=498847
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
(original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
Mon Jan 22 15:24:46 2007
@@ -29,8 +29,8 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.shared.ldap.message.Control;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.MessageException;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.SearchResponseEntry;
@@ -53,9 +53,9 @@
      *            the id for the attribute
      * @return the LockableAttributeImpl assembled for testing
      */
-    private AttributeImpl getAttribute( String id )
+    private LockableAttributeImpl getAttribute( String id )
     {
-        AttributeImpl attr = new AttributeImpl( id );
+        LockableAttributeImpl attr = new LockableAttributeImpl( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );
@@ -68,9 +68,9 @@
      * 
      * @return
      */
-    AttributesImpl getAttributes()
+    LockableAttributesImpl getAttributes()
     {
-        AttributesImpl attrs = new AttributesImpl();
+        LockableAttributesImpl attrs = new LockableAttributesImpl();
         attrs.put( getAttribute( "attr0" ) );
         attrs.put( getAttribute( "attr1" ) );
         attrs.put( getAttribute( "attr2" ) );



Mime
View raw message