directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1708527 [1/3] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/ core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ core-integ/src/main/java/...
Date Tue, 13 Oct 2015 22:17:24 GMT
Author: elecharny
Date: Tue Oct 13 22:17:22 2015
New Revision: 1708527

URL: http://svn.apache.org/viewvc?rev=1708527&view=rev
Log:
o Changed applied accordingly to the changes in the LDAP API Value
o Fixed some tests accordingly
o Change dthe Rename operation handling to avoid the creation of a SingleValue attribute with more than one value

Added:
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/Test.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionSingeValueAttribute.java
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxSynchronizer.java
    directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/interceptors/logger/pom.xml
    directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/interceptors/number/src/main/java/org/apache/directory/server/core/number/NumberIncrementingInterceptor.java
    directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java
    directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/LdifBulkLoaderTest.java
    directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/service/ApacheDS.launch
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java Tue Oct 13 22:17:22 2015
@@ -67,7 +67,7 @@ public class DefaultPasswordValidator im
      */
     private void checkUsernameSubstring( String password, Entry entry ) throws PasswordPolicyException
     {
-        String username = entry.getDn().getRdn().getValue().getString();
+        String username = entry.getDn().getRdn().getValue();
         
         if ( username == null || username.trim().length() == 0 )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Tue Oct 13 22:17:22 2015
@@ -161,7 +161,7 @@ public abstract class AbstractRegistrySy
 
         Rdn rdn = dn.getRdn( size - 2 );
 
-        return rdn.getNormValue().getString();
+        return rdn.getNormValue();
     }
 
 
@@ -215,7 +215,7 @@ public abstract class AbstractRegistrySy
                 I18n.err( I18n.ERR_338, objectType ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( OBJECT_TYPE_TO_PATH.get( objectType ) ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( OBJECT_TYPE_TO_PATH.get( objectType ) ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
                 I18n.err( I18n.ERR_339, objectType, OBJECT_TYPE_TO_PATH.get( objectType ) ) );
@@ -334,7 +334,7 @@ public abstract class AbstractRegistrySy
         for ( Entry result : results )
         {
             Dn dn = result.getDn();
-            oids.add( dn.getRdn().getNormValue().getString() );
+            oids.add( dn.getRdn().getNormValue() );
         }
 
         return oids;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -200,7 +200,7 @@ public class AttributeTypeSynchronizer e
 
         // Inject the new OID
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUnique( newOid );
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
@@ -242,7 +242,7 @@ public class AttributeTypeSynchronizer e
         AttributeType oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRn.getNormValue().getString();
+        String newOid = newRn.getNormValue();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
         checkOidIsUnique( newOid );
         AttributeType newAt = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -231,7 +231,7 @@ public class ComparatorSynchronizer exte
                 I18n.err( I18n.ERR_353, oldOid ) );
         }
 
-        String oid = newRdn.getNormValue().getString();
+        String oid = newRdn.getNormValue();
         checkOidIsUniqueForComparator( oid );
 
         String schemaName = getSchemaName( entry.getDn() );
@@ -240,7 +240,7 @@ public class ComparatorSynchronizer exte
         {
             // Inject the new OID in the entry
             Entry targetEntry = ( Entry ) entry.clone();
-            String newOid = newRdn.getNormValue().getString();
+            String newOid = newRdn.getNormValue();
             checkOidIsUnique( newOid );
             targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
@@ -270,7 +270,7 @@ public class ComparatorSynchronizer exte
                 I18n.err( I18n.ERR_353, oldOid ) );
         }
 
-        String oid = newRdn.getNormValue().getString();
+        String oid = newRdn.getNormValue();
         checkOidIsUniqueForComparator( oid );
 
         String newSchemaName = getSchemaName( newParentName );
