[maven-release-plugin] copy for tag 1.0.0-M25
git-svn-id: https://svn.apache.org/repos/asf/directory/shared/tags/1.0.0-M25@1637341 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnTest.java b/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnTest.java
index 229e736..246a0ec 100644
--- a/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnTest.java
+++ b/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnTest.java
@@ -34,8 +34,6 @@
import java.util.Iterator;
import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.name.Ava;
-import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
import org.apache.directory.api.util.Strings;
@@ -234,8 +232,32 @@
public void testRdnPairCharAttributeValue() throws LdapException
{
String rdn = Strings.utf8ToString( new byte[]
- { 'l', '=', '\\', ',', '\\', '=', '\\', '+', '\\', '<', '\\', '>', '#', '\\', ';', '\\', '\\', '\\', '"', '\\',
- 'C', '3', '\\', 'A', '9' } );
+ {
+ 'l',
+ '=',
+ '\\',
+ ',',
+ '\\',
+ '=',
+ '\\',
+ '+',
+ '\\',
+ '<',
+ '\\',
+ '>',
+ '#',
+ '\\',
+ ';',
+ '\\',
+ '\\',
+ '\\',
+ '"',
+ '\\',
+ 'C',
+ '3',
+ '\\',
+ 'A',
+ '9' } );
assertEquals( "2.5.4.7=\\,\\=\\+\\<\\>#\\;\\\\\\\"\u00e9", new Rdn( schemaManager, rdn ).getNormName() );
}
@@ -899,7 +921,7 @@
{
// space doesn't need to be escaped in the middle of a string
assertEquals( "a b", Rdn.escapeValue( "a b" ) );
- assertEquals( "ä b c", Rdn.escapeValue( "ä b c" ) );
+ assertEquals( "\u00e4 b c", Rdn.escapeValue( "\u00e4 b c" ) );
assertEquals( "a b c d", Rdn.escapeValue( "a b c d" ) );
// space must be escaped at the beginning and the end of a string
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
index c0722c5..0938c79 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
@@ -93,6 +93,7 @@
try
{
boolean reverseOrder = BooleanDecoder.parse( value );
+
if ( IS_DEBUG )
{
LOG.debug( "ReverseOrder = " + reverseOrder );
@@ -142,12 +143,14 @@
BerValue value = container.getCurrentTLV().getValue();
String matchingRuleOid = Strings.utf8ToString( value.getData() );
+
if ( IS_DEBUG )
{
LOG.debug( "MatchingRuleOid = " + matchingRuleOid );
}
container.getCurrentKey().setMatchingRuleId( matchingRuleOid );
+ container.setGrammarEndAllowed( true );
}
} );
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
index 0fbfb4f..67e1efa 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
@@ -215,7 +215,7 @@
catch ( LdapInvalidDnException e )
{
// This might still be a valid DN (Windows AD binding for instance)
- LOG.debug( "Unable to convert the name to a DN.", e );
+ LOG.debug( "Unable to convert the name to a DN." );
this.dn = null;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortKey.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortKey.java
index 4e4f02e..7cef037 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortKey.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortKey.java
@@ -20,8 +20,6 @@
package org.apache.directory.api.ldap.model.message.controls;
-
-
/**
* Datastructure to store the Attribute name, matching rule ID of the attribute<br>
* and the sort order.
@@ -41,9 +39,9 @@
private String matchingRuleId;
/**
- * A flag to set to true to get the result in reverse order
+ * A flag to set to true to get the result in reverse order. Default to false
*/
- private boolean reverseOrder;
+ private boolean reverseOrder = false;
/**
@@ -68,7 +66,7 @@
this( attributeTypeDesc, matchingRuleId, false );
}
-
+
/**
* Create a new instance of a SortKey for a give AttributeType
*
@@ -148,7 +146,7 @@
sb.append( "SortKey : [" );
sb.append( attributeTypeDesc );
-
+
if ( matchingRuleId != null )
{
sb.append( ", " ).append( matchingRuleId );
