directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r928945 [1/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
Author: elecharny
Date: Mon Mar 29 23:59:49 2010
New Revision: 928945

URL: http://svn.apache.org/viewvc?rev=928945&view=rev
Log:
Rename ClientStringValue

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java
      - copied, changed from r928943, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ClientStringValue.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ClientStringValue.java
Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
    directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerAttribute.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DefaultStringNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameOrNumericIdNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryUtils.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/StringValueAttributeTypeTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/StringValueTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttributeTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Mon Mar 29 23:59:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 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.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -1107,7 +1107,7 @@ public class AvlStore<E> implements Stor
 
             for ( Value<?> value : mods )
             {
-                if ( value instanceof ClientStringValue )
+                if ( value instanceof StringValue )
                 {
                     entryAttr.remove( ( String ) value.get() );
                 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Mon Mar 29 23:59:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -201,7 +201,7 @@ public class SchemaPartitionDaoImpl impl
         DN base = new DN( SchemaConstants.OU_SCHEMA );
         base.normalize( schemaManager.getNormalizerMapping() );
         ExprNode filter = new EqualityNode<String>( schemaManager.getAttributeTypeRegistry().getOidByName( SchemaConstants.OBJECT_CLASS_AT ),
-            new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC ) );
+            new StringValue( MetaSchemaConstants.META_SCHEMA_OC ) );
 
         SearchOperationContext searchContext = new SearchOperationContext( null );
         searchContext.setDn( base );
@@ -229,16 +229,16 @@ public class SchemaPartitionDaoImpl impl
     public boolean hasMatchingRule( String oid ) throws Exception
     {
         BranchNode filter = new AndNode();
-        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
+        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue(
             MetaSchemaConstants.META_MATCHING_RULE_OC ) ) );
 
         if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
         {
-            filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
+            filter.addNode( new EqualityNode<String>( M_OID_OID, new StringValue( oid ) ) );
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_OID, new StringValue( oid.toLowerCase() ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -281,16 +281,16 @@ public class SchemaPartitionDaoImpl impl
     public boolean hasAttributeType( String oid ) throws Exception
     {
         BranchNode filter = new AndNode();
-        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
+        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue(
             MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC ) ) );
 
         if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
         {
-            filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
+            filter.addNode( new EqualityNode<String>( M_OID_OID, new StringValue( oid ) ) );
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_OID, new StringValue( oid.toLowerCase() ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -334,15 +334,15 @@ public class SchemaPartitionDaoImpl impl
     {
         BranchNode filter = new AndNode();
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) );
+            new StringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) );
 
         if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
         {
-            filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
+            filter.addNode( new EqualityNode<String>( M_OID_OID, new StringValue( oid ) ) );
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_OID, new StringValue( oid.toLowerCase() ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -386,15 +386,15 @@ public class SchemaPartitionDaoImpl impl
     {
         BranchNode filter = new AndNode();
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-                new ClientStringValue( MetaSchemaConstants.META_SYNTAX_OC ) ) );
+                new StringValue( MetaSchemaConstants.META_SYNTAX_OC ) ) );
 
         if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
         {
-            filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
+            filter.addNode( new EqualityNode<String>( M_OID_OID, new StringValue( oid ) ) );
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_OID, new StringValue( oid.toLowerCase() ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -438,15 +438,15 @@ public class SchemaPartitionDaoImpl impl
     {
         BranchNode filter = new AndNode();
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_SYNTAX_CHECKER_OC ) ) );
+            new StringValue( MetaSchemaConstants.META_SYNTAX_CHECKER_OC ) ) );
 
         if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
         {
-            filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
+            filter.addNode( new EqualityNode<String>( M_OID_OID, new StringValue( oid ) ) );
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_OID, new StringValue( oid.toLowerCase() ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -524,9 +524,9 @@ public class SchemaPartitionDaoImpl impl
     {
         BranchNode filter = new OrNode();
         SimpleNode<String> nameAVA = new EqualityNode<String>( M_NAME_OID, 
-            new ClientStringValue( entityName.toLowerCase() ) );
+            new StringValue( entityName.toLowerCase() ) );
         SimpleNode<String> oidAVA = new EqualityNode<String>( M_OID_OID, 
-            new ClientStringValue( entityName.toLowerCase() ) );
+            new StringValue( entityName.toLowerCase() ) );
         filter.addNode( nameAVA );
         filter.addNode( oidAVA );
         SearchControls searchControls = new SearchControls();
@@ -616,12 +616,12 @@ public class SchemaPartitionDaoImpl impl
         // subfilter for (| (objectClass=metaMatchingRule) (objectClass=metaAttributeType))  
         BranchNode or = new OrNode();
         or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_MATCHING_RULE_OC.toLowerCase() ) ) );
