directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r928938 [1/2] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ apacheds/trunk/core-integ/src/test/jav...
Date Mon, 29 Mar 2010 23:25:43 GMT
Author: elecharny
Date: Mon Mar 29 23:25:42 2010
New Revision: 928938

URL: http://svn.apache.org/viewvc?rev=928938&view=rev
Log:
o Removed the ServerStringValue
o Removed dead code
o Fixed the way we are dealing with DN in the ACi engine related users filter
o Minor refactoring
o Removed commented code

Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerStringValue.java
Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.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-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.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/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.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/StoredProcExecutionManager.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/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.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/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.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/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
    directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
    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/aci/ACIItemParser.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/ClientStringValue.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.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/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

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -44,8 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
@@ -1107,7 +1107,7 @@ public class AvlStore<E> implements Stor
 
             for ( Value<?> value : mods )
             {
-                if ( value instanceof ServerStringValue )
+                if ( value instanceof ClientStringValue )
                 {
                     entryAttr.remove( ( String ) value.get() );
                 }

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -46,7 +46,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
@@ -83,7 +82,7 @@ public class DefaultServerAttributeTest
     // A Binary attribute
     private static AttributeType atPwd;
 
-    private static final Value<String> NULL_STRING_VALUE = new ClientStringValue( null );
+    private static final Value<String> NULL_STRING_VALUE = new ClientStringValue( (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' };
@@ -232,14 +231,14 @@ public class DefaultServerAttributeTest
         
         Value<?> value = attr.get();
         
-        assertTrue( value instanceof ServerStringValue );
-        assertEquals( "test", ((ServerStringValue)value).getString() );
+        assertTrue( value instanceof ClientStringValue );
+        assertEquals( "test", ((ClientStringValue)value).getString() );
         
         // Add a binary value
         assertEquals( 0, attr.add( new byte[]{0x01} ) );
         
         // Add a Value
-        Value<?> ssv = new ServerStringValue( at, "test2" );
+        Value<?> ssv = new ClientStringValue( at, "test2" );
         
         attr.add( ssv );
         
@@ -306,7 +305,7 @@ public class DefaultServerAttributeTest
         DefaultServerAttribute attr = new DefaultServerAttribute( at );
         
         // Add a null value
-        attr.add( new ServerStringValue( at, null ) );
+        attr.add( new ClientStringValue( at, null ) );
         
         assertEquals( 1, attr.size() );
         
@@ -314,8 +313,8 @@ public class DefaultServerAttributeTest
         
         Value<?> value = attr.get();
         
-        assertTrue( value instanceof ServerStringValue );
-        assertNull( ((ServerStringValue)value).get() );
+        assertTrue( value instanceof ClientStringValue );
+        assertNull( ((ClientStringValue)value).get() );
     }
     
 
@@ -612,7 +611,7 @@ public class DefaultServerAttributeTest
     {
         EntryAttribute attr1 = new DefaultServerAttribute( atCN );
         
-        int nbAdded = attr1.add( new ServerStringValue( atCN, null ) );
+        int nbAdded = attr1.add( new ClientStringValue( atCN, null ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHR() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
@@ -626,7 +625,7 @@ public class DefaultServerAttributeTest
         
         EntryAttribute attr3 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr3.add( new ServerStringValue( atCN, "a" ), new ServerStringValue( atCN, "b" ) );
+        nbAdded = attr3.add( new ClientStringValue( atCN, "a" ), new ClientStringValue( atCN, "b" ) );
         assertEquals( 2, nbAdded );
         assertTrue( attr3.isHR() );
         assertTrue( attr3.contains( "a" ) );
@@ -642,7 +641,7 @@ public class DefaultServerAttributeTest
         
         EntryAttribute attr5 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr5.add( new ServerStringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
+        nbAdded = attr5.add( new ClientStringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr5.isHR() );
         assertFalse( attr5.contains( "ab" ) );
@@ -650,7 +649,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr6 = new DefaultServerAttribute( atPwd );
         
-        nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new ServerStringValue( atCN, "c" ) );
+        nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new ClientStringValue( atCN, "c" ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr6.isHR() );
         assertTrue( attr6.contains( BYTES1 ) );
@@ -658,7 +657,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr7 = new DefaultServerAttribute( atPwd );
         
-        nbAdded = attr7.add( new BinaryValue( atPwd, null ), new ServerStringValue( atCN, "c" ) );
+        nbAdded = attr7.add( new BinaryValue( atPwd, null ), new ClientStringValue( atCN, "c" ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr7.isHR() );
         assertTrue( attr7.contains( NULL_BINARY_VALUE ) );
@@ -666,7 +665,7 @@ public class DefaultServerAttributeTest
 
         EntryAttribute attr8 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr8.add( new ServerStringValue( atCN, null ), new BinaryValue( atPwd, BYTES1 ) );
+        nbAdded = attr8.add( new ClientStringValue( atCN, null ), new BinaryValue( atPwd, BYTES1 ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr8.isHR() );
         assertTrue( attr8.contains( NULL_STRING_VALUE ) );
@@ -675,7 +674,7 @@ public class DefaultServerAttributeTest
     
         EntryAttribute attr9 = new DefaultServerAttribute( atCN );
         
-        nbAdded = attr9.add( new ClientStringValue( null ), new ClientStringValue( "ab" ) );
+        nbAdded = attr9.add( new ClientStringValue( (String)null ), new ClientStringValue( "ab" ) );
         assertEquals( 2, nbAdded );
         assertTrue( attr9.isHR() );
         assertTrue( attr9.contains( NULL_STRING_VALUE ) );
@@ -1546,7 +1545,7 @@ public class DefaultServerAttributeTest
         
         for ( Value<?> val:attr1 )
         {
-            assertTrue( val instanceof ServerStringValue );
+            assertTrue( val instanceof ClientStringValue );
             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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -47,7 +47,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
@@ -367,7 +366,7 @@ public class DefaultServerEntryTest
     public void testAddStringValueArray() throws Exception
     {
         Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
-        Value<String> value = new ServerStringValue( atCN, (String)null );
+        Value<String> value = new ClientStringValue( atCN, (String)null );
         
         entry.add( "cn", value );
         assertEquals( 1, entry.size() );
@@ -376,9 +375,9 @@ public class DefaultServerEntryTest
         assertNotNull( attributeCN.get() );
         assertNull( attributeCN.get().get() );
          
-        Value<String> value1 = new ServerStringValue( atCN, "test1" );
-        Value<String> value2 = new ServerStringValue( atCN, "test2" );
-        Value<String> value3 = new ServerStringValue( atCN, "test1" );
+        Value<String> value1 = new ClientStringValue( atCN, "test1" );
+        Value<String> value2 = new ClientStringValue( atCN, "test2" );
+        Value<String> value3 = new ClientStringValue( atCN, "test1" );
 
         entry.add( "sn", value1, value2, value3 );
         assertEquals( 2, entry.size() );
@@ -472,10 +471,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -590,10 +589,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -760,9 +759,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
-        Value<String> test3 = new ServerStringValue( atCN, "test3" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test3 = new ClientStringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -974,9 +973,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
-        Value<String> test3 = new ServerStringValue( atCN, "test3" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test3 = new ClientStringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -1191,9 +1190,9 @@ public class DefaultServerEntryTest
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
         byte[] b3 = StringTools.getBytesUtf8( "test3" );
 
-        Value<String> test1 = new ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
-        Value<String> test3 = new ServerStringValue( atCN, "test3" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test3 = new ClientStringValue( atCN, "test3" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -1403,10 +1402,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -1524,10 +1523,10 @@ public class DefaultServerEntryTest
 
         entry.add( attrCN, attrPWD );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( atPwd, BYTES2 );
@@ -2001,10 +2000,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2248,10 +2247,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2467,10 +2466,10 @@ public class DefaultServerEntryTest
     {
         Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -2766,7 +2765,7 @@ public class DefaultServerEntryTest
         
         // Add a single value
         atCN = schemaManager.lookupAttributeTypeRegistry( "cn" );
-        Value<?> ssv = new ServerStringValue( atCN, "test" );
+        Value<?> ssv = new ClientStringValue( atCN, "test" );
         entry.put( atCN, ssv );
         
         assertEquals( 1, entry.size() );
@@ -2775,9 +2774,9 @@ public class DefaultServerEntryTest
         assertEquals( "test", entry.get( atCN ).get().getString() );
         
         // Add more than one value
-        entry.put( atCN, new ServerStringValue( atCN, "test1" ),
-                         new ServerStringValue( atCN, "test2" ), 
-                         new ServerStringValue( atCN, "test3" ));
+        entry.put( atCN, new ClientStringValue( atCN, "test1" ),
+                         new ClientStringValue( atCN, "test2" ), 
+                         new ClientStringValue( atCN, "test3" ));
         
         assertEquals( 1, entry.size() );
         assertEquals( "cn", entry.get( atCN ).getUpId() );
@@ -2787,9 +2786,9 @@ public class DefaultServerEntryTest
         assertTrue( entry.contains( "cn", "test3" ) );
         
         // Add twice the same value
-        EntryAttribute sa = entry.put( atCN, new ServerStringValue( atCN, "test1" ),
-                         new ServerStringValue( atCN, "test2" ), 
-                         new ServerStringValue( atCN, "test1" ));
+        EntryAttribute sa = entry.put( atCN, new ClientStringValue( atCN, "test1" ),
+                         new ClientStringValue( atCN, "test2" ), 
+                         new ClientStringValue( atCN, "test1" ));
         
         assertEquals( 3, sa.size() );
         assertTrue( sa.contains( "test1", "test2", "test3" ) );
@@ -3134,9 +3133,9 @@ public class DefaultServerEntryTest
         }
         
         // Test that we can add some new attributes with values
-        Value<String> test1 = new ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
-        Value<String> test3 = new ServerStringValue( atCN, "test3" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test3 = new ClientStringValue( atCN, "test3" );
 
         EntryAttribute result = entry.put( "CN", atCN, test1, test2, test3 );
         assertNotNull( result );
@@ -3177,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 ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
-        Value<String> test3 = new ServerStringValue( atCN, "test3" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
+        Value<String> test3 = new ClientStringValue( atCN, "test3" );
 
         EntryAttribute result = entry.put( "CN", test1, test2, test3 );
         assertNotNull( result );
@@ -3262,10 +3261,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -3455,10 +3454,10 @@ public class DefaultServerEntryTest
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
         
-        Value<String> strValue1 = new ServerStringValue( atCN, "test1" );
-        Value<String> strValue2 = new ServerStringValue( atCN, "test2" );
-        Value<String> strValue3 = new ServerStringValue( atCN, "test3" );
-        Value<String> strNullValue = new ServerStringValue( atCN, null);
+        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<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
 
@@ -3496,8 +3495,8 @@ public class DefaultServerEntryTest
         byte[] b1 = StringTools.getBytesUtf8( "test1" );
         byte[] b2 = StringTools.getBytesUtf8( "test2" );
 
-        Value<String> test1 = new ServerStringValue( atCN, "test1" );
-        Value<String> test2 = new ServerStringValue( atCN, "test2" );
+        Value<String> test1 = new ClientStringValue( atCN, "test1" );
+        Value<String> test2 = new ClientStringValue( atCN, "test2" );
         
         Value<byte[]> testB1 = new BinaryValue( atPassword, b1 );
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
@@ -3843,7 +3842,7 @@ public class DefaultServerEntryTest
         
         Value<String> strValueTop = new ClientStringValue( "top" );
         Value<String> strValuePerson = new ClientStringValue( "person" );
-        Value<String> strNullValue = new ClientStringValue( null);
+        Value<String> strNullValue = new ClientStringValue( (String)null);
 
         Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
         Value<byte[]> binValue2 = new BinaryValue( BYTES2 );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Mon Mar 29 23:25:42 2010
@@ -326,6 +326,7 @@ public class AutzIntegUtils
 
         // modify ou=system to be an AP for an A/C AA if it is not already
         EntryAttribute administrativeRole = systemEntry.get( "administrativeRole" );
+        
         if ( administrativeRole == null || !administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
         {
             ModifyRequest modReq = new ModifyRequest( systemEntry.getDn() );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Mon Mar 29 23:25:42 2010
@@ -415,7 +415,7 @@ public class CreateContextIT extends Abs
     public void testCreateJavaContainer() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
-
+        
         DirContext ctx = (DirContext)sysRoot.createSubcontext( "cn=subtest" );
         assertNotNull( ctx );
         

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -39,8 +39,8 @@ 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.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.name.DN;
@@ -205,11 +205,11 @@ public class ServerLdapContext extends S
         {
             if ( value instanceof String )
             {
-                val = new ServerStringValue( attributeType, (String)value );
+                val = new ClientStringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ServerStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new ClientStringValue( 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -49,8 +49,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -195,11 +195,11 @@ public class MockCoreSession implements 
         {
             if ( value instanceof String )
             {
-                val = new ServerStringValue( attributeType, (String)value );
+                val = new ClientStringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ServerStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new ClientStringValue( 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -49,8 +49,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -195,11 +195,11 @@ public class DefaultCoreSession implemen
         {
             if ( value instanceof String )
             {
-                val = new ServerStringValue( attributeType, (String)value );
+                val = new ClientStringValue( attributeType, (String)value );
             }
             else if ( value instanceof byte[] )
             {
-                val = new ServerStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
+                val = new ClientStringValue( attributeType, StringTools.utf8ToString( (byte[])value ) );
             }
             else
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Mon Mar 29 23:25:42 2010
@@ -567,7 +567,7 @@ public class AciAuthorizationInterceptor
             return;
         }
 
-        Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.getName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( opContext, tuples, name, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Mon Mar 29 23:25:42 2010
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Set;
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.subtree.SubtreeEvaluator;
@@ -152,9 +153,17 @@ public class RelatedUserClassFilter impl
                 
                 for ( DN userGroupName : userGroupNames )
                 {
-                    if ( userGroupName != null && userGroupUserClass.getNames().contains( userGroupName ) )
+                    Set<DN> dns = userGroupUserClass.getNames();
+                    
+                    if ( userGroupName != null )
                     {
-                        return true;
+                        for ( DN dn : dns )
+                        {
+                            if ( userGroupName.getNormName().equals( dn.getNormName() ) )
+                            {
+                                return true;
+                            }
+                        }
                     }
                 }
             }

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -19,8 +19,6 @@
  */
 package org.apache.directory.server.core.referral;
 
-
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 
@@ -42,8 +40,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -81,7 +79,7 @@ public class ReferralInterceptor extends
     
     static private void checkRefAttributeValue( Value<?> value ) throws NamingException, LdapURLEncodingException
     {
-        ServerStringValue ref = ( ServerStringValue ) value;
+        ClientStringValue ref = ( ClientStringValue ) 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -62,7 +62,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
@@ -1968,7 +1967,7 @@ public class SchemaInterceptor extends B
         // Loop on each values
         for ( Value<?> value : attribute )
         {
-            if ( value instanceof ServerStringValue )
+            if ( value instanceof ClientStringValue )
             {
                 continue;
             }
@@ -2014,7 +2013,7 @@ public class SchemaInterceptor extends B
             {
                 continue;
             }
-            else if ( value instanceof ServerStringValue )
+            else if ( value instanceof ClientStringValue )
             {
                 // 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/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=928938&r1=928937&r2=928938&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:25:42 2010
@@ -32,7 +32,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.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -89,7 +89,7 @@ public class StoredProcExecutionManager
         
         AttributeType at = session.getDirectoryService()
             .getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" );
-        ExprNode filter = new EqualityNode<String>( "storedProcUnitName", new ServerStringValue( at, spUnitName ) );
+        ExprNode filter = new EqualityNode<String>( "storedProcUnitName", new ClientStringValue( at, spUnitName ) );
         DN dn = new DN( storedProcContainer );
         EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter, 
             AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS );

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -67,8 +67,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -243,9 +243,9 @@ public class KeyDerivationInterceptor ex
                 Object firstValue = attr.get();
                 String password = null;
 
-                if ( firstValue instanceof ServerStringValue )
+                if ( firstValue instanceof ClientStringValue )
                 {
-                    password = ((ServerStringValue)firstValue).getString();
+                    password = ((ClientStringValue)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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -93,7 +93,7 @@ public class PasswordPolicyInterceptor e
 
             if ( entry.get( SchemaConstants.CN_AT ) != null )
             {
-                ServerStringValue attr = (ServerStringValue)entry.get( SchemaConstants.CN_AT ).get();
+                ClientStringValue attr = (ClientStringValue)entry.get( SchemaConstants.CN_AT ).get();
                 username = attr.getString();
             }
 
@@ -146,10 +146,10 @@ public class PasswordPolicyInterceptor e
 
                 if ( userPassword != null )
                 {
-                    if ( userPassword instanceof ServerStringValue )
+                    if ( userPassword instanceof ClientStringValue )
                     {
                         log.debug( "{} Attribute id : 'userPassword',  Values : [ '{}' ]", operation, attr );
-                        pwd = ((ServerStringValue)userPassword).getString();
+                        pwd = ((ClientStringValue)userPassword).getString();
                     }
                     else if ( userPassword instanceof BinaryValue )
                     {

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Mar 29 23:25:42 2010
@@ -1571,16 +1571,6 @@ public class JdbmStore<E> implements Sto
             for ( Value<?> value : mods )
             {
                 entryAttr.remove( value );
-                /*
-                if ( value instanceof ServerStringValue )
-                {
-                    entryAttr.remove( value.getString() );
-                }
-                else
-                {
-                    entryAttr.remove( value.getBytes() );
-                }
-                */
             }
 
             // if nothing is left just remove empty attribute

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -34,8 +34,8 @@ import org.apache.directory.server.kerbe
 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.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 
 
 /**
@@ -286,7 +286,7 @@ public class PrincipalStoreEntryModifier
 
         for ( Value<?> val : krb5key )
         {
-            if ( val instanceof ServerStringValue )
+            if ( val instanceof ClientStringValue )
             {
                 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -29,8 +29,8 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -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 ServerStringValue( type, principal );
+        Value<String> value = new ClientStringValue( 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -42,8 +42,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -103,7 +103,7 @@ public class SearchHandler extends Refer
         }
         
         EqualityNode<String> ocIsReferral = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT,
-            new ServerStringValue( objectClassAttributeType, SchemaConstants.REFERRAL_OC ) );
+            new ClientStringValue( objectClassAttributeType, SchemaConstants.REFERRAL_OC ) );
         
         return ocIsReferral;
     }

Modified: directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original)
+++ directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Mon Mar 29 23:25:42 2010
@@ -204,15 +204,16 @@ public class FrameworkRunner extends Blo
                 classLdapServer = ServerAnnotationProcessor.getLdapServer( getDescription(), directoryService,
                     minPort + 1 );
             }
-            else if ( suite != null && suite.getLdapServer() != null )
+            else if ( ( suite != null ) && ( suite.getLdapServer() != null ) )
             {
                 classLdapServer = suite.getLdapServer();
                 
                 // set directoryService only if there is no class level DS
-                if( directoryService == null )
+                if ( directoryService == null )
                 {
                     directoryService = classLdapServer.getDirectoryService();
                 }
+                
                 // no need to inject the LDIF data that would have been done above
                 // if ApplyLdifs is present
             }
@@ -238,7 +239,7 @@ public class FrameworkRunner extends Blo
 
             if ( classLdapServer != null )
             {
-                if ( suite == null || suite.getLdapServer() != classLdapServer )
+                if ( ( suite == null ) || ( suite.getLdapServer() != classLdapServer ) )
                 {
                     classLdapServer.stop();
                 }

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -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 ServerStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "2" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.STREET_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "2" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+            GreaterEqNode node = new GreaterEqNode( at.getOid(), new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        GreaterEqNode node = new GreaterEqNode( at.getOid(), new ClientStringValue( 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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerStringValue;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -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 ServerStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "2" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.STREET_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "2" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+            LessEqNode node = new LessEqNode( at.getOid(), new ClientStringValue( 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 ServerStringValue( at, "3" ) );
+        LessEqNode node = new LessEqNode( at.getOid(), new ClientStringValue( at, "3" ) );
         new LessEqEvaluator( node, store, schemaManager );
         schemaManager.delete( at );
     }

Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Mon Mar 29 23:25:42 2010
@@ -618,6 +618,7 @@ public class I18n
     public static final String ERR_04473 = "ERR_04473";
     public static final String ERR_04474 = "ERR_04474";
     public static final String ERR_04475 = "ERR_04475";
+    public static final String ERR_04476 = "ERR_04476";
 
 	// ldap-constants
 	public static final String ERR_05001 = "ERR_05001";

Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties (original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Mon Mar 29 23:25:42 2010
@@ -577,6 +577,7 @@ ERR_04472=The attribute '{0}' is incorre
 ERR_04473=Not a valid value
 ERR_04474=Expected string to normalize
 ERR_04475=Expected byte[] to normalize
+ERR_04476=Cannot set an AttributeType {0} when another one ({1}) is already present
 
 # ldap-constants
 ERR_05001=Unknown AuthenticationLevel {0}

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -34,7 +34,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientEntryFactory;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
@@ -224,7 +223,7 @@ public class LdifEntry implements Clonea
             
             if ( value == null )
             {
-                value = new ClientStringValue( null );
+                value = new ClientStringValue( (String)null );
                 attr = new DefaultClientAttribute( id, (Value<?>)value );
             }
             else

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java?rev=928938&r1=928937&r2=928938&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java Mon Mar 29 23:25:42 2010
@@ -69,7 +69,7 @@ public class ACIItemParser
     /**
      * Creates a normalizing ACIItem parser.
      */
-    public ACIItemParser(NameComponentNormalizer normalizer, Map<String, OidNormalizer> oidsMap )
+    public ACIItemParser( NameComponentNormalizer normalizer, Map<String, OidNormalizer> oidsMap )
     {
         this.lexer = new ReusableAntlrACIItemLexer( new StringReader( "" ) );
         this.parser = new ReusableAntlrACIItemParser( lexer );

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=928938&r1=928937&r2=928938&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:25:42 2010
@@ -94,7 +94,7 @@ public final class DefaultServerAttribut
                 {
                     if ( isHR )
                     {
-                        serverValue = new ServerStringValue( attributeType, clientValue.getString() );
+                        serverValue = new ClientStringValue( attributeType, clientValue.getString() );
                     }
                     else
                     {
@@ -108,7 +108,7 @@ public final class DefaultServerAttribut
                     if ( isHR )
                     {
                         // We have to convert the value to a String value first
-                        serverValue = new ServerStringValue( attributeType, 
+                        serverValue = new ClientStringValue( attributeType, 
                             clientValue.getString() );
                     }
                     else
@@ -358,7 +358,7 @@ public final class DefaultServerAttribut
             
             for ( String val:vals )
             {
-                Value<String> newValue = new ServerStringValue( attributeType, val );
+                Value<String> newValue = new ClientStringValue( attributeType, val );
                 
                 if ( add( newValue ) != 0 )
                 {
@@ -395,26 +395,23 @@ public final class DefaultServerAttribut
             {
                 if ( ( val == null ) || val.isNull() )
                 {
-                    Value<String> nullSV = new ServerStringValue( attributeType, (String)null );
+                    Value<String> nullSV = new ClientStringValue( attributeType, (String)null );
                     
                     if ( values.add( nullSV ) )
                     {
                         nbAdded++;
                     }
                 }
-                else if ( val instanceof ServerStringValue )
+                else if ( val instanceof ClientStringValue )
                 {
-                    if ( values.add( val ) )
+                    ClientStringValue stringValue = (ClientStringValue)val;
+                    
+                    if ( stringValue.getAttributeType() == null )
                     {
-                        nbAdded++;
+                        stringValue.apply( attributeType );
                     }
-                }
-                else if ( val instanceof ClientStringValue )
-                {
-                    // If we get a Client value, convert it to a Server value first 
-                    Value<String> serverStringValue = new ServerStringValue( attributeType, val.getString() ); 
                     
-                    if ( values.add( serverStringValue ) )
+                    if ( values.add( val ) )
                     {
                         nbAdded++;
                     }
@@ -543,7 +540,7 @@ public final class DefaultServerAttribut
             // don't find one in the values
             for ( String val:vals )
             {
-                ServerStringValue value = new ServerStringValue( attributeType, val );
+                ClientStringValue value = new ClientStringValue( attributeType, val );
                 
                 if ( !values.contains( value ) )
                 {
@@ -581,18 +578,16 @@ public final class DefaultServerAttribut
         {
             for ( Value<?> val:vals )
             {
-                if ( val instanceof ServerStringValue )
+                if ( val instanceof ClientStringValue )
                 {
-                    if ( !values.contains( val ) )
+                    ClientStringValue stringValue = (ClientStringValue)val;
+                    
+                    if ( stringValue.getAttributeType() == null )
                     {
-                        return false;
+                        stringValue.apply( attributeType );
                     }
-                }
-                else if ( val instanceof ClientStringValue )
-                {
-                    ServerStringValue serverValue = new ServerStringValue( attributeType, val.isNull() ? (String)null : val.getString() );
                     
-                    if ( !values.contains( serverValue ) )
+                    if ( !values.contains( val ) )
                     {
                         return false;
                     }
@@ -706,7 +701,7 @@ public final class DefaultServerAttribut
         
         for ( String val:vals )
         {
-            ServerStringValue value = new ServerStringValue( attributeType, val );
+            ClientStringValue value = new ClientStringValue( attributeType, val );
             removed &= values.remove( value );
         }
         
@@ -732,12 +727,14 @@ public final class DefaultServerAttribut
             {
                 if ( val instanceof ClientStringValue )
                 {
-                    ServerStringValue ssv = new ServerStringValue( attributeType, (String)val.get() );
-                    removed &= values.remove( ssv );
-                }
-                else if ( val instanceof ServerStringValue )
-                {
-                    removed &= values.remove( val );
+                    ClientStringValue stringValue = (ClientStringValue)val;
+                    
+                    if ( stringValue.getAttributeType() == null )
+                    {
+                        stringValue.apply( attributeType );
+                    }
+                    
+                    removed &= values.remove( stringValue );
                 }
                 else
                 {
@@ -969,9 +966,9 @@ public final class DefaultServerAttribut
             for ( Value<?> value:values )
             {
                 // Write the value, using the correct method
-                if ( value instanceof ServerStringValue )
+                if ( value instanceof ClientStringValue )
                 {
-                    ((ServerStringValue)value).serialize( out );
+                    ((ClientStringValue)value).serialize( out );
                 }
                 else
                 {
@@ -1022,8 +1019,8 @@ public final class DefaultServerAttribut
                 
                 if ( isHR )
                 {
-                    value  = new ServerStringValue( attributeType );
-                    ((ServerStringValue)value).deserialize( in );
+                    value  = new ClientStringValue( attributeType );
+                    ((ClientStringValue)value).deserialize( in );
                 }
                 else
                 {



Mime
View raw message