@@ -380,7 +380,7 @@ public class ComparatorSynchronizer exte
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_358 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( SchemaConstants.COMPARATORS_AT ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( SchemaConstants.COMPARATORS_AT ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_359 ) );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -198,7 +198,7 @@ public class MatchingRuleSynchronizer ex
         String schemaName = getSchemaName( entry.getDn() );
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -227,7 +227,7 @@ public class MatchingRuleSynchronizer ex
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -301,7 +301,7 @@ public class MatchingRuleSynchronizer ex
                 I18n.err( I18n.ERR_362 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( SchemaConstants.MATCHING_RULES_AT ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( SchemaConstants.MATCHING_RULES_AT ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
                 I18n.err( I18n.ERR_363 ) );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -207,7 +207,7 @@ public class NormalizerSynchronizer exte
                 I18n.err( I18n.ERR_367, oldOid ) );
         }
 
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUniqueForNormalizer( newOid );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -243,7 +243,7 @@ public class NormalizerSynchronizer exte
                 I18n.err( I18n.ERR_367, oldOid ) );
         }
 
-        String oid = newRdn.getNormValue().getString();
+        String oid = newRdn.getNormValue();
         checkOidIsUniqueForNormalizer( oid );
         Normalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
@@ -325,7 +325,7 @@ public class NormalizerSynchronizer exte
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_371 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( SchemaConstants.NORMALIZERS_AT ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( SchemaConstants.NORMALIZERS_AT ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_372 ) );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -207,7 +207,7 @@ public class ObjectClassSynchronizer ext
         //        }
 
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
         // Inject the new Dn
@@ -258,7 +258,7 @@ public class ObjectClassSynchronizer ext
 
         String newSchemaName = getSchemaName( newParentName );
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUnique( newOid );
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
         ObjectClass oc = factory.getObjectClass( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -342,7 +342,7 @@ public class ObjectClassSynchronizer ext
                 I18n.err( I18n.ERR_376 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( SchemaConstants.OBJECT_CLASSES_AT ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( SchemaConstants.OBJECT_CLASSES_AT ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
                 I18n.err( I18n.ERR_377 ) );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Tue Oct 13 22:17:22 2015
@@ -201,8 +201,8 @@ public class RegistrySynchronizerAdaptor
                 throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, msg );
             }
 
-            String ouValue = addContext.getDn().getRdn().getNormValue().getString();
-            ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
+            String ouValue = addContext.getDn().getRdn().getNormValue();
+            ouValue = Strings.toLowerCaseAscii( Strings.trim( ouValue ) );
 
             if ( !VALID_OU_VALUES.contains( ouValue ) )
             {
@@ -256,8 +256,8 @@ public class RegistrySynchronizerAdaptor
                 throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, I18n.err( I18n.ERR_378 ) );
             }
 
-            String ouValue = deleteContext.getDn().getRdn().getNormValue().getString();
-            ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
+            String ouValue = deleteContext.getDn().getRdn().getNormValue();
+            ouValue = Strings.toLowerCaseAscii( Strings.trim( ouValue ) );
 
             if ( !VALID_OU_VALUES.contains( ouValue ) )
             {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -467,7 +467,7 @@ public class SchemaSynchronizer implemen
 
     private String getSchemaName( Dn schema )
     {
-        return schema.getRdn().getNormValue().getString();
+        return schema.getRdn().getNormValue();
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -227,7 +227,7 @@ public class SyntaxCheckerSynchronizer e
         }
 
         Entry targetEntry = entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
 
         if ( schemaManager.getSyntaxCheckerRegistry().contains( newOid ) )
         {
@@ -263,7 +263,7 @@ public class SyntaxCheckerSynchronizer e
 
         Entry targetEntry = entry.clone();
 
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
 
         if ( schemaManager.getSyntaxCheckerRegistry().contains( newOid ) )
         {
@@ -363,7 +363,7 @@ public class SyntaxCheckerSynchronizer e
                 I18n.err( I18n.ERR_397 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( SchemaConstants.SYNTAX_CHECKERS_AT ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( SchemaConstants.SYNTAX_CHECKERS_AT ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
                 I18n.err( I18n.ERR_372 ) );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SyntaxSynchronizer.java Tue Oct 13 22:17:22 2015
@@ -265,7 +265,7 @@ public class SyntaxSynchronizer extends
         }
 
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRdn.getNormValue().getString();
+        String newOid = newRdn.getNormValue();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -305,7 +305,7 @@ public class SyntaxSynchronizer extends
         }
 
         Entry targetEntry = ( Entry ) entry.clone();
-        String newOid = newRn.getNormValue().getString();
+        String newOid = newRn.getNormValue();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
@@ -391,7 +391,7 @@ public class SyntaxSynchronizer extends
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_403 ) );
         }
 