+            new StringValue( MetaSchemaConstants.META_MATCHING_RULE_OC.toLowerCase() ) ) );
         or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+            new StringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
 
         filter.addNode( or );
-        filter.addNode( new EqualityNode<String>( M_SYNTAX_OID, new ClientStringValue( numericOid.toLowerCase() ) ) );
+        filter.addNode( new EqualityNode<String>( M_SYNTAX_OID, new StringValue( numericOid.toLowerCase() ) ) );
 
         SearchControls searchControls = new SearchControls();
         searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -661,13 +661,13 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         // ( objectClass = metaAttributeType )
-        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
+        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue(
             MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
 
         BranchNode or = new OrNode();
-        or.addNode( new EqualityNode<String>( M_ORDERING_OID, new ClientStringValue( mr.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new ClientStringValue( mr.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new ClientStringValue( mr.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_ORDERING_OID, new StringValue( mr.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new StringValue( mr.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new StringValue( mr.getOid() ) ) );
         filter.addNode( or );
 
         List<String> names = mr.getNames();
@@ -676,9 +676,9 @@ public class SchemaPartitionDaoImpl impl
         {
             for ( String name : names )
             {
-                or.addNode( new EqualityNode<String>( M_ORDERING_OID, new ClientStringValue( name.toLowerCase() ) ) );
-                or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new ClientStringValue( name.toLowerCase() ) ) );
-                or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new ClientStringValue( name.toLowerCase() ) ) );
+                or.addNode( new EqualityNode<String>( M_ORDERING_OID, new StringValue( name.toLowerCase() ) ) );
+                or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new StringValue( name.toLowerCase() ) ) );
+                or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new StringValue( name.toLowerCase() ) ) );
             }
         }
 
@@ -761,15 +761,15 @@ public class SchemaPartitionDaoImpl impl
         // ( objectClass = metaAttributeType )
         BranchNode or = new OrNode();
         or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+            new StringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
         or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC.toLowerCase() ) ) );
+            new StringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC.toLowerCase() ) ) );
         filter.addNode( or );
 
         or = new OrNode();
-        or.addNode( new EqualityNode<String>( M_MAY_OID, new ClientStringValue( at.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_MUST_OID, new ClientStringValue( at.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_SUP_ATTRIBUTE_TYPE_OID, new ClientStringValue( at.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_MAY_OID, new StringValue( at.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_MUST_OID, new StringValue( at.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_SUP_ATTRIBUTE_TYPE_OID, new StringValue( at.getOid() ) ) );
         filter.addNode( or );
 
         SearchControls searchControls = new SearchControls();
@@ -816,9 +816,9 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, 
-            new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
+            new StringValue( MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
         filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_OID, 
-            new ClientStringValue( schemaName.toLowerCase() ) ) );
+            new StringValue( schemaName.toLowerCase() ) ) );
 
         SearchControls searchControls = new SearchControls();
         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -857,9 +857,9 @@ public class SchemaPartitionDaoImpl impl
         Set<ServerEntry> set = new HashSet<ServerEntry>();
         BranchNode filter = new AndNode();
 
-        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue( 
+        filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue( 
             MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
-        filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_OID, new ClientStringValue( 
+        filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_OID, new StringValue( 
             schemaName.toLowerCase() ) ) );
 
         SearchControls searchControls = new SearchControls();
@@ -934,18 +934,18 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         BranchNode or = new OrNode();
-        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_NAME_FORM_OC
+        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue( MetaSchemaConstants.META_NAME_FORM_OC
             .toLowerCase() ) ) );
-        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
+        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
             .toLowerCase() ) ) );
