Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B216200B13 for ; Wed, 15 Jun 2016 14:30:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 99DE5160A5D; Wed, 15 Jun 2016 12:30:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 25B31160A4C for ; Wed, 15 Jun 2016 14:30:12 +0200 (CEST) Received: (qmail 49458 invoked by uid 500); 15 Jun 2016 12:30:11 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 49449 invoked by uid 99); 15 Jun 2016 12:30:11 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2016 12:30:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id E0B43C226B for ; Wed, 15 Jun 2016 12:30:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.995 X-Spam-Level: * X-Spam-Status: No, score=1.995 tagged_above=-999 required=6.31 tests=[HTTP_ESCAPED_HOST=1.621, KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id sG6nX1yTEUoy for ; Wed, 15 Jun 2016 12:30:07 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id DB5F45FCD8 for ; Wed, 15 Jun 2016 12:30:06 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 67490E5E74 for ; Wed, 15 Jun 2016 12:30:04 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 663FC3A0798 for ; Wed, 15 Jun 2016 12:30:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1748572 [20/23] - in /directory/apacheds/branches/apacheds-value: ./ benchmarks/installers-maven-plugin/ benchmarks/installers-maven-plugin/.settings/ benchmarks/installers-maven-plugin/target/ benchmarks/installers-maven-plugin/target/cla... Date: Wed, 15 Jun 2016 12:30:01 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160615123004.663FC3A0798@svn01-us-west.apache.org> archived-at: Wed, 15 Jun 2016 12:30:13 -0000 Modified: directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Wed Jun 15 12:29:57 2016 @@ -38,15 +38,16 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Cursor; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.Entry; -import org.apache.directory.api.ldap.model.entry.StringValue; import org.apache.directory.api.ldap.model.entry.Value; import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException; import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.api.ldap.model.filter.EqualityNode; import org.apache.directory.api.ldap.model.message.AliasDerefMode; import org.apache.directory.api.ldap.model.message.SearchScope; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.ldap.model.name.Rdn; +import org.apache.directory.api.ldap.model.schema.AttributeType; import org.apache.directory.api.ldap.model.schema.ObjectClass; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.config.beans.AdsBaseBean; @@ -123,9 +124,9 @@ public class ConfigPartitionReader try { // Create the set of candidates - for ( Value ocValue : objectClass ) + for ( Value ocValue : objectClass ) { - String ocName = ocValue.getString(); + String ocName = ocValue.getValue(); String ocOid = schemaManager.getObjectClassRegistry().getOidByName( ocName ); ObjectClass oc = schemaManager.getObjectClassRegistry().get( ocOid ); @@ -141,9 +142,9 @@ public class ConfigPartitionReader } // Now find the parent OC - for ( Value ocValue : objectClass ) + for ( Value ocValue : objectClass ) { - String ocName = ocValue.getString(); + String ocName = ocValue.getValue(); String ocOid = schemaManager.getObjectClassRegistry().getOidByName( ocName ); ObjectClass oc = schemaManager.getObjectClassRegistry().get( ocOid ); @@ -247,8 +248,8 @@ public class ConfigPartitionReader return; } - Value value = fieldAttr.get(); - String valueStr = value.getString(); + Value value = fieldAttr.get(); + String valueStr = value.getValue(); Class type = beanField.getType(); // Process the value accordingly to its type. @@ -322,9 +323,9 @@ public class ConfigPartitionReader String addMethodName = "add" + Character.toUpperCase( fieldName.charAt( 0 ) ) + fieldName.substring( 1 ); // loop on the values and inject them in the bean - for ( Value value : attribute ) + for ( Value value : attribute ) { - String valueStr = value.getString(); + String valueStr = value.getValue(); try { @@ -477,6 +478,7 @@ public class ConfigPartitionReader /** * Read some configuration element from the DIT using its name + * @throws LdapInvalidAttributeValueException */ public List read( Dn baseDn, String name, SearchScope scope, boolean mandatory ) throws ConfigurationException @@ -485,8 +487,18 @@ public class ConfigPartitionReader // Search for the element starting at some point in the DIT // Prepare the search request - EqualityNode filter = new EqualityNode( - schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT ), new StringValue( name ) ); + AttributeType ocAt = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT ); + EqualityNode filter = null; + + try + { + filter = new EqualityNode( ocAt, new Value( ocAt, name ) ); + } + catch ( LdapInvalidAttributeValueException liave ) + { + throw new ConfigurationException( liave.getMessage() ); + } + Cursor> cursor = null; // Create a container for all the read beans Modified: directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Wed Jun 15 12:29:57 2016 @@ -34,6 +34,7 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.DefaultAttribute; import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException; import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.api.ldap.model.ldif.LdifEntry; import org.apache.directory.api.ldap.model.name.Dn; @@ -505,9 +506,10 @@ public class ConfigWriter * @throws LdapInvalidDnException * @throws IllegalArgumentException * @throws IllegalAccessException + * @throws LdapInvalidAttributeValueException */ private Dn getDn( Dn baseDn, AdsBaseBean bean ) throws LdapInvalidDnException, IllegalArgumentException, - IllegalAccessException + IllegalAccessException, LdapInvalidAttributeValueException { // Getting the class of the bean Class beanClass = bean.getClass(); Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java Wed Jun 15 12:29:57 2016 @@ -123,7 +123,7 @@ public class ChangePasswordConfigReaderT SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Wed Jun 15 12:29:57 2016 @@ -115,7 +115,7 @@ public class ConfigPartitionReaderTest SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java Wed Jun 15 12:29:57 2016 @@ -122,7 +122,7 @@ public class ConfigWriterTest SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); configPartition.initialize(); @@ -168,7 +168,7 @@ public class ConfigWriterTest Entry generatedConfigEntry = generatedConfigEntries.get( i ).getEntry(); // Comparing DNs - assertTrue( originalConfigEntry.getDn().getNormName().equals( generatedConfigEntry.getDn().getNormName() ) ); + assertTrue( originalConfigEntry.getDn().equals( generatedConfigEntry.getDn() ) ); } // Destroying the config partition Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java Wed Jun 15 12:29:57 2016 @@ -113,7 +113,7 @@ public class HttpServerConfigReaderTest SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java Wed Jun 15 12:29:57 2016 @@ -114,7 +114,7 @@ public class KerberosServerConfigReaderT SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); Modified: directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-value/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java Wed Jun 15 12:29:57 2016 @@ -114,7 +114,7 @@ public class LdapServerConfigReaderTest SingleFileLdifPartition configPartition = new SingleFileLdifPartition( schemaManager, dnFactory ); configPartition.setId( "config" ); configPartition.setPartitionPath( new File( configFile ).toURI() ); - configPartition.setSuffixDn( new Dn( "ou=config" ) ); + configPartition.setSuffixDn( new Dn( schemaManager, "ou=config" ) ); configPartition.setSchemaManager( schemaManager ); configPartition.setCacheService( cacheService ); Modified: directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original) +++ directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Wed Jun 15 12:29:57 2016 @@ -1246,7 +1246,7 @@ public class AddIT extends AbstractLdapT javax.naming.directory.Attribute cnAttribute = res.next().getAttributes().get( "cn" ); assertEquals( 2, cnAttribute.size() ); assertTrue( cnAttribute.contains( "Tori,Amos" ) ); - assertTrue( cnAttribute.contains( "Amos\\,Tori" ) ); + assertTrue( cnAttribute.contains( "Amos,Tori" ) ); assertFalse( res.hasMore() ); // search for the implicit added userPassword Modified: directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java (original) +++ directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java Wed Jun 15 12:29:57 2016 @@ -518,7 +518,7 @@ public class PwdModifyIT extends Abstrac PasswordPolicyDecorator passwordPolicyRequestControl = new PasswordPolicyDecorator( LdapApiServiceFactory.getSingleton(), new PasswordPolicyImpl() ); PasswordModifyRequest selfPwdModifyRequest = new PasswordModifyRequestImpl(); - selfPwdModifyRequest.setUserIdentity( Dn.getBytes( userDn ) ); + selfPwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( userDn.getNormName() ) ); selfPwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret3" ) ); selfPwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "1234567" ) ); selfPwdModifyRequest.addControl( passwordPolicyRequestControl ); @@ -538,7 +538,7 @@ public class PwdModifyIT extends Abstrac Dn otherUserDn = new Dn( "cn=UserZZ,ou=system" ); PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl(); - pwdModifyRequest.setUserIdentity( Dn.getBytes( otherUserDn ) ); + pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( otherUserDn.getNormName() ) ); pwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret4" ) ); pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "1234567" ) ); pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( pwdModifyRequest ); Modified: directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original) +++ directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Wed Jun 15 12:29:57 2016 @@ -309,7 +309,7 @@ public class ModifyRdnIT extends Abstrac // Check values of cn Attribute cn = tori.getAttributes( "" ).get( "cn" ); - assertTrue( cn.contains( Strings.toLowerCaseAscii( newCn ) ) ); + assertTrue( cn.contains( newCn ) ); assertTrue( cn.contains( oldCn ) ); // old value is still there assertEquals( 2, cn.size() ); @@ -356,7 +356,7 @@ public class ModifyRdnIT extends Abstrac // Check values of cn Attribute cn = tori.getAttributes( "" ).get( "cn" ); - assertTrue( cn.contains( Strings.toLowerCaseAscii( newCn ) ) ); + assertTrue( cn.contains( newCn ) ); assertTrue( cn.contains( oldCn ) ); // old value is still there assertEquals( 2, cn.size() ); @@ -411,7 +411,7 @@ public class ModifyRdnIT extends Abstrac // Check values of cn cn = tori.getAttributes( "" ).get( "cn" ); - assertTrue( cn.contains( Strings.toLowerCaseAscii( newCn ) ) ); + assertTrue( cn.contains( newCn ) ); assertTrue( !cn.contains( oldCn ) ); // old value is gone assertTrue( cn.contains( alternateCn ) ); // alternate value is still available assertEquals( 2, cn.size() ); @@ -462,7 +462,7 @@ public class ModifyRdnIT extends Abstrac assertTrue( cn.contains( cnVal ) ); assertEquals( "Number of cn occurences", 1, cn.size() ); Attribute sn = tori.getAttributes( "" ).get( "sn" ); - assertTrue( sn.contains( Strings.toLowerCaseAscii( snVal ) ) ); + assertTrue( sn.contains( snVal ) ); assertEquals( "Number of sn occurences", 1, sn.size() ); // Remove entry (use new rdn) @@ -550,7 +550,7 @@ public class ModifyRdnIT extends Abstrac // Check values of ou Attribute ou = org.getAttributes( "" ).get( "ou" ); - assertTrue( ou.contains( Strings.toLowerCaseAscii( newOu ) ) ); + assertTrue( ou.contains( newOu ) ); assertTrue( !ou.contains( oldOu ) ); // old value is gone assertEquals( 1, ou.size() ); @@ -706,10 +706,10 @@ public class ModifyRdnIT extends Abstrac // Check attributes Attribute cnAttr = newCtx.getAttributes( "" ).get( "cn" ); assertEquals( 1, cnAttr.size() ); - assertTrue( cnAttr.contains( "tori amos" ) ); + assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); - assertTrue( snAttr.contains( "amos" ) ); + assertTrue( snAttr.contains( "Amos" ) ); Attribute descriptionAttr = newCtx.getAttributes( "" ).get( "description" ); assertEquals( 1, descriptionAttr.size() ); @@ -746,10 +746,10 @@ public class ModifyRdnIT extends Abstrac // Check attributes Attribute cnAttr = newCtx.getAttributes( "" ).get( "cn" ); assertEquals( 1, cnAttr.size() ); - assertTrue( cnAttr.contains( "tori amos" ) ); + assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); - assertTrue( snAttr.contains( "amos" ) ); + assertTrue( snAttr.contains( "Amos" ) ); Attribute descriptionAttr = newCtx.getAttributes( "" ).get( "description" ); assertEquals( 1, descriptionAttr.size() ); @@ -786,10 +786,10 @@ public class ModifyRdnIT extends Abstrac // Check attributes Attribute cnAttr = newCtx.getAttributes( "" ).get( "cn" ); assertEquals( 1, cnAttr.size() ); - assertTrue( cnAttr.contains( "tori amos" ) ); + assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); - assertTrue( snAttr.contains( "amos" ) ); + assertTrue( snAttr.contains( "Amos" ) ); Attribute descriptionAttr = newCtx.getAttributes( "" ).get( "description" ); assertEquals( 1, descriptionAttr.size() ); @@ -826,10 +826,10 @@ public class ModifyRdnIT extends Abstrac // Check attributes Attribute cnAttr = newCtx.getAttributes( "" ).get( "cn" ); assertEquals( 1, cnAttr.size() ); - assertTrue( cnAttr.contains( "tori amos" ) ); + assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); - assertTrue( snAttr.contains( "amos" ) ); + assertTrue( snAttr.contains( "Amos" ) ); Attribute descriptionAttr = newCtx.getAttributes( "" ).get( "description" ); assertNull( descriptionAttr ); @@ -872,7 +872,7 @@ public class ModifyRdnIT extends Abstrac assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); - assertTrue( snAttr.contains( "amos" ) ); + assertTrue( snAttr.contains( "Amos" ) ); Attribute descriptionAttr = newCtx.getAttributes( "" ).get( "description" ); assertEquals( 1, descriptionAttr.size() ); Attribute telephoneNumberAttr = newCtx.getAttributes( "" ).get( "telephoneNumber" ); @@ -974,7 +974,7 @@ public class ModifyRdnIT extends Abstrac // Check attributes Attribute cnAttr = newCtx.getAttributes( "" ).get( "cn" ); assertEquals( 1, cnAttr.size() ); - assertTrue( cnAttr.contains( "tori amos" ) ); + assertTrue( cnAttr.contains( "Tori Amos" ) ); Attribute snAttr = newCtx.getAttributes( "" ).get( "sn" ); assertEquals( 1, snAttr.size() ); assertTrue( snAttr.contains( "Amos" ) ); Modified: directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/ppolicy/PasswordPolicyIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/ppolicy/PasswordPolicyIT.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/ppolicy/PasswordPolicyIT.java (original) +++ directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/ppolicy/PasswordPolicyIT.java Wed Jun 15 12:29:57 2016 @@ -1,5 +1,5 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one +x@x@@ * 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 Modified: directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java (original) +++ directory/apacheds/branches/apacheds-value/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java Wed Jun 15 12:29:57 2016 @@ -919,7 +919,7 @@ public class MockSyncReplConsumer implem } // Check if the OldRdn has been deleted - boolean deleteOldRdn = remoteEntry.contains( localRdn.getNormType(), localRdn.getNormValue() ); + boolean deleteOldRdn = remoteEntry.contains( localRdn.getNormType(), localRdn.getNormName() ); switch ( modDnType ) { @@ -1063,8 +1063,7 @@ public class MockSyncReplConsumer implem if ( size == 1 ) { String uuid = Strings.uuidToString( limitedUuidList.get( 0 ) ); - filter = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, - new org.apache.directory.api.ldap.model.entry.StringValue( uuid ) ); + filter = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, uuid ); if ( isRefreshPresent ) { filter = new NotNode( filter ); @@ -1084,8 +1083,7 @@ public class MockSyncReplConsumer implem for ( int i = 0; i < size; i++ ) { String uuid = Strings.uuidToString( limitedUuidList.get( i ) ); - ExprNode uuidEqNode = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, - new org.apache.directory.api.ldap.model.entry.StringValue( uuid ) ); + ExprNode uuidEqNode = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, uuid ); if ( isRefreshPresent ) { Modified: directory/apacheds/branches/apacheds-value/service/src/main/java/org/apache/directory/server/ApacheDsService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original) +++ directory/apacheds/branches/apacheds-value/service/src/main/java/org/apache/directory/server/ApacheDsService.java Wed Jun 15 12:29:57 2016 @@ -207,7 +207,7 @@ public class ApacheDsService LOG.info( "Registering config change listener" ); ConfigChangeListener configListener = new ConfigChangeListener( cpReader, directoryService ); - NotificationCriteria criteria = new NotificationCriteria(); + NotificationCriteria criteria = new NotificationCriteria( directoryService.getSchemaManager() ); criteria.setBase( configPartition.getSuffixDn() ); criteria.setEventMask( EventType.ALL_EVENT_TYPES_MASK ); Modified: directory/apacheds/branches/apacheds-value/src/site/site.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/src/site/site.xml?rev=1748572&r1=1748571&r2=1748572&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-value/src/site/site.xml (original) +++ directory/apacheds/branches/apacheds-value/src/site/site.xml Wed Jun 15 12:29:57 2016 @@ -19,35 +19,11 @@ @author Apache Directory Project --> - - images/server-icon_128x128.png - http://directory.apache.org/apacheds/1.5/ - ${project.name} - - - org.apache.directory.skins - directory-skin - ${skin.version} - - - - - - - - - - - - - - - + + + + +