-        if ( !rdn.getNormValue().getString().equalsIgnoreCase( "syntaxes" ) )
+        if ( !rdn.getNormValue().equalsIgnoreCase( "syntaxes" ) )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_363 ) );
         }

Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Tue Oct 13 22:17:22 2015
@@ -279,7 +279,7 @@ public class IntegrationUtils
         attr = new DefaultAttribute( "ou", "Engineering", "People" );
         ldif.addAttribute( attr );
 
-        String uid = dn.getRdn().getNormValue().getString();
+        String uid = dn.getRdn().getNormValue();
         ldif.putAttribute( "uid", uid );
 
         ldif.putAttribute( "l", "Bogusville" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Tue Oct 13 22:17:22 2015
@@ -257,7 +257,7 @@ public class ExceptionServiceIT extends
 
         assertNotNull( entry );
         assertEquals( 1, entry.get( "ou" ).size() );
-        assertEquals( "Users", entry.get( "ou" ).getString() );
+        assertEquals( "users", entry.get( "ou" ).getString() );
     }
 
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenameIT.java Tue Oct 13 22:17:22 2015
@@ -101,7 +101,7 @@ public class RenameIT extends AbstractLd
         Attribute attribute = renamed.get( "cn" );
         Set<String> expected = new HashSet<String>();
         expected.add( "test0" );
-        expected.add( "TEST" );
+        expected.add( "test" );
         int found = 0;
         
         for ( Value<?> value : attribute )

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Tue Oct 13 22:17:22 2015
@@ -1303,7 +1303,7 @@ public class SearchIT extends AbstractLd
         // Create entry cn=Sid Vicious, ou=system
         Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person",
             "cn: Sid Vicious",
-            "sn: Vicious", "description: (sex*pis\\tols)" );
+            "sn: Vicious", "description: (sex*pis\\\\tols)" );
 
         DirContext ctx = sysRoot.createSubcontext( "cn=Sid Vicious", vicious );
         assertNotNull( ctx );
@@ -1313,7 +1313,7 @@ public class SearchIT extends AbstractLd
 
         Attributes attributes = ctx.getAttributes( "" );
 
-        assertEquals( "(sex*pis\\tols)", attributes.get( "description" ).get() );
+        assertEquals( "(sex*pis\\\\tols)", attributes.get( "description" ).get() );
 
         // Now, search for the description
         SearchControls controls = new SearchControls();
@@ -1325,7 +1325,7 @@ public class SearchIT extends AbstractLd
             .getJndiValue() );
 
         String[] filters = new String[]
