directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938842 [4/4] - in /directory: apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/ma...
Date Wed, 28 Apr 2010 09:56:39 GMT
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
Wed Apr 28 09:56:36 2010
@@ -36,10 +36,10 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -74,7 +74,7 @@ public class SearchResultEntryCodec exte
     private byte[] objectNameBytes;
 
     /** The entry */
-    private Entry entry = new DefaultClientEntry();
+    private Entry entry = new DefaultEntry();
 
     /** The current attribute being decoded */
     private EntryAttribute currentAttributeValue;

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java
(from r938820, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java&r1=938820&r2=938842&rev=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java
Wed Apr 28 09:56:36 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.shared.ldap.entry.client;
+package org.apache.directory.shared.ldap.entry;
 
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -35,10 +35,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.name.RdnSerializer;
@@ -58,13 +54,13 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DefaultClientEntry implements Entry
+public class DefaultEntry implements Entry
 {
     /** Used for serialization */
     private static final long serialVersionUID = 2L;
     
     /** The logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( DefaultClientEntry.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DefaultEntry.class );
 
     /** The DN for this entry */
     protected DN dn;
@@ -89,11 +85,11 @@ public class DefaultClientEntry implemen
     // Constructors
     //-------------------------------------------------------------------------
     /**
-     * Creates a new instance of DefaultClientEntry. 
+     * Creates a new instance of DefaultEntry. 
      * <p>
      * This entry <b>must</b> be initialized before being used !
      */
-    public DefaultClientEntry()
+    public DefaultEntry()
     {
         schemaManager = null;
         dn = DN.EMPTY_DN;
@@ -102,7 +98,7 @@ public class DefaultClientEntry implemen
 
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, schema aware. 
+     * Creates a new instance of DefaultEntry, schema aware. 
      * </p>
      * <p>
      * No attributes will be created.
@@ -110,7 +106,7 @@ public class DefaultClientEntry implemen
      * 
      * @param schemaManager The reference to the schemaManager
      */
-    public DefaultClientEntry( SchemaManager schemaManager )
+    public DefaultEntry( SchemaManager schemaManager )
     {
         this.schemaManager = schemaManager;
         dn = DN.EMPTY_DN;
@@ -121,12 +117,12 @@ public class DefaultClientEntry implemen
 
 
     /**
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN. 
      * 
      * @param dn The DN for this serverEntry. Can be null.
      */
-    public DefaultClientEntry( DN dn )
+    public DefaultEntry( DN dn )
     {
         this.dn = dn;
     }
@@ -134,7 +130,7 @@ public class DefaultClientEntry implemen
 
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, schema aware. 
+     * Creates a new instance of DefaultEntry, schema aware. 
      * </p>
      * <p>
      * No attributes will be created.
@@ -143,7 +139,7 @@ public class DefaultClientEntry implemen
      * @param schemaManager The reference to the schemaManager
      * @param dn The DN for this serverEntry. Can be null.
      */
-    public DefaultClientEntry( SchemaManager schemaManager, DN dn )
+    public DefaultEntry( SchemaManager schemaManager, DN dn )
     {
         if ( dn == null )
         {
@@ -162,13 +158,13 @@ public class DefaultClientEntry implemen
 
 
     /**
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN and a list of IDs. 
      * 
      * @param dn The DN for this serverEntry. Can be null.
      * @param upIds The list of attributes to create.
      */
-    public DefaultClientEntry( DN dn, String... upIds )
+    public DefaultEntry( DN dn, String... upIds )
     {
         this.dn = dn;
 
@@ -182,7 +178,7 @@ public class DefaultClientEntry implemen
     
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, copying 
+     * Creates a new instance of DefaultEntry, copying 
      * another entry. 
      * </p>
      * <p>
@@ -192,7 +188,7 @@ public class DefaultClientEntry implemen
      * @param schemaManager The reference to the schemaManager
      * @param entry the entry to copy
      */
-    public DefaultClientEntry( SchemaManager schemaManager, Entry entry )
+    public DefaultEntry( SchemaManager schemaManager, Entry entry )
     {
         this.schemaManager = schemaManager;
 
@@ -254,7 +250,7 @@ public class DefaultClientEntry implemen
 
 
     /**
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN, a list of ID and schema aware. 
      * <p>
      * No attributes will be created except the ObjectClass attribute,
@@ -266,7 +262,7 @@ public class DefaultClientEntry implemen
      * @param dn The DN for this serverEntry. Can be null.
      * @param upIds The list of attributes to create.
      */
-    public DefaultClientEntry( SchemaManager schemaManager, DN dn, String... upIds )
+    public DefaultEntry( SchemaManager schemaManager, DN dn, String... upIds )
     {
         if ( dn == null )
         {
@@ -287,14 +283,14 @@ public class DefaultClientEntry implemen
     
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN and a list of EntryAttributes.
      * </p> 
      * 
      * @param dn The DN for this serverEntry. Can be null
      * @param attributes The list of attributes to create
      */
-    public DefaultClientEntry( DN dn, EntryAttribute... attributes )
+    public DefaultEntry( DN dn, EntryAttribute... attributes )
     {
         this.dn = dn;
 
@@ -312,7 +308,7 @@ public class DefaultClientEntry implemen
 
     
     /**
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN, a list of ServerAttributes and schema aware. 
      * <p>
      * No attributes will be created except the ObjectClass attribute,
@@ -324,7 +320,7 @@ public class DefaultClientEntry implemen
      * @param dn The DN for this serverEntry. Can be null
      * @param attributes The list of attributes to create
      */
-    public DefaultClientEntry( SchemaManager schemaManager, DN dn, EntryAttribute... attributes
)
+    public DefaultEntry( SchemaManager schemaManager, DN dn, EntryAttribute... attributes
)
     {
         if ( dn == null )
         {
@@ -354,7 +350,7 @@ public class DefaultClientEntry implemen
     }
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN, a list of attributeTypes and schema aware. 
      * </p>
      * <p>
@@ -369,7 +365,7 @@ public class DefaultClientEntry implemen
      * @param dn The DN for this serverEntry. Can be null.
      * @param attributeTypes The list of attributes to create, without value.
      */
-    public DefaultClientEntry( SchemaManager schemaManager, DN dn, AttributeType... attributeTypes
)
+    public DefaultEntry( SchemaManager schemaManager, DN dn, AttributeType... attributeTypes
)
     {
         if ( dn == null )
         {
@@ -392,7 +388,7 @@ public class DefaultClientEntry implemen
     
     /**
      * <p>
-     * Creates a new instance of DefaultClientEntry, with a 
+     * Creates a new instance of DefaultEntry, with a 
      * DN, an attributeType with the user provided ID, and schema aware. 
      * </p>
      * <p>
@@ -411,7 +407,7 @@ public class DefaultClientEntry implemen
      * @param attributeType The attribute to create, without value.
      * @param upId The User Provided ID fro this AttributeType
      */
-    public DefaultClientEntry( SchemaManager schemaManager, DN dn, AttributeType attributeType,
String upId )
+    public DefaultEntry( SchemaManager schemaManager, DN dn, AttributeType attributeType,
String upId )
     {
         if ( dn == null )
         {
@@ -965,7 +961,7 @@ public class DefaultClientEntry implemen
         try
         {
             // First, clone the structure
-            DefaultClientEntry clone = (DefaultClientEntry)super.clone();
+            DefaultEntry clone = (DefaultEntry)super.clone();
             
             // Just in case ... Should *never* happen
             if ( clone == null )
@@ -2847,12 +2843,12 @@ public class DefaultClientEntry implemen
             return true;
         }
         
-        if ( ! ( o instanceof DefaultClientEntry ) )
+        if ( ! ( o instanceof DefaultEntry ) )
         {
             return false;
         }
         
-        DefaultClientEntry other = (DefaultClientEntry)o;
+        DefaultEntry other = (DefaultEntry)o;
         
         // Both DN must be equal
         if ( dn == null )

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
Wed Apr 28 09:56:36 2010
@@ -20,9 +20,6 @@ package org.apache.directory.shared.ldap
 
 
 import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
Wed Apr 28 09:56:36 2010
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
@@ -59,7 +59,7 @@ public class AddRequestImpl extends Abst
     public AddRequestImpl(final int id)
     {
         super( id, TYPE );
-        entry = new DefaultClientEntry();
+        entry = new DefaultEntry();
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
Wed Apr 28 09:56:36 2010
@@ -34,12 +34,12 @@ import javax.naming.directory.BasicAttri
 import javax.naming.directory.InvalidAttributeIdentifierException;
 
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -1207,7 +1207,7 @@ public class AttributeUtils
         {
             try
             {
-                Entry entry = new DefaultClientEntry( dn );
+                Entry entry = new DefaultEntry( dn );
 
                 for ( NamingEnumeration<? extends Attribute> attrs = attributes.getAll();
attrs.hasMoreElements(); )
                 {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
Wed Apr 28 09:56:36 2010
@@ -41,6 +41,7 @@ import java.util.Set;
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -55,7 +56,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
- * A test class for the DefaultClientEntry class
+ * A test class for the DefaultEntry class
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -76,7 +77,7 @@ public class DefaultClientEntryTest
     {
         try
         {
-            Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+            Entry entry = new DefaultEntry( EXAMPLE_DN );
             
             EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person"
);
             EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
@@ -198,12 +199,12 @@ public class DefaultClientEntryTest
 
 
     /**
-     * Test method for DefaultClientEntry()
+     * Test method for DefaultEntry()
      */
     @Test
     public void testDefaultClientEntry()
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         assertNotNull( entry );
         assertEquals( DN.EMPTY_DN, entry.getDn() );
@@ -212,12 +213,12 @@ public class DefaultClientEntryTest
 
 
     /**
-     * Test method for DefaultClientEntry( DN )
+     * Test method for DefaultEntry( DN )
      */
     @Test
     public void testDefaultClientEntryLdapDN()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
@@ -227,12 +228,12 @@ public class DefaultClientEntryTest
 
 
     /**
-     * Test method for DefaultClientEntry( DN, String... )
+     * Test method for DefaultEntry( DN, String... )
      */
     @Test
     public void testDefaultClientEntryLdapDNStringArray()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN, "ObjectClass", "cn", "sn" );
+        Entry entry = new DefaultEntry( EXAMPLE_DN, "ObjectClass", "cn", "sn" );
         
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
@@ -244,7 +245,7 @@ public class DefaultClientEntryTest
 
         try
         {
-            new DefaultClientEntry( EXAMPLE_DN, "ObjectClass", (String)null, "sn" );
+            new DefaultEntry( EXAMPLE_DN, "ObjectClass", (String)null, "sn" );
             fail();
         }
         catch( IllegalArgumentException iae )
@@ -254,7 +255,7 @@ public class DefaultClientEntryTest
 
         try
         {
-            new DefaultClientEntry( EXAMPLE_DN, "ObjectClass", " ", "sn" );
+            new DefaultEntry( EXAMPLE_DN, "ObjectClass", " ", "sn" );
             fail();
         }
         catch( IllegalArgumentException iae )
@@ -265,7 +266,7 @@ public class DefaultClientEntryTest
 
 
     /**
-     * Test method for DefaultClientEntry( DN, EntryAttribute... )
+     * Test method for DefaultEntry( DN, EntryAttribute... )
      */
     @Test
     public void testDefaultClientEntryLdapDNEntryAttributeArray()
@@ -274,7 +275,7 @@ public class DefaultClientEntryTest
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
         EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2
);
         
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
+        Entry entry = new DefaultEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
         
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
@@ -284,7 +285,7 @@ public class DefaultClientEntryTest
         assertTrue( entry.containsAttribute( "CN" ) );
         assertTrue( entry.containsAttribute( "userPassword" ) );
         
-        entry = new DefaultClientEntry( EXAMPLE_DN, attrOC, attrCN, attrOC );
+        entry = new DefaultEntry( EXAMPLE_DN, attrOC, attrCN, attrOC );
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
         assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -292,7 +293,7 @@ public class DefaultClientEntryTest
         assertTrue( entry.containsAttribute( "OBJECTCLASS" ) );
         assertTrue( entry.containsAttribute( "CN" ) );
         
-        entry = new DefaultClientEntry( EXAMPLE_DN, attrOC, (EntryAttribute)null );
+        entry = new DefaultEntry( EXAMPLE_DN, attrOC, (EntryAttribute)null );
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
         assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -343,7 +344,7 @@ public class DefaultClientEntryTest
     @Test
     public void testAddStringByteArrayArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         entry.add( "userPassword", (byte[])null );
         assertEquals( 1, entry.size() );
@@ -368,7 +369,7 @@ public class DefaultClientEntryTest
     @Test
     public void testAddStringStringArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         entry.add( "cn", (String)null );
         assertEquals( 1, entry.size() );
@@ -393,7 +394,7 @@ public class DefaultClientEntryTest
     @Test
     public void testAddStringValueArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         Value<String> value = new StringValue( (String)null );
         
@@ -437,7 +438,7 @@ public class DefaultClientEntryTest
     @Test
     public void testClear() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertEquals( 0, entry.size() );
         assertNull( entry.get( "ObjectClass" ) );
@@ -461,7 +462,7 @@ public class DefaultClientEntryTest
     @Test
     public void testClone() throws LdapException
     {
-        Entry entry1 = new DefaultClientEntry();
+        Entry entry1 = new DefaultEntry();
         
         Entry entry2 = entry1.clone();
         
@@ -495,7 +496,7 @@ public class DefaultClientEntryTest
     @Test
     public void testContainsEntryAttributeArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person"
);
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
@@ -521,7 +522,7 @@ public class DefaultClientEntryTest
     @Test
     public void testContainsStringByteArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -545,7 +546,7 @@ public class DefaultClientEntryTest
     @Test
     public void testContainsStringStringArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -574,7 +575,7 @@ public class DefaultClientEntryTest
     @Test
     public void testContainsStringValueArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -607,7 +608,7 @@ public class DefaultClientEntryTest
     @Test
     public void testContainsAttribute() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -638,8 +639,8 @@ public class DefaultClientEntryTest
     @Test
     public void testEqualsObject() throws LdapException
     {
-        Entry entry1 = new DefaultClientEntry();
-        Entry entry2 = new DefaultClientEntry();
+        Entry entry1 = new DefaultEntry();
+        Entry entry2 = new DefaultEntry();
         
         assertEquals( entry1, entry2 );
         
@@ -686,7 +687,7 @@ public class DefaultClientEntryTest
     @Test
     public void testGet() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertNull( entry.get( "objectClass" ) );
         
@@ -714,7 +715,7 @@ public class DefaultClientEntryTest
     @Test
     public void testGetDn() throws LdapException 
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertEquals( EXAMPLE_DN, entry.getDn() );
         
@@ -731,8 +732,8 @@ public class DefaultClientEntryTest
     @Test
     public void testHashCode() throws LdapException, LdapException
     {
-        Entry entry1 = new DefaultClientEntry( EXAMPLE_DN );
-        Entry entry2 = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry1 = new DefaultEntry( EXAMPLE_DN );
+        Entry entry2 = new DefaultEntry( EXAMPLE_DN );
         
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
@@ -753,7 +754,7 @@ public class DefaultClientEntryTest
 
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
-        Entry entry3 = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry3 = new DefaultEntry( EXAMPLE_DN );
         entry3.add( attrOC, attrSN, attrCN, attrPWD );
 
         assertEquals( entry1.hashCode(), entry3.hashCode() );
@@ -766,7 +767,7 @@ public class DefaultClientEntryTest
     @Test
     public void testHasObjectClass() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         assertFalse( entry.hasObjectClass( "top" ) );
@@ -818,7 +819,7 @@ public class DefaultClientEntryTest
     @Test
     public void testPutEntryAttributeArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person"
);
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
@@ -849,7 +850,7 @@ public class DefaultClientEntryTest
     @Test
     public void testPutStringByteArrayArray()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         try
         {
@@ -895,7 +896,7 @@ public class DefaultClientEntryTest
     @Test
     public void testPutStringStringArray()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         try
         {
@@ -941,7 +942,7 @@ public class DefaultClientEntryTest
     @Test
     public void testPutStringValueArray()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         Value<String> strValueTop = new StringValue( "top" );
         Value<String> strValuePerson = new StringValue( "person" );
@@ -1021,7 +1022,7 @@ public class DefaultClientEntryTest
     @Test
     public void testRemoveAttributesStringArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person"
);
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
@@ -1049,7 +1050,7 @@ public class DefaultClientEntryTest
     @Test
     public void testRemoveEntryAttributeArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person"
);
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
@@ -1081,7 +1082,7 @@ public class DefaultClientEntryTest
     @Test
     public void testRemoveStringByteArrayArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null,
BYTES2 );
 
@@ -1132,7 +1133,7 @@ public class DefaultClientEntryTest
     @Test
     public void testRemoveStringValueArray() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
 
         EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null
);
         EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2,
(byte[])null );
@@ -1171,7 +1172,7 @@ public class DefaultClientEntryTest
     @Test
     public void testSet() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
 
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1", "test2" );
@@ -1201,7 +1202,7 @@ public class DefaultClientEntryTest
     @Test
     public void testSetDn()
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         assertEquals( DN.EMPTY_DN, entry.getDn() );
         
@@ -1216,7 +1217,7 @@ public class DefaultClientEntryTest
     @Test
     public void testSize() throws LdapException
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertEquals( 0, entry.size() );
         entry.add( "ObjectClass", "top", "person" );
@@ -1231,12 +1232,12 @@ public class DefaultClientEntryTest
 
     
     /**
-     * Test method for for {@link org.apache.directory.shared.ldap.entry.client.DefaultClientEntry#toString()}.
+     * Test method for for {@link org.apache.directory.shared.ldap.entry.DefaultEntry#toString()}.
      */
     @Test
     public void testToString()
     {
-        Entry entry = new DefaultClientEntry( EXAMPLE_DN );
+        Entry entry = new DefaultEntry( EXAMPLE_DN );
         
         assertEquals( "Entry\n    dn: dc=example,dc=com\n", entry.toString() );
         
@@ -1276,7 +1277,7 @@ public class DefaultClientEntryTest
         dn.normalize( oids );
         
         byte[] password = StringTools.getBytesUtf8( "secret" );
-        Entry entry = new DefaultClientEntry( dn);
+        Entry entry = new DefaultEntry( dn);
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1" );
         entry.add( "userPassword", password );
@@ -1294,7 +1295,7 @@ public class DefaultClientEntryTest
     public void testSerializeEntryWithNoDN() throws LdapException, IOException, ClassNotFoundException
     {
         byte[] password = StringTools.getBytesUtf8( "secret" );
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1" );
         entry.add( "userPassword", password );
@@ -1311,7 +1312,7 @@ public class DefaultClientEntryTest
     @Test
     public void testSerializeEntryWithNoDNNoAttribute() throws LdapException, IOException,
ClassNotFoundException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
 
         Entry entrySer = deserializeValue( serializeValue( entry ) );
         
@@ -1329,7 +1330,7 @@ public class DefaultClientEntryTest
         
         dn.normalize( oids );
         
-        Entry entry = new DefaultClientEntry( dn );
+        Entry entry = new DefaultEntry( dn );
 
         Entry entrySer = deserializeValue( serializeValue( entry ) );
         

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
Wed Apr 28 09:56:36 2010
@@ -27,10 +27,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
@@ -73,7 +73,7 @@ public class AddRequestImplTest
      */
     private Entry getEntry()
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         try
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
Wed Apr 28 09:56:36 2010
@@ -20,10 +20,10 @@
 package org.apache.directory.shared.ldap.message;
 
 
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
 import org.apache.directory.shared.ldap.name.DN;
@@ -64,7 +64,7 @@ public class SearchResponseEntryImplTest
      */
     private Entry getEntry() throws LdapException
     {
-        Entry attrs = new DefaultClientEntry();
+        Entry attrs = new DefaultEntry();
         attrs.put( getEntry( "attr0" ) );
         attrs.put( getEntry( "attr1" ) );
         attrs.put( getEntry( "attr2" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java
Wed Apr 28 09:56:36 2010
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTru
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -34,7 +35,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.junit.Test;
 
@@ -52,7 +52,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyAddModificationToEmptyEntry() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
attr );
         AttributeUtils.applyModification( entry, modification );
@@ -68,7 +68,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyAddModificationToEntry() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.add( "dc", "apache" );
         assertEquals( 1, entry.size() );
 
@@ -89,7 +89,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyAddModificationToEntryWithValues() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put( "cn", "apache" );
         assertEquals( 1, entry.size() );
 
@@ -127,7 +127,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyAddModificationToEntryWithSameValue() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put( "cn", "test", "apache" );
         assertEquals( 1, entry.size() );
 
@@ -164,7 +164,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyRemoveModificationFromEmptyEntry() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
 
         EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
 
@@ -181,7 +181,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyRemoveModificationFromEntryAttributeNotPresent() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
 
         EntryAttribute dc = new DefaultEntryAttribute( "dc", "apache" );
         entry.put( dc );
@@ -206,7 +206,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyRemoveModificationFromEntryAttributeNotSameValue() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
 
         EntryAttribute cn = new DefaultEntryAttribute( "cn", "apache" );
         entry.put( cn );
@@ -231,7 +231,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyRemoveModificationFromEntrySameAttributeSameValue() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put( "cn", "test" );
         
         EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
@@ -254,7 +254,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyRemoveModificationFromEntrySameAttributeValues() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put( "cn", "test", "apache" );
         
         EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
@@ -291,7 +291,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyModifyModificationFromEmptyEntry() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
 
@@ -313,7 +313,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyModifyEmptyModificationFromEmptyEntry() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         
         EntryAttribute attr = new DefaultEntryAttribute( "cn" );
 
@@ -334,7 +334,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyModifyAttributeModification() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put( "cn", "test" );
         entry.put( "ou", "apache", "acme corp" );
         
@@ -378,7 +378,7 @@ public class AttributeUtilsTest
     @Test
     public void testApplyModifyModificationRemoveAttribute() throws LdapException
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         entry.put(  "cn", "test" );
         entry.put( "ou", "apache", "acme corp" );
         



Mime
View raw message