-        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
+        or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new StringValue(
             MetaSchemaConstants.META_DIT_CONTENT_RULE_OC.toLowerCase() ) ) );
         filter.addNode( or );
 
         or = new OrNode();
-        or.addNode( new EqualityNode<String>( M_AUX_OID, new ClientStringValue( oc.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_OC_OID, new ClientStringValue( oc.getOid() ) ) );
-        or.addNode( new EqualityNode<String>( M_SUP_OBJECT_CLASS_OID, new ClientStringValue( oc.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_AUX_OID, new StringValue( oc.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_OC_OID, new StringValue( oc.getOid() ) ) );
+        or.addNode( new EqualityNode<String>( M_SUP_OBJECT_CLASS_OID, new StringValue( oc.getOid() ) ) );
         filter.addNode( or );
 
         SearchControls searchControls = new SearchControls();

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Mon Mar 29 23:59:49 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.entry;
 import org.apache.directory.server.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.LdapException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -166,7 +166,7 @@ public class TestServerEntryUtils
             {
                 if ( !value.isBinary() )
                 {
-                    return new ClientStringValue( value.getString().toLowerCase() );
+                    return new StringValue( value.getString().toLowerCase() );
                 }
 
                 throw new IllegalStateException( I18n.err( I18n.ERR_473 ) );

Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java Mon Mar 29 23:59:49 2010
@@ -44,7 +44,7 @@ import javax.naming.directory.InvalidAtt
 
 import org.apache.commons.io.FileUtils;
 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.Value;
@@ -82,17 +82,17 @@ public class DefaultServerAttributeTest
     // A Binary attribute
     private static AttributeType atPwd;
 
-    private static final Value<String> NULL_STRING_VALUE = new ClientStringValue( (String)null );
+    private static final Value<String> NULL_STRING_VALUE = new StringValue( (String)null );
     private static final Value<byte[]> NULL_BINARY_VALUE = new BinaryValue( (byte[])null );
     private static final byte[] BYTES1 = new byte[]{ 'a', 'b' };
     private static final byte[] BYTES2 = new byte[]{ 'b' };
     private static final byte[] BYTES3 = new byte[]{ 'c' };
     private static final byte[] BYTES4 = new byte[]{ 'd' };
     
-    private static final ClientStringValue STR_VALUE1 = new ClientStringValue( "a" );
-    private static final ClientStringValue STR_VALUE2 = new ClientStringValue( "b" );
-    private static final ClientStringValue STR_VALUE3 = new ClientStringValue( "c" );
-    private static final ClientStringValue STR_VALUE4 = new ClientStringValue( "d" );
+    private static final StringValue STR_VALUE1 = new StringValue( "a" );
+    private static final StringValue STR_VALUE2 = new StringValue( "b" );
+    private static final StringValue STR_VALUE3 = new StringValue( "c" );
+    private static final StringValue STR_VALUE4 = new StringValue( "d" );
 
     private static final BinaryValue BIN_VALUE1 = new BinaryValue( BYTES1 );
     private static final BinaryValue BIN_VALUE2 = new BinaryValue( BYTES2 );
@@ -231,14 +231,14 @@ public class DefaultServerAttributeTest
         
         Value<?> value = attr.get();
         
-        assertTrue( value instanceof ClientStringValue );
-        assertEquals( "test", ((ClientStringValue)value).getString() );
+        assertTrue( value instanceof StringValue );
+        assertEquals( "test", ((StringValue)value).getString() );
         
         // Add a binary value
         assertEquals( 0, attr.add( new byte[]{0x01} ) );
         
         // Add a Value
-        Value<?> ssv = new ClientStringValue( at, "test2" );
+        Value<?> ssv = new StringValue( at, "test2" );
         
         attr.add( ssv );
         
@@ -305,7 +305,7 @@ public class DefaultServerAttributeTest
         DefaultServerAttribute attr = new DefaultServerAttribute( at );
         
         // Add a null value
-        attr.add( new ClientStringValue( at, null ) );
+        attr.add( new StringValue( at, null ) );
         
         assertEquals( 1, attr.size() );
         
@@ -313,8 +313,8 @@ public class DefaultServerAttributeTest
         
         Value<?> value = attr.get();
         
-        assertTrue( value instanceof ClientStringValue );
-        assertNull( ((ClientStringValue)value).get() );
+        assertTrue( value instanceof StringValue );
+        assertNull( ((StringValue)value).get() );
     }
     
 
@@ -611,7 +611,7 @@ public class DefaultServerAttributeTest
     {
         EntryAttribute attr1 = new DefaultServerAttribute( atCN );
         
-        int nbAdded = attr1.add( new ClientStringValue( atCN, null ) );
+        int nbAdded = attr1.add( new StringValue( atCN, null ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHR() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
@@ -625,7 +625,7 @@ public class DefaultServerAttributeTest
         
         EntryAttribute attr3 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr3.add( new ClientStringValue( atCN, "a" ), new ClientStringValue( atCN, "b" ) );
+        nbAdded = attr3.add( new StringValue( atCN, "a" ), new StringValue( atCN, "b" ) );
         assertEquals( 2, nbAdded );
         assertTrue( attr3.isHR() );
         assertTrue( attr3.contains( "a" ) );
@@ -641,7 +641,7 @@ public class DefaultServerAttributeTest
         
         EntryAttribute attr5 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr5.add( new ClientStringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
+        nbAdded = attr5.add( new StringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr5.isHR() );
         assertFalse( attr5.contains( "ab" ) );
@@ -649,7 +649,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr6 = new DefaultServerAttribute( atPwd );
         
-        nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new ClientStringValue( atCN, "c" ) );
+        nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new StringValue( atCN, "c" ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr6.isHR() );
         assertTrue( attr6.contains( BYTES1 ) );
@@ -657,7 +657,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr7 = new DefaultServerAttribute( atPwd );
         
-        nbAdded = attr7.add( new BinaryValue( atPwd, null ), new ClientStringValue( atCN, "c" ) );
+        nbAdded = attr7.add( new BinaryValue( atPwd, null ), new StringValue( atCN, "c" ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr7.isHR() );
         assertTrue( attr7.contains( NULL_BINARY_VALUE ) );
@@ -665,7 +665,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr8 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr8.add( new ClientStringValue( atCN, null ), new BinaryValue( atPwd, BYTES1 ) );
+        nbAdded = attr8.add( new StringValue( atCN, null ), new BinaryValue( atPwd, BYTES1 ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr8.isHR() );
         assertTrue( attr8.contains( NULL_STRING_VALUE ) );
@@ -674,7 +674,7 @@ public class DefaultServerAttributeTest
     
         EntryAttribute attr9 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr9.add( new ClientStringValue( (String)null ), new ClientStringValue( "ab" ) );
+        nbAdded = attr9.add( new StringValue( (String)null ), new StringValue( "ab" ) );
         assertEquals( 2, nbAdded );
         assertTrue( attr9.isHR() );
         assertTrue( attr9.contains( NULL_STRING_VALUE ) );
@@ -1545,7 +1545,7 @@ public class DefaultServerAttributeTest
         
         for ( Value<?> val:attr1 )
         {
-            assertTrue( val instanceof ClientStringValue );
+            assertTrue( val instanceof StringValue );
             assertEquals( values[pos++], val.getString() );
         }
     }

Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Mon Mar 29 23:59:49 2010
@@ -42,7 +42,7 @@ import javax.naming.directory.BasicAttri
 
 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.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -366,7 +366,7 @@ public class DefaultServerEntryTest
     public void testAddStringValueArray() throws Exception
     {
         Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
-        Value<String> value = new ClientStringValue( atCN, (String)null );
+        Value<String> value = new StringValue( atCN, (String)null );
         
         entry.add( "cn", value );
         assertEquals( 1, entry.size() );
@@ -375,9 +375,9 @@ public class DefaultServerEntryTest
         assertNotNull( attributeCN.get() );
         assertNull( attributeCN.get().get() );
          
-        Value<String> value1 = new ClientStringValue( atCN, "test1" );
-        Value<String> value2 = new ClientStringValue( atCN, "test2" );
-        Value<String> value3 = new ClientStringValue( atCN, "test1" );
+        Value<String> value1 = new StringValue( atCN, "test1" );
+        Value<String> value2 = new StringValue( atCN, "test2" );
+        Value<String> value3 = new StringValue( atCN, "test1" );
 
         entry.add( "sn", value1, value2, value3 );
         assertEquals( 2, entry.size() );
@@ -471,10 +471,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -589,10 +589,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -759,9 +759,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
-        Value<String> test3 = new ClientStringValue( atCN, "test3" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
+        Value<String> test3 = new StringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -973,9 +973,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
-        Value<String> test3 = new ClientStringValue( atCN, "test3" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
+        Value<String> test3 = new StringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -1190,9 +1190,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
-        Value<String> test3 = new ClientStringValue( atCN, "test3" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
+        Value<String> test3 = new StringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -1402,10 +1402,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -1523,10 +1523,10 @@ public class DefaultServerEntryTest
 
         entry.add( attrCN, attrPWD );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -2000,10 +2000,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2247,10 +2247,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2466,10 +2466,10 @@ public class DefaultServerEntryTest
     {
         Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2765,7 +2765,7 @@ public class DefaultServerEntryTest
         
         // Add a single value
         atCN = schemaManager.lookupAttributeTypeRegistry( "cn" );
-        Value<?> ssv = new ClientStringValue( atCN, "test" );
+        Value<?> ssv = new StringValue( atCN, "test" );
         entry.put( atCN, ssv );
         
         assertEquals( 1, entry.size() );
@@ -2774,9 +2774,9 @@ public class DefaultServerEntryTest
         assertEquals( "test", entry.get( atCN ).get().getString() );
         
         // Add more than one value
-        entry.put( atCN, new ClientStringValue( atCN, "test1" ),
-                         new ClientStringValue( atCN, "test2" ), 
-                         new ClientStringValue( atCN, "test3" ));
+        entry.put( atCN, new StringValue( atCN, "test1" ),
+                         new StringValue( atCN, "test2" ), 
+                         new StringValue( atCN, "test3" ));
         
         assertEquals( 1, entry.size() );
         assertEquals( "cn", entry.get( atCN ).getUpId() );
@@ -2786,9 +2786,9 @@ public class DefaultServerEntryTest
         assertTrue( entry.contains( "cn", "test3" ) );
         
         // Add twice the same value
-        EntryAttribute sa = entry.put( atCN, new ClientStringValue( atCN, "test1" ),
-                         new ClientStringValue( atCN, "test2" ), 
-                         new ClientStringValue( atCN, "test1" ));
+        EntryAttribute sa = entry.put( atCN, new StringValue( atCN, "test1" ),
+                         new StringValue( atCN, "test2" ), 
+                         new StringValue( atCN, "test1" ));
         
         assertEquals( 3, sa.size() );
         assertTrue( sa.contains( "test1", "test2", "test3" ) );
@@ -3133,9 +3133,9 @@ public class DefaultServerEntryTest
         }
         
         // Test that we can add some new attributes with values
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
-        Value<String> test3 = new ClientStringValue( atCN, "test3" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
+        Value<String> test3 = new StringValue( atCN, "test3" );
 
         EntryAttribute result = entry.put( "CN", atCN, test1, test2, test3 );
         assertNotNull( result );
@@ -3176,9 +3176,9 @@ public class DefaultServerEntryTest
         assertNull( entry.get( atCN ).get().get() );
 
         // Test that we can add some new attributes with values
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
-        Value<String> test3 = new ClientStringValue( atCN, "test3" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
+        Value<String> test3 = new StringValue( atCN, "test3" );
 
         EntryAttribute result = entry.put( "CN", test1, test2, test3 );
         assertNotNull( result );
@@ -3261,10 +3261,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -3454,10 +3454,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ClientStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ClientStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ClientStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ClientStringValue( atCN, null);
+        Value<String> strValue1 = new StringValue( atCN, "test1" );
+        Value<String> strValue2 = new StringValue( atCN, "test2" );
+        Value<String> strValue3 = new StringValue( atCN, "test3" );
+        Value<String> strNullValue = new StringValue( atCN, null);
 
         Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -3495,8 +3495,8 @@ public class DefaultServerEntryTest
         byte[] b1 = StringTools.getBytesUtf8( "test1" );
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
 
-        Value<String> test1 = new ClientStringValue( atCN, "test1" );
-        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test1 = new StringValue( atCN, "test1" );
+        Value<String> test2 = new StringValue( atCN, "test2" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -3840,9 +3840,9 @@ public class DefaultServerEntryTest
         
         assertEquals( "ServerEntry\n    dn[]: dc=example,dc=com\n", entry.toString() );
         
-        Value<String> strValueTop = new ClientStringValue( "top" );
-        Value<String> strValuePerson = new ClientStringValue( "person" );
-        Value<String> strNullValue = new ClientStringValue( (String)null);
+        Value<String> strValueTop = new StringValue( "top" );
+        Value<String> strValuePerson = new StringValue( "person" );
+        Value<String> strNullValue = new StringValue( (String)null);
 
         Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( BYTES2 );

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Mon Mar 29 23:59:49 2010
@@ -59,7 +59,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 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;
@@ -762,7 +762,7 @@ public abstract class ServerDirContext e
                 }
                 else
                 {
-                    node = new EqualityNode<String>( attr.getID(), new ClientStringValue( ( String ) value ) );
+                    node = new EqualityNode<String>( attr.getID(), new StringValue( ( String ) value ) );
                 }
 
                 AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
@@ -815,7 +815,7 @@ public abstract class ServerDirContext e
                 // Add simpel AVA node if its value is a String 
                 if ( val instanceof String )
                 {
-                    node = new EqualityNode<String>( attr.getID(), new ClientStringValue( ( String ) val ) );
+                    node = new EqualityNode<String>( attr.getID(), new StringValue( ( String ) val ) );
                     filter.addNode( node );
                 }
             }

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Mon Mar 29 23:59:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 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.jndi.JndiUtils;
@@ -205,11 +205,11 @@ public class ServerLdapContext extends S
         {
             if ( value instanceof String )
             {
-                val = new ClientStringValue( attributeType, (String)value );
+                val = new StringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ClientStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new StringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
             }
             else
             {

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Mon Mar 29 23:59:49 2010
@@ -46,7 +46,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
@@ -195,11 +195,11 @@ public class MockCoreSession implements 
         {
             if ( value instanceof String )
             {
-                val = new ClientStringValue( attributeType, (String)value );
+                val = new StringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ClientStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new StringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
             }
             else
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Mon Mar 29 23:59:49 2010
@@ -46,7 +46,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
@@ -195,11 +195,11 @@ public class DefaultCoreSession implemen
         {
             if ( value instanceof String )
             {
-                val = new ClientStringValue( attributeType, (String)value );
+                val = new StringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ClientStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new StringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
             }
             else
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Mon Mar 29 23:59:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -141,7 +141,7 @@ public class ReferralManagerImpl impleme
     public void init( DirectoryService directoryService, String... suffixes ) throws Exception
     {
         ExprNode referralFilter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
-            new ClientStringValue( SchemaConstants.REFERRAL_OC ) );
+            new StringValue( SchemaConstants.REFERRAL_OC ) );
 
         // Lookup for each entry with the ObjectClass = Referral value
         SearchControls searchControl = new SearchControls();
@@ -187,7 +187,7 @@ public class ReferralManagerImpl impleme
     public void remove( DirectoryService directoryService, DN suffix ) throws Exception
     {
         ExprNode referralFilter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
-            new ClientStringValue( SchemaConstants.REFERRAL_OC ) );
+            new StringValue( SchemaConstants.REFERRAL_OC ) );
 
         // Lookup for each entry with the ObjectClass = Referral value
         SearchControls searchControl = new SearchControls();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Mon Mar 29 23:59:49 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.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.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -126,9 +126,9 @@ public class GroupCache
         // normalized sets of members to cache within the map
 
         BranchNode filter = new OrNode();
-        filter.addNode( new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new ClientStringValue(
+        filter.addNode( new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new StringValue(
             SchemaConstants.GROUP_OF_NAMES_OC ) ) );
-        filter.addNode( new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new ClientStringValue(
+        filter.addNode( new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new StringValue(
             SchemaConstants.GROUP_OF_UNIQUE_NAMES_OC ) ) );
 
         Set<String> suffixes = nexus.listSuffixes( null );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon Mar 29 23:59:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ACIItemParser;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
@@ -122,7 +122,7 @@ public class TupleCache
         {
             DN baseDn = parseNormalized( session.getDirectoryService().getSchemaManager(), suffix );
             ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
-                new ClientStringValue( SchemaConstants.ACCESS_CONTROL_SUBENTRY_OC ) );
+                new StringValue( SchemaConstants.ACCESS_CONTROL_SUBENTRY_OC ) );
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Mon Mar 29 23:59:49 2010
@@ -24,7 +24,7 @@ import java.util.Comparator;
 
 import org.apache.directory.server.i18n.I18n;
 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.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -268,7 +268,7 @@ public class LeafEvaluator implements Ev
         {
             if ( node.getValue().isBinary() )
             {
-                value = new ClientStringValue( node.getValue().getString() );
+                value = new StringValue( node.getValue().getString() );
             }
             else
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java Mon Mar 29 23:59:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.List;
 
-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( 
+                normalized = new StringValue( 
                     (String) ncn.normalizeByName( attribute, value.getString() ) );
             }
             else
@@ -231,7 +231,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 )
             {
@@ -247,7 +247,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 )
                 {
@@ -265,7 +265,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/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Mon Mar 29 23:59:49 2010
@@ -44,7 +44,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
-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.ExprNode;
@@ -304,7 +304,7 @@ public class NormalizationInterceptor ex
         if ( at.getSyntax().isHumanReadable() && ( opContext.getValue().isBinary() ) )
         {
             String value = opContext.getValue().getString();
-            opContext.setValue( new ClientStringValue( value ) );
+            opContext.setValue( new StringValue( value ) );
         }
         
         return next.compare( opContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Mon Mar 29 23:59:49 2010
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 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.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -79,7 +79,7 @@ public class ReferralInterceptor extends
     
     static private void checkRefAttributeValue( Value<?> value ) throws NamingException, LdapURLEncodingException
     {
-        ClientStringValue ref = ( ClientStringValue ) value;
+        StringValue ref = ( StringValue ) value;
 
         String refVal = ref.getString();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Mon Mar 29 23:59:49 2010
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 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.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -527,7 +527,7 @@ public class SchemaInterceptor extends B
             {
                 try
                 {
-                    return new ClientStringValue( new String( ( byte[] ) value, "UTF-8" ) );
+                    return new StringValue( new String( ( byte[] ) value, "UTF-8" ) );
                 }
                 catch ( UnsupportedEncodingException uee )
                 {
@@ -1967,7 +1967,7 @@ public class SchemaInterceptor extends B
         // Loop on each values
         for ( Value<?> value : attribute )
         {
-            if ( value instanceof ClientStringValue )
+            if ( value instanceof StringValue )
             {
                 continue;
             }
@@ -2013,7 +2013,7 @@ public class SchemaInterceptor extends B
             {
                 continue;
             }
-            else if ( value instanceof ClientStringValue )
+            else if ( value instanceof StringValue )
             {
                 // We have a String value. It should be a byte[]
                 // Let's transform it

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Mon Mar 29 23:59:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.server.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.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -83,9 +83,9 @@ public class LdapClassLoader extends Cla
         // Set up the search filter
         BranchNode filter = new AndNode( );
         filter.addNode( new EqualityNode<String>( "fullyQualifiedJavaClassName", 
-            new ClientStringValue( name ) ) );
+            new StringValue( name ) ) );
         filter.addNode( new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
-            new ClientStringValue( ApacheSchemaConstants.JAVA_CLASS_OC ) ) );
+            new StringValue( ApacheSchemaConstants.JAVA_CLASS_OC ) ) );
         
         try
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Mon Mar 29 23:59:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.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.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -89,7 +89,7 @@ public class StoredProcExecutionManager
         
         AttributeType at = session.getDirectoryService()
             .getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" );
-        ExprNode filter = new EqualityNode<String>( "storedProcUnitName", new ClientStringValue( at, spUnitName ) );
+        ExprNode filter = new EqualityNode<String>( "storedProcUnitName", new StringValue( at, spUnitName ) );
         DN dn = new DN( storedProcContainer );
         EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter, 
             AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Mon Mar 29 23:59:49 2010
@@ -55,7 +55,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -153,7 +153,7 @@ public class SubentryInterceptor extends
 
         // prepare to find all subentries in all namingContexts
         Set<String> suffixes = this.nexus.listSuffixes( null );
-        ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new ClientStringValue(
+        ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, new StringValue(
             SchemaConstants.SUBENTRY_OC ) );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Mon Mar 29 23:59:49 2010
@@ -45,7 +45,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
@@ -120,7 +120,7 @@ public class TriggerSpecCache
         {
             DN baseDn = new DN( suffix );
             ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
-                    new ClientStringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) );
+                    new StringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) );
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Mon Mar 29 23:59:49 2010
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-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.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -239,15 +239,15 @@ public class RelatedProtectedItemFilterT
         tuples = getTuples( new ProtectedItem.AttributeValue( convert( attributes )  ) );
 
         assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
-            null, null, null, "cn", new ClientStringValue( "valueA" ), null, null, null ).size() );
+            null, null, null, "cn", new StringValue( "valueA" ), null, null, null ).size() );
 
         assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
-            null, null, null, "cn", new ClientStringValue( "valueB" ), null, null, null ).size() );
+            null, null, null, "cn", new StringValue( "valueB" ), null, null, null ).size() );
 
         tuples = getTuples( new ProtectedItem.AttributeValue( convert( attributes )  ) );
 
         assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
-            null, null, null, "sn", new ClientStringValue( "valueA" ), null, null, null ).size() );
+            null, null, null, "sn", new StringValue( "valueA" ), null, null, null ).size() );
     }
 
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=928945&r1=928944&r2=928945&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Mon Mar 29 23:59:49 2010
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-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.name.DN;
@@ -146,12 +146,12 @@ public class RestrictedByFilterTest
         tuples.add( new ACITuple( UC_EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, MO_EMPTY_SET, true, 0 ) );
 
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
-            null, null, "sn", new ClientStringValue( "1" ), ENTRY, null, null ).size() );
+            null, null, "sn", new StringValue( "1" ), ENTRY, null, null ).size() );
 
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
-            null, null, "sn", new ClientStringValue( "2" ), ENTRY, null, null ).size() );
+            null, null, "sn", new StringValue( "2" ), ENTRY, null, null ).size() );
 
         assertEquals( 0, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
-            null, null, "sn", new ClientStringValue( "3" ), ENTRY, null, null ).size() );
+            null, null, "sn", new StringValue( "3" ), ENTRY, null, null ).size() );
     }
 }



Mime
View raw message