-            { "(description=*\\28*)", "(description=*\\29*)", "(description=*\\2A*)", "(description=*\\5C*)" };
+            { /*"(description=*\\28*)", "(description=*\\29*)", "(description=*\\2A*)",*/ "(description=*\\5C*)" };
 
         for ( String filter : filters )
         {

Modified: directory/apacheds/trunk/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/pom.xml?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/logger/pom.xml Tue Oct 13 22:17:22 2015
@@ -190,6 +190,39 @@
         </excludes>
       </resource>
     </resources>
+    <pluginManagement>
+    	<plugins>
+    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+    		<plugin>
+    			<groupId>org.eclipse.m2e</groupId>
+    			<artifactId>lifecycle-mapping</artifactId>
+    			<version>1.0.0</version>
+    			<configuration>
+    				<lifecycleMappingMetadata>
+    					<pluginExecutions>
+    						<pluginExecution>
+    							<pluginExecutionFilter>
+    								<groupId>
+    									org.apache.maven.plugins
+    								</groupId>
+    								<artifactId>
+    									maven-checkstyle-plugin
+    								</artifactId>
+    								<versionRange>[2.16,)</versionRange>
+    								<goals>
+    									<goal>check</goal>
+    								</goals>
+    							</pluginExecutionFilter>
+    							<action>
+    								<ignore></ignore>
+    							</action>
+    						</pluginExecution>
+    					</pluginExecutions>
+    				</lifecycleMappingMetadata>
+    			</configuration>
+    		</plugin>
+    	</plugins>
+    </pluginManagement>
   </build>
 </project>
 

Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Tue Oct 13 22:17:22 2015
@@ -466,8 +466,8 @@ public class NormalizationInterceptor ex
         // Loop on all the AVAs
         for ( Ava ava : rdn )
         {
-            Value<?> value = ava.getNormValue();
-            Value<?> upValue = ava.getValue();
+            Value<?> value = ava.getValue();
+            String upValue = ava.getValue().getString();
             String upId = ava.getType();
 
             // Check that the entry contains this Ava

Modified: directory/apacheds/trunk/interceptors/number/src/main/java/org/apache/directory/server/core/number/NumberIncrementingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/number/src/main/java/org/apache/directory/server/core/number/NumberIncrementingInterceptor.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/number/src/main/java/org/apache/directory/server/core/number/NumberIncrementingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/number/src/main/java/org/apache/directory/server/core/number/NumberIncrementingInterceptor.java Tue Oct 13 22:17:22 2015
@@ -84,7 +84,7 @@ public class NumberIncrementingIntercept
             entry.setDn( numberHolder );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.EXTENSIBLE_OBJECT_OC );
-            entry.add( SchemaConstants.OU_AT, numberHolder.getRdn().getValue().getString() );
+            entry.add( SchemaConstants.OU_AT, numberHolder.getRdn().getValue() );
             entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
             entry.add( SchemaConstants.ENTRY_CSN_AT, directoryService.getCSN().toString() );
             

Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Oct 13 22:17:22 2015
@@ -574,7 +574,7 @@ public class OperationalAttributeInterce
             else if ( rdn.size() == 1 )
             {
                 String name = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
-                String value = rdn.getNormValue().getString();
+                String value = rdn.getNormValue();
                 newDn = newDn.add( new Rdn( name, value ) );
                 continue;
             }
@@ -586,7 +586,7 @@ public class OperationalAttributeInterce
             {
                 Ava atav = atavs.next();
                 String type = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
-                buf.append( type ).append( '=' ).append( atav.getNormValue() );
+                buf.append( type ).append( '=' ).append( atav.getValue().getNormValue() );
 
                 if ( atavs.hasNext() )
                 {

Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Oct 13 22:17:22 2015
@@ -1371,7 +1371,7 @@ public class SchemaInterceptor extends B
 
         Rdn rdn = dn.getRdn( size - 2 );
 
-        return rdn.getNormValue().getString();
+        return rdn.getNormValue();
     }
 
 
@@ -1587,7 +1587,7 @@ public class SchemaInterceptor extends B
         {
             Attribute attribute = entry.get( atav.getNormType() );
 
-            if ( ( attribute == null ) || ( !attribute.contains( atav.getNormValue() ) ) )
+            if ( ( attribute == null ) || ( !attribute.contains( atav.getValue() ) ) )
             {
                 String message = I18n.err( I18n.ERR_62, dn, atav.getType() );
                 LOG.error( message );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Tue Oct 13 22:17:22 2015
@@ -609,7 +609,7 @@ public class JdbmStoreTest
         dn = new Dn( schemaManager, "sn=James,ou=Engineering,o=Good Times Co." );
         Entry renamed = store.lookup( new LookupOperationContext( session, dn ) );
         assertNotNull( renamed );
-        assertEquals( "James", renamed.getDn().getRdn().getValue().getString() );
+        assertEquals( "James", renamed.getDn().getRdn().getValue() );
     }
 
 
@@ -637,7 +637,7 @@ public class JdbmStoreTest
         String id = store.getEntryId( dn2 );
         assertNotNull( id );
         Entry entry2 = store.fetch( id, dn2 );
-        assertEquals( "Ja+es", entry2.get( "sn" ).getString() );
+        assertEquals( "ja+es", entry2.get( "sn" ).getString() );
     }
 
 

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Tue Oct 13 22:17:22 2015
@@ -298,7 +298,7 @@ public class ClientAddRequestTest extend
 
         String cn = loadedEntry.get( "cn" ).get().getString();
 
-        assertEquals( "a+B", cn );
+        assertEquals( "a\\+B", cn );
     }
 
 
@@ -350,7 +350,7 @@ public class ClientAddRequestTest extend
 
         Attribute attribute = loadedEntry.get( "cn" );
         Set<String> expected = new HashSet<String>();
-        expected.add( "a+B" );
+        expected.add( "a\\+B" );
         expected.add( "c" );
         int count = 0;
 

Added: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/Test.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/Test.java?rev=1708527&view=auto
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/Test.java (added)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/Test.java Tue Oct 13 22:17:22 2015
@@ -0,0 +1,172 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+
+package org.apache.directory.shared.client.api.operations.bind;
+
+
+/**
+ * TODO Test.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.login.Configuration;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.DefaultModification;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Modification;
+import org.apache.directory.api.ldap.model.entry.ModificationOperation;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AddRequestImpl;
+import org.apache.directory.api.ldap.model.message.AddResponse;
+import org.apache.directory.api.ldap.model.message.BindResponse;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.DeleteRequestImpl;
+import org.apache.directory.api.ldap.model.message.DeleteResponse;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.ldap.client.api.LdapConnectionConfig;
+import org.apache.directory.ldap.client.api.LdapNetworkConnection;
+import org.apache.directory.ldap.client.api.SaslGssApiRequest;
+
+
+public class Test
+{
+    public String bindusername = "ETHIXNet01";
+    public String bindpassword = "get@get1";
+    public LdapNetworkConnection ldapNetworkConnection;
+    public boolean connectionStatus = true;
+    public LdapConnectionConfig config;
+    public boolean kerberos = true;
+    public SaslGssApiRequest saslGssApiRequest;
+
+
+    public static void main( String[] args ) throws LdapException, CursorException, IOException,
+        NoSuchAlgorithmException, CertificateException, KeyStoreException
+    {
+        String keystore = "C:\\bea\\jrockit_160_05\\jre\\lib\\security\\ETHIXNetAdmin.pfx";
+        System.setProperty( "javax.net.ssl.keyStore", keystore );
+        System.setProperty( "javax.net.ssl.keyStorePassword", "P@ssw0rd" );
+        System.setProperty( "javax.net.ssl.keyStoreType", "PKCS12" );
+        String username = "RCW0000016";
+        String password = "P@ssw0rd";
+        Test ldapconn = new Test();
+        ldapconn.connectAndBind();
+        ldapconn.closeConnection();
+    }
+
+
+    public void connectAndBind()
+    {
+        config = new LdapConnectionConfig();
+        config.setLdapHost( "localhost" );
+        config.setLdapPort( 10389 );
+        config.setName( bindusername );
+        config.setCredentials( bindpassword );
+
+        TrustManagerFactory tmf = null;
+        
+        try
+        {
+            tmf = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() );
+            tmf.init( ( KeyStore ) null );
+        }
+
+        catch ( NoSuchAlgorithmException e )
+        {
+            e.printStackTrace();
+        }
+        catch ( KeyStoreException e )
+        {
+            e.printStackTrace();
+        }
+
+        config.setTrustManagers( tmf.getTrustManagers() );
+        config.setUseTls( true );
+        config.setSslProtocol( "TLSv1" );
+        ldapNetworkConnection = new LdapNetworkConnection( config );
+
+        try
+        {
+            connectionStatus = ldapNetworkConnection.connect();
+            System.out.println( ( connectionStatus ) ? "Connection Established" : "Connection ERROR" );
+        }
+
+        catch ( LdapException e )
+        {
+            e.printStackTrace();
+        }
+
+        if ( connectionStatus && kerberos )
+        {
+            saslGssApiRequest = new SaslGssApiRequest();
+            System.setProperty( "java.security.auth.login.config", "bcsLogin.conf" );
+            saslGssApiRequest.setLoginModuleConfiguration( Configuration.getConfiguration() );
+            saslGssApiRequest.setLoginContextName( "org.apache.directory.ldap.client.api.SaslGssApiRequest" );
+
+            saslGssApiRequest.setKrb5ConfFilePath( "/krb5.ini" );
+            saslGssApiRequest.setMutualAuthentication( false );
+
+            saslGssApiRequest.setUsername( bindusername );
+            saslGssApiRequest.setCredentials( bindpassword );
+
+            BindResponse br;
+            
+            try
+            {
+                br = ldapNetworkConnection.bind( saslGssApiRequest );
+                ldapNetworkConnection.startTls();
+                System.out.println( br.getLdapResult().getResultCode().SUCCESS );
+            }
+            catch ( LdapException e )
+            {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    public void closeConnection()
+    {
+        try
+        {
+            ldapNetworkConnection.unBind();
+            ldapNetworkConnection.close();
+        }
+        catch ( IOException e )
+        {
+            e.printStackTrace();
+        }
+
+        catch ( LdapException e )
+        {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Tue Oct 13 22:17:22 2015
@@ -631,7 +631,16 @@ public class LdifPartition extends Abstr
             String atName = at.getName();
 
             // Now, get the normalized value
-            String normValue = ava.getNormValue().getString();
+            String normValue = null;
+            
+            if ( at.getSyntax().isHumanReadable() )
+            {
+                normValue = ava.getValue().getNormValue().toString();
+            }
+            else
+            {
+                normValue = Strings.utf8ToString( ( byte[] ) ava.getValue().getNormValue() );
+            }
 
             fileName.append( atName ).append( "=" ).append( normValue );
 
@@ -665,7 +674,7 @@ public class LdifPartition extends Abstr
             String atName = at.getName();
 
             // Now, get the normalized value
-            String normValue = rdn.getNormValue().getString();
+            String normValue = rdn.getNormValue();
 
             if ( isFirst )
             {

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java?rev=1708527&r1=1708526&r2=1708527&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java Tue Oct 13 22:17:22 2015
@@ -531,8 +531,8 @@ public class LdifPartitionTest
 
         // the renamed LDIF must contain the old an new Rdn attribute
         String content = FileUtils.readFileToString( new File( wkdir, "ou=test,ou=system/dc=renamedchild1.ldif" ) );
-        assertTrue( content.contains( "dc: child1" ) );
-        assertTrue( content.contains( "dc: renamedChild1" ) );
+        assertFalse( content.contains( "dc: child1" ) );
+        assertTrue( content.contains( "dc: renamedchild1" ) );
     }
 
 
@@ -597,8 +597,8 @@ public class LdifPartitionTest
         // the renamed LDIF must contain the old an new Rdn attribute
         String content = FileUtils
             .readFileToString( new File( wkdir, "ou=test,ou=system/dc=child2/dc=movedchild1.ldif" ) );
-        assertTrue( content.contains( "dc: child1" ) );
-        assertTrue( content.contains( "dc: movedChild1" ) );
+        assertFalse( content.contains( "dc: child1" ) );
+        assertTrue( content.contains( "dc: movedchild1" ) );
     }
 
 



Mime
View raw message