directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r928945 [2/3] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/trunk/core-entry/src/main/java...
Date Mon, 29 Mar 2010 23:59:51 GMT
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Mon Mar 29 23:59:49 2010
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -129,7 +129,7 @@ public class RefinementEvaluatorTest
 
         try
         {
-            assertFalse( evaluator.evaluate( new EqualityNode( "", new ClientStringValue( "" ) ), null ) );
+            assertFalse( evaluator.evaluate( new EqualityNode( "", new StringValue( "" ) ), null ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -138,7 +138,7 @@ public class RefinementEvaluatorTest
 
         try
         {
-            assertFalse( evaluator.evaluate( new EqualityNode( "", new ClientStringValue( "" ) ), new DefaultServerAttribute( "cn", CN ) ) );
+            assertFalse( evaluator.evaluate( new EqualityNode( "", new StringValue( "" ) ), new DefaultServerAttribute( "cn", CN ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -154,17 +154,17 @@ public class RefinementEvaluatorTest
 
         // positive test
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         // negative tests
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "blah" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "blah" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "blah" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
     }
 
 
@@ -174,17 +174,17 @@ public class RefinementEvaluatorTest
         EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         
         // positive test
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         // negative tests
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.5" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "blah" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.5" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
     }
 
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Mon Mar 29 23:59:49 2010
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -127,7 +127,7 @@ public class RefinementLeafEvaluatorTest
 
         try
         {
-            assertFalse( evaluator.evaluate( new GreaterEqNode( "", new ClientStringValue( "" ) ), objectClasses ) );
+            assertFalse( evaluator.evaluate( new GreaterEqNode( "", new StringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an NE" );
         }
         catch ( LdapException ne )
@@ -136,7 +136,7 @@ public class RefinementLeafEvaluatorTest
 
         try
         {
-            assertFalse( evaluator.evaluate( new EqualityNode( "", new ClientStringValue( "" ) ), objectClasses ) );
+            assertFalse( evaluator.evaluate( new EqualityNode( "", new StringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an NE" );
         }
         catch ( LdapException ne )
@@ -145,7 +145,7 @@ public class RefinementLeafEvaluatorTest
 
         try
         {
-            assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "" ) ), objectClasses ) );
+            assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -155,7 +155,7 @@ public class RefinementLeafEvaluatorTest
         try
         {
             objectClasses = new DefaultServerAttribute( "cn", OBJECT_CLASS );
-            assertFalse( evaluator.evaluate( new EqualityNode( "cn", new ClientStringValue( "" ) ), objectClasses ) );
+            assertFalse( evaluator.evaluate( new EqualityNode( "cn", new StringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -170,19 +170,19 @@ public class RefinementLeafEvaluatorTest
     {
         // positive test
         EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         // negative tests
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "blah" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "blah" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "blah" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
     }
 
 
@@ -192,18 +192,18 @@ public class RefinementLeafEvaluatorTest
         EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
 
         // positive test
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
-        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );
+        assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         // negative tests
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.5" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "blah" );
-        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.5" ) ), objectClasses ) );
+        assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
     }
 }

Modified: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Mon Mar 29 23:59:49 2010
@@ -68,7 +68,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
@@ -155,7 +155,7 @@ public class ConfigPartitionReader
      */
     public LdapServer getLdapServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue( "ads-ldapServer" ) );
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue( "ads-ldapServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
@@ -194,7 +194,7 @@ public class ConfigPartitionReader
 
     public KdcServer getKdcServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue(
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue(
             "ads-kerberosServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -337,7 +337,7 @@ public class ConfigPartitionReader
 
     public DnsServer getDnsServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue( "ads-dnsServer" ) );
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue( "ads-dnsServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
@@ -378,7 +378,7 @@ public class ConfigPartitionReader
     //TODO making this method invisible cause there is no DhcpServer exists as of now
     private DhcpService getDhcpServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue( "ads-dhcpServer" ) );
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue( "ads-dhcpServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
@@ -412,7 +412,7 @@ public class ConfigPartitionReader
 
     public NtpServer getNtpServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue( "ads-ntpServer" ) );
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue( "ads-ntpServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
@@ -452,7 +452,7 @@ public class ConfigPartitionReader
 
     public HttpServer getHttpServer() throws Exception
     {
-        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new ClientStringValue( "ads-httpServer" ) );
+        EqualityNode<String> filter = new EqualityNode<String>( "objectClass", new StringValue( "ads-httpServer" ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Mon Mar 29 23:59:49 2010
@@ -61,7 +61,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -243,9 +243,9 @@ public class KeyDerivationInterceptor ex
                 Object firstValue = attr.get();
                 String password = null;
 
-                if ( firstValue instanceof ClientStringValue )
+                if ( firstValue instanceof StringValue )
                 {
-                    password = ((ClientStringValue)firstValue).getString();
+                    password = ((StringValue)firstValue).getString();
                     log.debug( "{} Attribute id : 'userPassword',  Values : [ '{}' ]", operation, password );
                 }
                 else if ( firstValue instanceof BinaryValue )

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Mon Mar 29 23:59:49 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
@@ -93,7 +93,7 @@ public class PasswordPolicyInterceptor e
 
             if ( entry.get( SchemaConstants.CN_AT ) != null )
             {
-                ClientStringValue attr = (ClientStringValue)entry.get( SchemaConstants.CN_AT ).get();
+                StringValue attr = (StringValue)entry.get( SchemaConstants.CN_AT ).get();
                 username = attr.getString();
             }
 
@@ -146,10 +146,10 @@ public class PasswordPolicyInterceptor e
 
                 if ( userPassword != null )
                 {
-                    if ( userPassword instanceof ClientStringValue )
+                    if ( userPassword instanceof StringValue )
                     {
                         log.debug( "{} Attribute id : 'userPassword',  Values : [ '{}' ]", operation, attr );
-                        pwd = ((ClientStringValue)userPassword).getString();
+                        pwd = ((StringValue)userPassword).getString();
                     }
                     else if ( userPassword instanceof BinaryValue )
                     {

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Mon Mar 29 23:59:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
 import org.apache.directory.server.kerberos.shared.messages.value.SamType;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 
@@ -286,7 +286,7 @@ public class PrincipalStoreEntryModifier
 
         for ( Value<?> val : krb5key )
         {
-            if ( val instanceof ClientStringValue )
+            if ( val instanceof StringValue )
             {
                 throw new IllegalStateException( I18n.err( I18n.ERR_626 ) );
             }

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Mon Mar 29 23:59:49 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -105,7 +105,7 @@ public class StoreUtils
     private static ExprNode getFilter( SchemaManager schemaManager, String principal ) throws Exception
     {
         AttributeType type = schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
-        Value<String> value = new ClientStringValue( type, principal );
+        Value<String> value = new StringValue( type, principal );
         return new EqualityNode<String>( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, value );
     }
     

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Mon Mar 29 23:59:49 2010
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -103,7 +103,7 @@ public class SearchHandler extends Refer
         }
         
         EqualityNode<String> ocIsReferral = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT,
-            new ClientStringValue( objectClassAttributeType, SchemaConstants.REFERRAL_OC ) );
+            new StringValue( objectClassAttributeType, SchemaConstants.REFERRAL_OC ) );
         
         return ocIsReferral;
     }

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java Mon Mar 29 23:59:49 2010
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -143,7 +143,7 @@ public class FilterNormalizingVisitor im
 
             if ( attributeType.getSyntax().isHumanReadable() )
             {
-                normalized = new ClientStringValue( ( String ) ncn.normalizeByName( attribute, value.getString() ) );
+                normalized = new StringValue( ( String ) ncn.normalizeByName( attribute, value.getString() ) );
             }
             else
             {
@@ -245,7 +245,7 @@ public class FilterNormalizingVisitor im
 
         if ( node.getInitial() != null )
         {
-            normInitial = normalizeValue( node.getAttribute(), new ClientStringValue( node.getInitial() ) );
+            normInitial = normalizeValue( node.getAttribute(), new StringValue( node.getInitial() ) );
 
             if ( normInitial == null )
             {
@@ -261,7 +261,7 @@ public class FilterNormalizingVisitor im
 
             for ( String any : node.getAny() )
             {
-                Value<?> normAny = normalizeValue( node.getAttribute(), new ClientStringValue( any ) );
+                Value<?> normAny = normalizeValue( node.getAttribute(), new StringValue( any ) );
 
                 if ( normAny != null )
                 {
@@ -279,7 +279,7 @@ public class FilterNormalizingVisitor im
 
         if ( node.getFinal() != null )
         {
-            normFinal = normalizeValue( node.getAttribute(), new ClientStringValue( node.getFinal() ) );
+            normFinal = normalizeValue( node.getAttribute(), new StringValue( node.getFinal() ) );
 
             if ( normFinal == null )
             {

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Mon Mar 29 23:59:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
@@ -163,7 +163,7 @@ public class GreaterEqTest
     public void testCursorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
@@ -400,7 +400,7 @@ public class GreaterEqTest
     public void testCursorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
@@ -574,7 +574,7 @@ public class GreaterEqTest
     public void testEvaluatorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
         assertEquals( node, evaluator.getExpression() );
@@ -619,7 +619,7 @@ public class GreaterEqTest
     public void testEvaluatorWithDescendantValue() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.STREET_AT_OID, new ClientStringValue( at, "2" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.STREET_AT_OID, new StringValue( at, "2" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
         assertEquals( node, evaluator.getExpression() );
@@ -647,7 +647,7 @@ public class GreaterEqTest
     public void testEvaluatorWithoutDescendants() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new ClientStringValue( at, "2" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new StringValue( at, "2" ) );
 
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -665,7 +665,7 @@ public class GreaterEqTest
     public void testEvaluatorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
-        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
 
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -721,7 +721,7 @@ public class GreaterEqTest
 
         try
         {
-            GreaterEqNode node = new GreaterEqNode( at.getOid(), new ClientStringValue( at, "3" ) );
+            GreaterEqNode node = new GreaterEqNode( at.getOid(), new StringValue( at, "3" ) );
             new GreaterEqEvaluator( node, store, schemaManager );
         }
         finally
@@ -759,7 +759,7 @@ public class GreaterEqTest
         desc.setObsolete( false );
         //schemaManager.register( at.getSyntax().getSyntaxChecker() );
 
-        GreaterEqNode node = new GreaterEqNode( at.getOid(), new ClientStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( at.getOid(), new StringValue( at, "3" ) );
         new GreaterEqEvaluator( node, store, schemaManager );
         schemaManager.delete( at );
     }

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Mon Mar 29 23:59:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
@@ -163,7 +163,7 @@ public class LessEqTest
     public void testCursorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
@@ -420,7 +420,7 @@ public class LessEqTest
     public void testCursorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
@@ -614,7 +614,7 @@ public class LessEqTest
     public void testEvaluatorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -660,7 +660,7 @@ public class LessEqTest
     public void testEvaluatorWithDescendantValue() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.STREET_AT_OID, new ClientStringValue( at, "2" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.STREET_AT_OID, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -689,7 +689,7 @@ public class LessEqTest
     public void testEvaluatorWithoutDescendants() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new ClientStringValue( at, "2" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -707,7 +707,7 @@ public class LessEqTest
     public void testEvaluatorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
-        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
@@ -763,7 +763,7 @@ public class LessEqTest
 
         try
         {
-            LessEqNode node = new LessEqNode( at.getOid(), new ClientStringValue( at, "3" ) );
+            LessEqNode node = new LessEqNode( at.getOid(), new StringValue( at, "3" ) );
 
             new LessEqEvaluator( node, store, schemaManager );
         }
@@ -802,7 +802,7 @@ public class LessEqTest
         desc.setNames( names );
         desc.setObsolete( false );
 
-        LessEqNode node = new LessEqNode( at.getOid(), new ClientStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( at.getOid(), new StringValue( at, "3" ) );
         new LessEqEvaluator( node, store, schemaManager );
         schemaManager.delete( at );
     }

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Mon Mar 29 23:59:49 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -161,7 +161,7 @@ public class LdapConnectionTest extends 
         
         String uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ).getString();
         
-        EqualityNode<String> filter = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, new ClientStringValue( uuid ) );
+        EqualityNode<String> filter = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, new StringValue( uuid ) );
         
         Cursor<SearchResponse> cursor = connection.search( ADMIN_DN, filter.toString(), SearchScope.SUBTREE, "+" );
         cursor.next();

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Mon Mar 29 23:59:49 2010
@@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -2485,7 +2485,7 @@ public class Dsmlv2Grammar extends Abstr
                     }
                     else
                     {
-                        Value<String> value = new ClientStringValue( nextText.trim() );
+                        Value<String> value = new StringValue( nextText.trim() );
                         assertion.setAssertionValue( value );
                     }
                 }
@@ -2624,7 +2624,7 @@ public class Dsmlv2Grammar extends Abstr
                     else
                     {
                         filter.setMatchValue( 
-                            new ClientStringValue( nextText.trim() ) );
+                            new StringValue( nextText.trim() ) );
                     }
                 }
             }

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Mon Mar 29 23:59:49 2010
@@ -29,7 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -223,7 +223,7 @@ public class LdifEntry implements Clonea
             
             if ( value == null )
             {
-                value = new ClientStringValue( (String)null );
+                value = new StringValue( (String)null );
                 attr = new DefaultClientAttribute( id, (Value<?>)value );
             }
             else

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Mon Mar 29 23:59:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -98,11 +98,11 @@ public class InitAssertionValueFilterAct
         {
             if ( tlv.getLength() != 0 )
             {
-                assertionValue = new ClientStringValue( StringTools.utf8ToString( tlv.getValue().getData() ) );
+                assertionValue = new StringValue( StringTools.utf8ToString( tlv.getValue().getData() ) );
             }
             else
             {
-                assertionValue = new ClientStringValue( "" );
+                assertionValue = new StringValue( "" );
             }
             
             assertion.setAssertionValue(assertionValue );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerAttribute.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerAttribute.java Mon Mar 29 23:59:49 2010
@@ -89,11 +89,11 @@ public final class DefaultServerAttribut
                 Value<?> serverValue = null; 
 
                 // We have to convert the value first
-                if ( clientValue instanceof ClientStringValue )
+                if ( clientValue instanceof StringValue )
                 {
                     if ( isHR )
                     {
-                        serverValue = new ClientStringValue( attributeType, clientValue.getString() );
+                        serverValue = new StringValue( attributeType, clientValue.getString() );
                     }
                     else
                     {
@@ -107,7 +107,7 @@ public final class DefaultServerAttribut
                     if ( isHR )
                     {
                         // We have to convert the value to a String value first
-                        serverValue = new ClientStringValue( attributeType, 
+                        serverValue = new StringValue( attributeType, 
                             clientValue.getString() );
                     }
                     else
@@ -357,7 +357,7 @@ public final class DefaultServerAttribut
             
             for ( String val:vals )
             {
-                Value<String> newValue = new ClientStringValue( attributeType, val );
+                Value<String> newValue = new StringValue( attributeType, val );
                 
                 if ( add( newValue ) != 0 )
                 {
@@ -394,16 +394,16 @@ public final class DefaultServerAttribut
             {
                 if ( ( val == null ) || val.isNull() )
                 {
-                    Value<String> nullSV = new ClientStringValue( attributeType, (String)null );
+                    Value<String> nullSV = new StringValue( attributeType, (String)null );
                     
                     if ( values.add( nullSV ) )
                     {
                         nbAdded++;
                     }
                 }
-                else if ( val instanceof ClientStringValue )
+                else if ( val instanceof StringValue )
                 {
-                    ClientStringValue stringValue = (ClientStringValue)val;
+                    StringValue stringValue = (StringValue)val;
                     
                     if ( stringValue.getAttributeType() == null )
                     {
@@ -539,7 +539,7 @@ public final class DefaultServerAttribut
             // don't find one in the values
             for ( String val:vals )
             {
-                ClientStringValue value = new ClientStringValue( attributeType, val );
+                StringValue value = new StringValue( attributeType, val );
                 
                 if ( !values.contains( value ) )
                 {
@@ -577,9 +577,9 @@ public final class DefaultServerAttribut
         {
             for ( Value<?> val:vals )
             {
-                if ( val instanceof ClientStringValue )
+                if ( val instanceof StringValue )
                 {
-                    ClientStringValue stringValue = (ClientStringValue)val;
+                    StringValue stringValue = (StringValue)val;
                     
                     if ( stringValue.getAttributeType() == null )
                     {
@@ -700,7 +700,7 @@ public final class DefaultServerAttribut
         
         for ( String val:vals )
         {
-            ClientStringValue value = new ClientStringValue( attributeType, val );
+            StringValue value = new StringValue( attributeType, val );
             removed &= values.remove( value );
         }
         
@@ -724,9 +724,9 @@ public final class DefaultServerAttribut
         {
             for ( Value<?> val:vals )
             {
-                if ( val instanceof ClientStringValue )
+                if ( val instanceof StringValue )
                 {
-                    ClientStringValue stringValue = (ClientStringValue)val;
+                    StringValue stringValue = (StringValue)val;
                     
                     if ( stringValue.getAttributeType() == null )
                     {
@@ -965,9 +965,9 @@ public final class DefaultServerAttribut
             for ( Value<?> value:values )
             {
                 // Write the value, using the correct method
-                if ( value instanceof ClientStringValue )
+                if ( value instanceof StringValue )
                 {
-                    ((ClientStringValue)value).serialize( out );
+                    ((StringValue)value).serialize( out );
                 }
                 else
                 {
@@ -1018,8 +1018,8 @@ public final class DefaultServerAttribut
                 
                 if ( isHR )
                 {
-                    value  = new ClientStringValue( attributeType );
-                    ((ClientStringValue)value).deserialize( in );
+                    value  = new StringValue( attributeType );
+                    ((StringValue)value).deserialize( in );
                 }
                 else
                 {

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java (from r928943, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ClientStringValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ClientStringValue.java&r1=928943&r2=928945&rev=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ClientStringValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java Mon Mar 29 23:59:49 2010
@@ -46,13 +46,13 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ClientStringValue extends AbstractValue<String>
+public class StringValue extends AbstractValue<String>
 {
     /** Used for serialization */
     private static final long serialVersionUID = 2L;
     
     /** logger for reporting errors that might not be handled properly upstream */
-    protected static final Logger LOG = LoggerFactory.getLogger( ClientStringValue.class );
+    protected static final Logger LOG = LoggerFactory.getLogger( StringValue.class );
 
     /** reference to the attributeType which is not serialized */
     protected transient AttributeType attributeType;
@@ -62,9 +62,9 @@ public class ClientStringValue extends A
     // Constructors
     // -----------------------------------------------------------------------
     /**
-     * Creates a ClientStringValue without an initial wrapped value.
+     * Creates a StringValue without an initial wrapped value.
      */
-    public ClientStringValue()
+    public StringValue()
     {
         normalized = false;
         valid = null;
@@ -72,11 +72,11 @@ public class ClientStringValue extends A
 
 
     /**
-     * Creates a ClientStringValue without an initial wrapped value.
+     * Creates a StringValue without an initial wrapped value.
      *
-     * @param attributeType the schema type associated with this ClientStringValue
+     * @param attributeType the schema type associated with this StringValue
      */
-    public ClientStringValue( AttributeType attributeType )
+    public StringValue( AttributeType attributeType )
     {
         if ( attributeType == null )
         {
@@ -99,11 +99,11 @@ public class ClientStringValue extends A
 
 
     /**
-     * Creates a ClientStringValue with an initial wrapped String value.
+     * Creates a StringValue with an initial wrapped String value.
      *
      * @param wrapped the value to wrap which can be null
      */
-    public ClientStringValue( String wrapped )
+    public StringValue( String wrapped )
     {
         this.wrapped = wrapped;
         normalized = false;
@@ -112,12 +112,12 @@ public class ClientStringValue extends A
 
 
     /**
-     * Creates a ClientStringValue with an initial wrapped String value.
+     * Creates a StringValue with an initial wrapped String value.
      *
-     * @param attributeType the schema type associated with this ClientStringValue
+     * @param attributeType the schema type associated with this StringValue
      * @param wrapped the value to wrap which can be null
      */
-    public ClientStringValue( AttributeType attributeType, String wrapped )
+    public StringValue( AttributeType attributeType, String wrapped )
     {
         this( attributeType );
         this.wrapped = wrapped;
@@ -125,14 +125,14 @@ public class ClientStringValue extends A
 
 
     /**
-     * Creates a ClientStringValue with an initial wrapped String value and
+     * Creates a StringValue with an initial wrapped String value and
      * a normalized value.
      *
-     * @param attributeType the schema type associated with this ClientStringValue
+     * @param attributeType the schema type associated with this StringValue
      * @param wrapped the value to wrap which can be null
      * @param normalizedValue the normalized value
      */
-    /** No protection */ ClientStringValue( AttributeType attributeType, String wrapped, String normalizedValue, boolean valid )
+    StringValue( AttributeType attributeType, String wrapped, String normalizedValue, boolean valid )
     {
         this( wrapped );
         this.normalized = true;
@@ -341,14 +341,14 @@ public class ClientStringValue extends A
             return 1;
         }
 
-        if ( !( value instanceof ClientStringValue ) )
+        if ( !( value instanceof StringValue ) )
         {
             String message = I18n.err( I18n.ERR_04128, toString(), value.getClass() );
             LOG.error( message );
             throw new NotImplementedException( message );
         }
         
-        ClientStringValue stringValue = ( ClientStringValue ) value;
+        StringValue stringValue = ( StringValue ) value;
         
         if ( attributeType != null )
         {
@@ -392,9 +392,9 @@ public class ClientStringValue extends A
      * 
      * @return a copy of the current value
      */
-    public ClientStringValue clone()
+    public StringValue clone()
     {
-        return (ClientStringValue)super.clone();
+        return (StringValue)super.clone();
     }
 
 
@@ -450,7 +450,7 @@ public class ClientStringValue extends A
     /**
      * @see Object#equals(Object)
      * 
-     * Two ClientStringValue are equals if their normalized values are equal
+     * Two StringValue are equals if their normalized values are equal
      */
     public boolean equals( Object obj )
     {
@@ -459,12 +459,12 @@ public class ClientStringValue extends A
             return true;
         }
 
-        if ( ! ( obj instanceof ClientStringValue ) )
+        if ( ! ( obj instanceof StringValue ) )
         {
             return false;
         }
 
-        ClientStringValue other = ( ClientStringValue ) obj;
+        StringValue other = ( StringValue ) obj;
         
         if ( this.isNull() )
         {
@@ -881,7 +881,7 @@ public class ClientStringValue extends A
 
     
     /**
-     * Deserialize a ClientStringValue. 
+     * Deserialize a StringValue. 
      *
      * @param in the buffer containing the bytes with the serialized value
      * @throws IOException 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java Mon Mar 29 23:59:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -110,13 +110,13 @@ public class DefaultClientAttribute impl
         // The value can be null, this is a valid value.
         if ( vals[0] == null )
         {
-             add( new ClientStringValue() );
+             add( new StringValue() );
         }
         else
         {
             for ( Value<?> val:vals )
             {
-                if ( ( val instanceof ClientStringValue ) || ( val.isBinary() ) )
+                if ( ( val instanceof StringValue ) || ( val.isBinary() ) )
                 {
                     add( val );
                 }
@@ -198,7 +198,7 @@ public class DefaultClientAttribute impl
     {
         Value<?> value = get();
         
-        if ( value instanceof ClientStringValue )
+        if ( value instanceof StringValue )
         {
             return value.getString();
         }
@@ -495,7 +495,7 @@ public class DefaultClientAttribute impl
     {
         int nbAdded = 0;
         BinaryValue nullBinaryValue = null;
-        ClientStringValue nullStringValue = null;
+        StringValue nullStringValue = null;
         boolean nullValueAdded = false;
         
         for ( Value<?> val:vals )
@@ -512,7 +512,7 @@ public class DefaultClientAttribute impl
                     // We have to do that because we are using a Set,
                     // and we can't remove the first element of the Set.
                     nullBinaryValue = new BinaryValue( (byte[])null );
-                    nullStringValue = new ClientStringValue( (String)null );
+                    nullStringValue = new StringValue( (String)null );
                     
                     values.add( nullBinaryValue );
                     values.add( nullStringValue );
@@ -535,7 +535,7 @@ public class DefaultClientAttribute impl
                 else
                 {
                     // The attribute is HR
-                    nullStringValue = new ClientStringValue( (String)null );
+                    nullStringValue = new StringValue( (String)null );
                     
                     // Don't add a value if it already exists. 
                     if ( !values.contains( nullStringValue ) )
@@ -547,7 +547,7 @@ public class DefaultClientAttribute impl
             else
             {
                 // Let's check the value type. 
-                if ( val instanceof ClientStringValue )
+                if ( val instanceof StringValue )
                 {
                     // We have a String value
                     if ( isHR == null )
@@ -603,7 +603,7 @@ public class DefaultClientAttribute impl
                     {
                         // The attribute Type is HR, convert the
                         // value to a StringValue
-                        ClientStringValue csv = new ClientStringValue();
+                        StringValue csv = new StringValue();
                         csv.set( val.getString() );
                         
                         if ( !contains( csv ) )
@@ -659,7 +659,7 @@ public class DefaultClientAttribute impl
                 // Call the add(Value) method, if not already present
                 if ( !contains( val ) )
                 {
-                    if ( add( new ClientStringValue( val ) ) == 1 )
+                    if ( add( new StringValue( val ) ) == 1 )
                     {
                         nbAdded++;
                     }
@@ -745,7 +745,7 @@ public class DefaultClientAttribute impl
                 // Now call the add(Value) method, if not already present
                 if ( !contains( val ) )
                 {
-                    if ( add( new ClientStringValue( valString ) ) == 1 )
+                    if ( add( new StringValue( valString ) ) == 1 )
                     {
                         nbAdded++;
                     }
@@ -803,7 +803,7 @@ public class DefaultClientAttribute impl
             // contained in the object
             for ( Value<?> val:vals )
             {
-                if ( val instanceof ClientStringValue )
+                if ( val instanceof StringValue )
                 {
                     if ( !values.contains( val ) )
                     {
@@ -815,7 +815,7 @@ public class DefaultClientAttribute impl
                     byte[] binaryVal = val.getBytes();
                     
                     // We have to convert the binary value to a String
-                    if ( ! values.contains( new ClientStringValue( StringTools.utf8ToString( binaryVal ) ) ) )
+                    if ( ! values.contains( new StringValue( StringTools.utf8ToString( binaryVal ) ) ) )
                     {
                         return false;
                     }
@@ -878,7 +878,7 @@ public class DefaultClientAttribute impl
             // don't find one in the values
             for ( String val:vals )
             {
-                if ( !contains( new ClientStringValue( val ) ) )
+                if ( !contains( new StringValue( val ) ) )
                 {
                     return false;
                 }
@@ -946,7 +946,7 @@ public class DefaultClientAttribute impl
             {
                 String stringVal = StringTools.utf8ToString( val );
 
-                if ( !contains( new ClientStringValue( stringVal ) ) )
+                if ( !contains( new StringValue( stringVal ) ) )
                 {
                     return false;
                 }
@@ -1140,7 +1140,7 @@ public class DefaultClientAttribute impl
         {
             for ( Value<?> val:vals )
             {
-                if ( val instanceof ClientStringValue )
+                if ( val instanceof StringValue )
                 {
                     removed &= values.remove( val );
                 }
@@ -1148,7 +1148,7 @@ public class DefaultClientAttribute impl
                 {
                     // Convert the binary value to a string value
                     byte[] binaryVal = val.getBytes();
-                    removed &= values.remove( new ClientStringValue( StringTools.utf8ToString( binaryVal ) ) );
+                    removed &= values.remove( new StringValue( StringTools.utf8ToString( binaryVal ) ) );
                 }
             }
         }
@@ -1204,7 +1204,7 @@ public class DefaultClientAttribute impl
             // to String before removing them
             for ( byte[] val:vals )
             {
-                ClientStringValue value = new ClientStringValue( StringTools.utf8ToString( val ) );
+                StringValue value = new StringValue( StringTools.utf8ToString( val ) );
                 removed &= values.remove( value );
             }
         }
@@ -1241,7 +1241,7 @@ public class DefaultClientAttribute impl
             // The attribute type is HR, we can directly process the values
             for ( String val:vals )
             {
-                ClientStringValue value = new ClientStringValue( val );
+                StringValue value = new StringValue( val );
                 removed &= values.remove( value );
             }
         }
@@ -1449,9 +1449,9 @@ public class DefaultClientAttribute impl
         {
             Value<?> clientValue = null;
             
-            if ( value instanceof ClientStringValue )
+            if ( value instanceof StringValue )
             {
-                clientValue = new ClientStringValue( value.getString() );
+                clientValue = new StringValue( value.getString() );
             }
             else
             {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java Mon Mar 29 23:59:49 2010
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 
 
@@ -202,10 +202,10 @@ public abstract class AbstractExprNode i
                 }
             }
             
-            return new ClientStringValue( sb.toString() );
+            return new StringValue( sb.toString() );
         }
 
-        val = ( ( ClientStringValue ) value ).getString();
+        val = ( ( StringValue ) value ).getString();
         
         for ( int i = 0; i < val.length(); i++ )
         {
@@ -250,7 +250,7 @@ public abstract class AbstractExprNode i
             }
         }
 
-        return ( sb == null ? value : new ClientStringValue( sb.toString() ) );
+        return ( sb == null ? value : new StringValue( sb.toString() ) );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java Mon Mar 29 23:59:49 2010
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -288,7 +288,7 @@ public class SubstringNode extends LeafN
 
         if ( null != initialPattern )
         {
-            buf.append( AbstractExprNode.escapeFilterValue( new ClientStringValue( initialPattern ) ) ).append( '*' );
+            buf.append( AbstractExprNode.escapeFilterValue( new StringValue( initialPattern ) ) ).append( '*' );
         }
         else
         {
@@ -299,14 +299,14 @@ public class SubstringNode extends LeafN
         {
             for ( String any:anyPattern )
             {
-                buf.append( AbstractExprNode.escapeFilterValue( new ClientStringValue( any ) ) );
+                buf.append( AbstractExprNode.escapeFilterValue( new StringValue( any ) ) );
                 buf.append( '*' );
             }
         }
 
         if ( null != finalPattern )
         {
-            buf.append( AbstractExprNode.escapeFilterValue( new ClientStringValue( finalPattern ) ) );
+            buf.append( AbstractExprNode.escapeFilterValue( new StringValue( finalPattern ) ) );
         }
 
         buf.append( super.toString() );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Mon Mar 29 23:59:49 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
@@ -118,7 +118,7 @@ public class CompareRequestImpl extends 
      */
     public void setAssertionValue( String attrVal )
     {
-        this.attrVal = new ClientStringValue( attrVal );
+        this.attrVal = new StringValue( attrVal );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java Mon Mar 29 23:59:49 2010
@@ -28,7 +28,7 @@ import java.util.Arrays;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -125,7 +125,7 @@ public class AVA implements Cloneable, C
      */
     public AVA( String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
     {
-        this( upType, normType, new ClientStringValue( upValue ), new ClientStringValue( normValue ) );
+        this( upType, normType, new StringValue( upValue ), new StringValue( normValue ) );
     }
 
 
@@ -437,11 +437,11 @@ public class AVA implements Cloneable, C
 
         if ( StringTools.isEmpty( newValue ) )
         {
-            this.normValue = new ClientStringValue( "" );
+            this.normValue = new StringValue( "" );
         }
         else
         {
-            this.normValue = new ClientStringValue( newValue );
+            this.normValue = new StringValue( newValue );
         }
 
         upName = upName.substring( 0, upName.indexOf( '=' ) + 1 ) + value;
@@ -900,8 +900,8 @@ public class AVA implements Cloneable, C
         
         if ( isHR )
         {
-            upValue = new ClientStringValue( in.readUTF() );
-            normValue = new ClientStringValue( in.readUTF() );
+            upValue = new StringValue( in.readUTF() );
+            normValue = new StringValue( in.readUTF() );
         }
         else
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java Mon Mar 29 23:59:49 2010
@@ -24,7 +24,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
 import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -164,8 +164,8 @@ public class AVASerializer
         {
             if ( isHR )
             {
-                Value<String> upValue = new ClientStringValue( in.readUTF() );
-                Value<String> normValue = new ClientStringValue( in.readUTF() );
+                Value<String> upValue = new StringValue( in.readUTF() );
+                Value<String> normValue = new StringValue( in.readUTF() );
                 
                 AVA atav = 
                     new AVA( upType, normType, upValue, normValue, upName );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java Mon Mar 29 23:59:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.util.List;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -178,8 +178,8 @@ public enum FastDnParser
 
         String upName = name.substring( rdnStart, pos.start );
 
-        AVA ava = new AVA( type, type, new ClientStringValue( upValue ),
-            new ClientStringValue( value ), upName );
+        AVA ava = new AVA( type, type, new StringValue( upValue ),
+            new StringValue( value ), upName );
         rdn.addAttributeTypeAndValue( ava );
 
         rdn.setUpName( upName );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java Mon Mar 29 23:59:49 2010
@@ -33,7 +33,7 @@ import java.util.TreeSet;
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.collections.map.MultiValueMap;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -242,7 +242,7 @@ public class RDN implements Cloneable, C
      */
     public RDN( String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
     {
-        addAttributeTypeAndValue( upType, normType, new ClientStringValue( upValue ), new ClientStringValue( normValue ) );
+        addAttributeTypeAndValue( upType, normType, new StringValue( upValue ), new StringValue( normValue ) );
 
         upName = upType + '=' + upValue;
         start = 0;
@@ -264,7 +264,7 @@ public class RDN implements Cloneable, C
      */
     public RDN( String upType, String upValue ) throws LdapInvalidDnException
     {
-        addAttributeTypeAndValue( upType, upType, new ClientStringValue( upValue ), new ClientStringValue( upValue ) );
+        addAttributeTypeAndValue( upType, upType, new StringValue( upValue ), new StringValue( upValue ) );
 
         upName = upType + '=' + upValue;
         start = 0;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java Mon Mar 29 23:59:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -60,7 +60,7 @@ public class BooleanNormalizer extends N
 
         String strValue = value.getString();
         
-        return new ClientStringValue( strValue.trim().toUpperCase() );
+        return new StringValue( strValue.trim().toUpperCase() );
     }
 
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java Mon Mar 29 23:59:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.io.IOException;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -77,7 +77,7 @@ public class DeepTrimNormalizer extends 
            String normalized = PrepareString.normalize( value.getString(), 
                PrepareString.StringType.DIRECTORY_STRING ); 
            
-           return new ClientStringValue( normalized ); 
+           return new StringValue( normalized ); 
        }
        catch ( IOException ioe )
        {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java Mon Mar 29 23:59:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.io.IOException;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -81,7 +81,7 @@ public class DeepTrimToLowerNormalizer e
             String normalized = PrepareString.normalize( value.getString(),
                 PrepareString.StringType.CASE_IGNORE );
             
-            return new ClientStringValue( normalized );
+            return new StringValue( normalized );
         }
         catch ( IOException ioe )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DefaultStringNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DefaultStringNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DefaultStringNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DefaultStringNormalizer.java Mon Mar 29 23:59:49 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.schema.normalizers;
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -60,10 +60,10 @@ public class DefaultStringNormalizer ext
         
         if ( StringTools.isEmpty( str ) )
         {
-            return new ClientStringValue( str );
+            return new StringValue( str );
         }
         
-        return new ClientStringValue( str );
+        return new StringValue( str );
     }
 
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java Mon Mar 29 23:59:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -64,7 +64,7 @@ public class DnNormalizer extends Normal
         dn = new DN( dnStr );
         
         dn.normalize( schemaManager.getNormalizerMapping() );
-        return new ClientStringValue( dn.getNormName() );
+        return new StringValue( dn.getNormName() );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java Mon Mar 29 23:59:49 2010
@@ -25,7 +25,7 @@ import java.text.ParseException;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ClientStringValue;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -75,7 +75,7 @@ public class GeneralizedTimeNormalizer e
         {
             String normalized = PrepareString.normalize( value.getString(), PrepareString.StringType.DIRECTORY_STRING );
 
-            return new ClientStringValue( normalized );
+            return new StringValue( normalized );
         }
         catch ( IOException ioe )
         {



Mime
View raw message