You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/05/09 17:22:21 UTC
svn commit: r1743011 [12/13] - in /directory/shared/branches/shared-value:
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/
dsml/parser/src/test/java/org/apache/direc...
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java Mon May 9 17:22:19 2016
@@ -89,7 +89,7 @@ public class RdnTest
@Test
public void testRdnSimple() throws LdapException
{
- assertEquals( "a=b", new Rdn( "a = b" ).getNormName() );
+ assertEquals( "a = b", new Rdn( "a = b" ).getName() );
}
@@ -101,7 +101,7 @@ public class RdnTest
@Test
public void testRdnComposite() throws LdapException
{
- assertEquals( "a=b+c=d", new Rdn( "a = b + c = d" ).getNormName() );
+ assertEquals( "a = b + c = d", new Rdn( "a = b + c = d" ).getName() );
}
@@ -114,22 +114,22 @@ public class RdnTest
@Test
public void testRdnCompositeWithSpace() throws LdapException
{
- assertEquals( "a=b", new Rdn( "a=b" ).getNormName() );
- assertEquals( "a=b", new Rdn( " a=b" ).getNormName() );
- assertEquals( "a=b", new Rdn( "a =b" ).getNormName() );
- assertEquals( "a=b", new Rdn( "a= b" ).getNormName() );
- assertEquals( "a=b", new Rdn( "a=b " ).getNormName() );
- assertEquals( "a=b", new Rdn( " a =b" ).getNormName() );
- assertEquals( "a=b", new Rdn( " a= b" ).getNormName() );
- assertEquals( "a=b", new Rdn( " a=b " ).getNormName() );
- assertEquals( "a=b", new Rdn( "a = b" ).getNormName() );
- assertEquals( "a=b", new Rdn( "a =b " ).getNormName() );
- assertEquals( "a=b", new Rdn( "a= b " ).getNormName() );
- assertEquals( "a=b", new Rdn( " a = b" ).getNormName() );
- assertEquals( "a=b", new Rdn( " a =b " ).getNormName() );
- assertEquals( "a=b", new Rdn( " a= b " ).getNormName() );
- assertEquals( "a=b", new Rdn( "a = b " ).getNormName() );
- assertEquals( "a=b", new Rdn( " a = b " ).getNormName() );
+ assertEquals( "a=b", new Rdn( "a", "b" ).getName() );
+ assertEquals( " a=b", new Rdn( " a", "b" ).getName() );
+ assertEquals( "a =b", new Rdn( "a ", "b" ).getName() );
+ assertEquals( "a= b", new Rdn( "a", " b" ).getName() );
+ assertEquals( "a=b ", new Rdn( "a", "b " ).getName() );
+ assertEquals( " a =b", new Rdn( " a ", "b" ).getName() );
+ assertEquals( " a= b", new Rdn( " a", " b" ).getName() );
+ assertEquals( " a=b ", new Rdn( " a", "b " ).getName() );
+ assertEquals( "a = b", new Rdn( "a ", " b" ).getName() );
+ assertEquals( "a =b ", new Rdn( "a ", "b " ).getName() );
+ assertEquals( "a= b ", new Rdn( "a", " b " ).getName() );
+ assertEquals( " a = b", new Rdn( " a ", " b" ).getName() );
+ assertEquals( " a =b ", new Rdn( " a ", "b " ).getName() );
+ assertEquals( " a= b ", new Rdn( " a", " b " ).getName() );
+ assertEquals( "a = b ", new Rdn( "a ", " b " ).getName() );
+ assertEquals( " a = b ", new Rdn( " a ", " b " ).getName() );
}
@@ -141,8 +141,8 @@ public class RdnTest
@Test
public void testRdnSimpleMultivaluedAttribute() throws LdapException
{
- String result = new Rdn( "a = b + c = d" ).getNormName();
- assertEquals( "a=b+c=d", result );
+ String result = new Rdn( "a = b + c = d" ).getName();
+ assertEquals( "a = b + c = d", result );
}
@@ -174,7 +174,7 @@ public class RdnTest
@Test
public void testRdnOidUpper() throws LdapException
{
- assertEquals( "oid.12.34.56=azerty", new Rdn( "OID.12.34.56 = azerty" ).getNormName() );
+ assertEquals( "OID.12.34.56 = azerty", new Rdn( "OID.12.34.56 = azerty" ).getName() );
}
@@ -186,7 +186,7 @@ public class RdnTest
@Test
public void testRdnOidLower() throws LdapException
{
- assertEquals( "oid.12.34.56=azerty", new Rdn( "oid.12.34.56 = azerty" ).getNormName() );
+ assertEquals( "oid.12.34.56 = azerty", new Rdn( "oid.12.34.56 = azerty" ).getName() );
}
@@ -199,7 +199,7 @@ public class RdnTest
@Test
public void testRdnOidWithoutPrefix() throws LdapException
{
- assertEquals( "12.34.56=azerty", new Rdn( "12.34.56 = azerty" ).getNormName() );
+ assertEquals( "12.34.56 = azerty", new Rdn( "12.34.56 = azerty" ).getName() );
}
@@ -212,8 +212,8 @@ public class RdnTest
@Test
public void testRdnCompositeOidWithoutPrefix() throws LdapException
{
- String result = new Rdn( "12.34.56 = azerty + 7.8 = test" ).getNormName();
- assertEquals( "12.34.56=azerty+7.8=test", result );
+ String result = new Rdn( "12.34.56 = azerty + 7.8 = test" ).getName();
+ assertEquals( "12.34.56 = azerty + 7.8 = test", result );
}
@@ -228,7 +228,8 @@ public class RdnTest
String rdn = Strings.utf8ToString( new byte[]
{ 'a', '=', '\\', ',', '\\', '=', '\\', '+', '\\', '<', '\\', '>', '#', '\\', ';', '\\', '\\', '\\', '"', '\\',
'C', '3', '\\', 'A', '9' } );
- assertEquals( "a=\\,\\=\\+\\<\\>#\\;\\\\\\\"\u00e9", new Rdn( rdn ).getNormName() );
+ assertEquals( "a=\\,\\=\\+\\<\\>#\\;\\\\\\\"\\C3\\A9", new Rdn( rdn ).getName() );
+ assertEquals( "a=\\,=\\+\\<\\>#\\;\\\\\\\"\u00e9", new Rdn( rdn ).getEscaped() );
}
@@ -238,7 +239,7 @@ public class RdnTest
@Test
public void testRdnHexStringAttributeValue() throws LdapException
{
- assertEquals( "a=#0010A0AAFF", new Rdn( "a = #0010A0AAFF" ).getNormName() );
+ assertEquals( "a = #0010A0AAFF", new Rdn( "a = #0010A0AAFF" ).getName() );
}
@@ -269,9 +270,8 @@ public class RdnTest
public void testRdnQuotedAttributeValue() throws LdapException
{
Rdn rdn = new Rdn( "a = quoted \\\"value" );
- assertEquals( "a=quoted \\\"value", rdn.getNormName() );
- assertEquals( "quoted \\\"value", rdn.getValue( "a" ) );
- assertEquals( "quoted \"value", rdn.getNormValue( "a" ) );
+ assertEquals( "a = quoted \\\"value", rdn.getName() );
+ assertEquals( "quoted \"value", rdn.getValue( "a" ) );
}
@@ -294,7 +294,7 @@ public class RdnTest
/**
- * Test teh creation of a new Rdn
+ * Test the creation of a new Rdn
*
* @throws org.apache.directory.api.ldap.model.exception.LdapException
*/
@@ -302,8 +302,8 @@ public class RdnTest
public void testRDNCreation() throws LdapException
{
Rdn rdn = new Rdn( "A", " b " );
- assertEquals( "a=\\ b \\ ", rdn.getNormName() );
assertEquals( "A= b ", rdn.getName() );
+ assertEquals( "A=\\ b \\ ", rdn.getEscaped() );
}
@@ -324,7 +324,7 @@ public class RdnTest
assertEquals( "b", rdnClone.getValue( "a" ) );
assertEquals( "bb", rdnClone.getValue( "aa" ) );
- assertEquals( "", rdnClone.getValue( "c" ) );
+ assertEquals( null, rdnClone.getValue( "c" ) );
}
@@ -607,7 +607,7 @@ public class RdnTest
{
Rdn rdn = new Rdn( " a = b + b = f + g = h + c = d " );
- assertEquals( "b", rdn.getNormValue() );
+ assertEquals( "b", rdn.getValue() );
}
@@ -849,7 +849,7 @@ public class RdnTest
public void testRdnWithSpaces() throws LdapException
{
Rdn rdn = new Rdn( "cn=a\\ b\\ c" );
- assertEquals( "cn=a b c", rdn.getNormName() );
+ assertEquals( "cn=a\\ b\\ c", rdn.getName() );
}
@@ -858,14 +858,13 @@ public class RdnTest
{
Rdn rdn1 = new Rdn( "cn=a b c" );
Rdn rdn2 = new Rdn( "cn=a\\ b\\ c" );
- assertEquals( "cn=a b c", rdn1.getNormName() );
- assertEquals( "cn=a b c", rdn2.getNormName() );
+ assertEquals( "cn=a b c", rdn1.getName() );
assertTrue( rdn1.equals( rdn2 ) );
Rdn rdn3 = new Rdn( "cn= \\ a b c\\ " );
Rdn rdn4 = new Rdn( "cn=\\ a\\ b\\ c\\ " );
- assertEquals( "cn=\\ a b c\\ ", rdn3.getNormName() );
- assertEquals( "cn=\\ a b c\\ ", rdn4.getNormName() );
+ assertEquals( "cn= \\ a b c\\ ", rdn3.getName() );
+ assertEquals( "cn=\\ a b c\\ ", rdn3.getEscaped() );
assertTrue( rdn3.equals( rdn4 ) );
}
@@ -875,14 +874,13 @@ public class RdnTest
{
Rdn rdn1 = new Rdn( "cn=a#b#c" );
Rdn rdn2 = new Rdn( "cn=a\\#b\\#c" );
- assertEquals( "cn=a#b#c", rdn1.getNormName() );
- assertEquals( "cn=a#b#c", rdn2.getNormName() );
+ assertEquals( "cn=a#b#c", rdn1.getName() );
assertTrue( rdn1.equals( rdn2 ) );
Rdn rdn3 = new Rdn( "cn=\\#a#b#c\\#" );
Rdn rdn4 = new Rdn( "cn=\\#a\\#b\\#c\\#" );
- assertEquals( "cn=\\#a#b#c#", rdn3.getNormName() );
- assertEquals( "cn=\\#a#b#c#", rdn4.getNormName() );
+ assertEquals( "cn=\\#a#b#c\\#", rdn3.getName() );
+ assertEquals( "cn=\\#a#b#c#", rdn3.getEscaped() );
assertTrue( rdn3.equals( rdn4 ) );
}
@@ -935,8 +933,6 @@ public class RdnTest
{
Rdn rdn = new Rdn( "" );
- rdn.normalize();
-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -958,8 +954,6 @@ public class RdnTest
{
Rdn rdn = new Rdn();
- rdn.normalize();
-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -983,7 +977,6 @@ public class RdnTest
public void testSimpleRdnSerialization() throws LdapException, IOException, ClassNotFoundException
{
Rdn rdn = new Rdn( "a=b" );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1008,7 +1001,6 @@ public class RdnTest
public void testSimpleRdn2Serialization() throws LdapException, IOException, ClassNotFoundException
{
Rdn rdn = new Rdn( " ABC = DEF " );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1033,7 +1025,6 @@ public class RdnTest
public void testSimpleRdnNoValueSerialization() throws LdapException, IOException, ClassNotFoundException
{
Rdn rdn = new Rdn( " ABC =" );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1058,7 +1049,6 @@ public class RdnTest
public void testSimpleRdnOneValueSerialization() throws LdapException, IOException, ClassNotFoundException
{
Rdn rdn = new Rdn( " ABC = def " );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1083,7 +1073,6 @@ public class RdnTest
public void testSimpleRdnThreeValuesSerialization() throws LdapException, IOException, ClassNotFoundException
{
Rdn rdn = new Rdn( " A = a + B = b + C = c " );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1109,7 +1098,6 @@ public class RdnTest
ClassNotFoundException
{
Rdn rdn = new Rdn( " B = b + A = a + C = c " );
- rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -1135,8 +1123,8 @@ public class RdnTest
{
assertTrue( Rdn.isValid( "a=" ) );
assertTrue( Rdn.isValid( "a=\"\"" ) );
- assertEquals( "a=", new Rdn( "a=\"\"" ).getNormName() );
- assertEquals( "a=", new Rdn( "a=" ).getNormName() );
+ assertEquals( "a=\"\"", new Rdn( "a=\"\"" ).getName() );
+ assertEquals( "a=", new Rdn( "a=" ).getName() );
}
@@ -1147,16 +1135,17 @@ public class RdnTest
public void testRdnWithEscapedComa() throws LdapException
{
assertTrue( Rdn.isValid( "a=b\\,c" ) );
- assertEquals( "a=b\\,c", new Rdn( "a=b\\,c" ).getNormName() );
+ assertEquals( "a=b\\,c", new Rdn( "a=b\\,c" ).getName() );
assertTrue( Rdn.isValid( "a=\"b,c\"" ) );
- assertEquals( "a=b\\,c", new Rdn( "a=\"b,c\"" ).getNormName() );
+ assertEquals( "a=\"b,c\"", new Rdn( "a=\"b,c\"" ).getName() );
+ assertEquals( "a=b\\,c", new Rdn( "a=\"b,c\"" ).getEscaped() );
assertEquals( "a=\"b,c\"", new Rdn( "a=\"b,c\"" ).getName() );
assertTrue( Rdn.isValid( "a=\"b\\,c\"" ) );
Rdn rdn = new Rdn( "a=\"b\\,c\"" );
assertEquals( "a=\"b\\,c\"", rdn.getName() );
- assertEquals( "a=b\\\\\\,c", rdn.getNormName() );
+ assertEquals( "a=b\\,c", rdn.getEscaped() );
}
@@ -1222,7 +1211,7 @@ public class RdnTest
for ( Ava ava : rdn )
{
- assertEquals( expected[i], ava.toString() );
+ assertEquals( expected[i], ava.getName() );
i++;
}
}
@@ -1255,10 +1244,8 @@ public class RdnTest
{
Rdn rdn = new Rdn( new Ava( "CN", "\u00E4" ), new Ava( "A", "d" ) );
assertEquals( "CN=\u00E4+A=d", rdn.getName() );
- assertEquals( "cn=\u00E4+a=d", rdn.getNormName() );
assertEquals( "\u00E4", rdn.getValue( "CN" ) );
assertEquals( "\u00E4", rdn.getValue() );
- assertEquals( "\u00E4", rdn.getValue() );
assertEquals( "CN", rdn.getType() );
assertEquals( "cn", rdn.getNormType() );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/PrepareStringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/PrepareStringTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/PrepareStringTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/PrepareStringTest.java Mon May 9 17:22:19 2016
@@ -37,7 +37,7 @@ public class PrepareStringTest
@Test
public void testEscapeBackSlash() throws IOException
{
- String result = PrepareString.normalize( "C:\\a\\b\\c", PrepareString.StringType.DIRECTORY_STRING );
+ String result = PrepareString.normalize( "C:\\a\\b\\c" );
System.out.println( result );
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java Mon May 9 17:22:19 2016
@@ -25,7 +25,6 @@ import com.mycila.junit.concurrent.Concu
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.schema.normalizers.BooleanNormalizer;
-import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,13 +66,4 @@ public class BooleanNormalizerTest
{
assertEquals( "TRUE", normalizer.normalize( " tRuE " ) );
}
-
-
- @Test
- public void testNormalizeByteValue() throws Exception
- {
- assertEquals( "TRUE", normalizer.normalize( new Value( Strings.getBytesUtf8( "tRuE" ) ) ).getString() );
- assertEquals( "TRUE", normalizer.normalize( new Value( Strings.getBytesUtf8( "true" ) ) ).getString() );
- }
-
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizerTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizerTest.java Mon May 9 17:22:19 2016
@@ -45,7 +45,7 @@ public class DeepTrimNormalizerTest
public void testDeepTrimNormalizerNull() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "", normalizer.normalize( ( String ) null ) );
+ assertEquals( null, normalizer.normalize( ( String ) null ) );
}
@@ -53,7 +53,7 @@ public class DeepTrimNormalizerTest
public void testDeepTrimNormalizerEmpty() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "", normalizer.normalize( "" ) );
+ assertEquals( " ", normalizer.normalize( "" ) );
}
@@ -61,7 +61,7 @@ public class DeepTrimNormalizerTest
public void testDeepTrimNormalizerOneSpace() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( " ", normalizer.normalize( " " ) );
+ assertEquals( " ", normalizer.normalize( " " ) );
}
@@ -69,7 +69,7 @@ public class DeepTrimNormalizerTest
public void testDeepTrimNormalizerTwoSpaces() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( " ", normalizer.normalize( " " ) );
+ assertEquals( " ", normalizer.normalize( " " ) );
}
@@ -77,7 +77,7 @@ public class DeepTrimNormalizerTest
public void testDeepTrimNormalizerNSpaces() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( " ", normalizer.normalize( " " ) );
+ assertEquals( " ", normalizer.normalize( " " ) );
}
@@ -85,7 +85,7 @@ public class DeepTrimNormalizerTest
public void testInsignifiantSpacesStringOneChar() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "a", normalizer.normalize( "a" ) );
+ assertEquals( " a ", normalizer.normalize( "a" ) );
}
@@ -93,7 +93,7 @@ public class DeepTrimNormalizerTest
public void testInsignifiantSpacesStringTwoChars() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "aa", normalizer.normalize( "aa" ) );
+ assertEquals( " aa ", normalizer.normalize( "aa" ) );
}
@@ -101,7 +101,7 @@ public class DeepTrimNormalizerTest
public void testInsignifiantSpacesStringNChars() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "aaaaa", normalizer.normalize( "aaaaa" ) );
+ assertEquals( " aaaaa ", normalizer.normalize( "aaaaa" ) );
}
@@ -112,7 +112,7 @@ public class DeepTrimNormalizerTest
char[] chars = new char[]
{ ' ', 0x0310 };
char[] expected = new char[]
- { ' ', 0x0310 };
+ { ' ', 0x0310, ' ' };
//assertEquals( new String( expected ), normalizer.normalize( new String( chars ) ) );
String expectedStr = new String( expected );
@@ -128,7 +128,7 @@ public class DeepTrimNormalizerTest
char[] chars = new char[]
{ ' ', 0x0310, ' ', 0x0311, ' ', 0x0312 };
char[] expected = new char[]
- { ' ', 0x0310, ' ', 0x0311, ' ', 0x0312 };
+ { ' ', 0x0310, ' ', ' ', 0x0311, ' ', ' ', 0x0312, ' ' };
assertEquals( new String( expected ), normalizer.normalize( new String( chars ) ) );
}
@@ -137,26 +137,26 @@ public class DeepTrimNormalizerTest
public void testInsignifiantSpacesStringCharsSpaces() throws LdapException
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "a", normalizer.normalize( " a" ) );
- assertEquals( "a", normalizer.normalize( "a " ) );
- assertEquals( "a", normalizer.normalize( " a " ) );
- assertEquals( "a a", normalizer.normalize( "a a" ) );
- assertEquals( "a a", normalizer.normalize( " a a" ) );
- assertEquals( "a a", normalizer.normalize( "a a " ) );
- assertEquals( "a a", normalizer.normalize( "a a" ) );
- assertEquals( "a a", normalizer.normalize( " a a " ) );
- assertEquals( "aaa aaa aaa", normalizer.normalize( " aaa aaa aaa " ) );
+ assertEquals( " a ", normalizer.normalize( " a" ) );
+ assertEquals( " a ", normalizer.normalize( "a " ) );
+ assertEquals( " a ", normalizer.normalize( " a " ) );
+ assertEquals( " a a ", normalizer.normalize( "a a" ) );
+ assertEquals( " a a ", normalizer.normalize( " a a" ) );
+ assertEquals( " a a ", normalizer.normalize( "a a " ) );
+ assertEquals( " a a ", normalizer.normalize( "a a" ) );
+ assertEquals( " a a ", normalizer.normalize( " a a " ) );
+ assertEquals( " aaa aaa aaa ", normalizer.normalize( " aaa aaa aaa " ) );
}
@Test
public void testNormalizeCharsCombiningSpaces() throws LdapException
{
- Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
char[] chars = new char[]
- { ' ', 0x0310, 'a', 'a', ' ', ' ', 0x0311, ' ', ' ', 'a', 0x0311, 0x0312 };
+ { 'a', 'm', ' ', 'e', 0x0301, 'l', 'i', 'e' };
char[] expected = new char[]
- { ' ', 0x0310, 'a', 'a', ' ', 0x0311, ' ', 'a', 0x0311, 0x0312 };
+ { ' ', 'a', 'm', ' ', ' ', '\u00e9', 'l', 'i' , 'e', ' ' };
String expectedStr = new String( expected );
String charsStr = new String( chars );
assertEquals( expectedStr, normalizer.normalize( charsStr ) );
@@ -167,7 +167,7 @@ public class DeepTrimNormalizerTest
public void testNormalizeString() throws Exception
{
Normalizer normalizer = new DeepTrimNormalizer( "1.1.1" );
- assertEquals( "abcd", normalizer.normalize( "abcd" ) );
+ assertEquals( " abcd ", normalizer.normalize( "abcd" ) );
}
@@ -178,7 +178,7 @@ public class DeepTrimNormalizerTest
char[] chars = new char[]
{ 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0085, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F };
- assertEquals( " ", normalizer.normalize( new String( chars ) ) );
+ assertEquals( " ", normalizer.normalize( new String( chars ) ) );
}
@@ -212,7 +212,7 @@ public class DeepTrimNormalizerTest
chars[pos++] = 0x00AD;
- assertEquals( " ", normalizer.normalize( new String( chars ) ) );
+ assertEquals( " ", normalizer.normalize( new String( chars ) ) );
}
/*
Added: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizerTest.java?rev=1743011&view=auto
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizerTest.java (added)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizerTest.java Mon May 9 17:22:19 2016
@@ -0,0 +1,255 @@
+/*
+ * 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.api.ldap.model.schema.normalizers;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.schema.Normalizer;
+import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
+import org.apache.directory.api.util.Strings;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test the normalizer class
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrency()
+public class DeepTrimToLowerNormalizerTest
+{
+ @Test
+ public void testDeepTrimToLowerNormalizerNull() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertNull( normalizer.normalize( ( String ) null ) );
+ }
+
+
+ @Test
+ public void testDeepTrimToLowerNormalizerEmpty() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " ", normalizer.normalize( "" ) );
+ }
+
+
+ @Test
+ public void testDeepTrimToLowerNormalizerOneSpace() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " ", normalizer.normalize( " " ) );
+ }
+
+
+ @Test
+ public void testDeepTrimToLowerNormalizerTwoSpaces() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " ", normalizer.normalize( " " ) );
+ }
+
+
+ @Test
+ public void testDeepTrimToLowerNormalizerNSpaces() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " ", normalizer.normalize( " " ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringOneChar() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " a ", normalizer.normalize( "a" ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringTwoChars() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " aa ", normalizer.normalize( "aa" ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringNChars() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " aaaaa ", normalizer.normalize( "aaaaa" ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringOneCombining() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ char[] chars = new char[]
+ { 'e', 0x0301 };
+ char[] expected = new char[]
+ { ' ', '\u00E9', ' ' };
+
+ String expectedStr = new String( expected );
+ String charsStr = new String( chars );
+ assertEquals( expectedStr, normalizer.normalize( charsStr ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringNCombining() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ char[] chars = new char[]
+ { 'e', 0x0301, ' ', 'a', 0x0300, 'i', 0x0302 };
+ char[] expected = new char[]
+ { ' ', '�', ' ', ' ', '�', '�', ' ' };
+ assertEquals( new String( expected ), normalizer.normalize( new String( chars ) ) );
+ }
+
+
+ @Test
+ public void testInsignifiantSpacesStringCharsSpaces() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " a ", normalizer.normalize( " a" ) );
+ assertEquals( " a ", normalizer.normalize( "a " ) );
+ assertEquals( " a ", normalizer.normalize( " a " ) );
+ assertEquals( " a a ", normalizer.normalize( "a a" ) );
+ assertEquals( " a a ", normalizer.normalize( " a a" ) );
+ assertEquals( " a a ", normalizer.normalize( "a a " ) );
+ assertEquals( " a a ", normalizer.normalize( "a a" ) );
+ assertEquals( " a a ", normalizer.normalize( " a a " ) );
+ assertEquals( " aaa aaa aaa ", normalizer.normalize( " aaa aaa aaa " ) );
+ }
+
+
+ @Test
+ public void testNormalizeCharsCombiningSpaces() throws LdapException
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ char[] chars = new char[]
+ { 'a', 'm', ' ', 'e', 0x0301, 'l', 'i', 'e' };
+ char[] expected = new char[]
+ { ' ', 'a', 'm', ' ', ' ', '\u00e9', 'l', 'i' , 'e', ' ' };
+ String expectedStr = new String( expected );
+ String charsStr = new String( chars );
+ assertEquals( expectedStr, normalizer.normalize( charsStr ) );
+ }
+
+
+ @Test
+ public void testNormalizeString() throws Exception
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ assertEquals( " abcd ", normalizer.normalize( "abcd" ) );
+ }
+
+
+ @Test
+ public void testMapToSpace() throws Exception
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ char[] chars = new char[]
+ { 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0085, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
+ 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F };
+ assertEquals( " ", normalizer.normalize( new String( chars ) ) );
+ }
+
+
+ @Test
+ public void testNormalizeIgnore() throws Exception
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+ char[] chars = new char[58];
+
+ int pos = 0;
+
+ for ( char c = 0x0000; c < 0x0008; c++ )
+ {
+ chars[pos++] = c;
+ }
+
+ for ( char c = 0x000E; c < 0x001F; c++ )
+ {
+ chars[pos++] = c;
+ }
+
+ for ( char c = 0x007F; c < 0x0084; c++ )
+ {
+ chars[pos++] = c;
+ }
+
+ for ( char c = 0x0086; c < 0x009F; c++ )
+ {
+ chars[pos++] = c;
+ }
+
+ chars[pos++] = 0x00AD;
+
+ assertEquals( " ", normalizer.normalize( new String( chars ) ) );
+ }
+
+
+ @Test
+ @Ignore
+ public void testSpeed() throws Exception
+ {
+ Normalizer normalizer = new DeepTrimToLowerNormalizer();
+
+ String t = "xs crvtbynU Jikl7897A90";
+
+ normalizer.normalize( t );
+
+ long t0 = System.currentTimeMillis();
+
+ for ( int i = 0; i < 100000000; i++ )
+ {
+ normalizer.normalize( t );
+ }
+
+ long t1 = System.currentTimeMillis();
+
+ System.out.println( t1 - t0 );
+
+ Strings.deepTrimToLower( t );
+
+ t0 = System.currentTimeMillis();
+
+ for ( int i = 0; i < 100000000; i++ )
+ {
+ Strings.deepTrimToLower( t );
+ }
+
+ t1 = System.currentTimeMillis();
+
+ System.out.println( t1 - t0 );
+ }
+}
\ No newline at end of file
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java Mon May 9 17:22:19 2016
@@ -50,7 +50,7 @@ public class DummyNormalizer extends Nor
*/
public Value normalize( Value value ) throws LdapException
{
- String str = value.getString();
+ String str = value.getValue();
if ( Strings.isEmpty( str ) )
{
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizerTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizerTest.java Mon May 9 17:22:19 2016
@@ -45,7 +45,7 @@ public class NumericNormalizerTest
public void testNumericNormalizerNull() throws LdapException
{
Normalizer normalizer = new NumericNormalizer();
- assertEquals( "", normalizer.normalize( ( String ) null ) );
+ assertEquals( null, normalizer.normalize( ( String ) null ) );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizerTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizerTest.java Mon May 9 17:22:19 2016
@@ -45,7 +45,7 @@ public class TelephoneNumberNormalizerTe
public void testTelephoneNumberNormalizerNull() throws LdapException
{
Normalizer normalizer = new TelephoneNumberNormalizer();
- assertEquals( "", normalizer.normalize( ( String ) null ) );
+ assertEquals( null, normalizer.normalize( ( String ) null ) );
}
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java Mon May 9 17:22:19 2016
@@ -256,7 +256,7 @@ public class SchemaEntityFactory impleme
for ( Value value : depsAttr )
{
- depsSet.add( value.getString() );
+ depsSet.add( value.getValue() );
}
dependencies = depsSet.toArray( EMPTY_ARRAY );
@@ -908,7 +908,7 @@ public class SchemaEntityFactory impleme
for ( Value value : attr )
{
- strings.add( value.getString() );
+ strings.add( value.getValue() );
}
return strings;
@@ -1185,7 +1185,7 @@ public class SchemaEntityFactory impleme
{
Value value = attribute.get();
- return value.getString();
+ return value.getValue();
}
@@ -1230,7 +1230,7 @@ public class SchemaEntityFactory impleme
for ( Value name : names )
{
- values.add( name.getString() );
+ values.add( name.getValue() );
}
schemaObject.setNames( values );
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.18060.0.4.0.1.3.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.3.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.3.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.18060.0.4.0.1.3,ou=comparators,cn=apachemeta,ou=schema
m-oid: 1.3.6.1.4.1.18060.0.4.0.1.3
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.18060.0.4.0.1.4.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.4.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.4.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.18060.0.4.0.1.4,ou=comparators,cn=apachemeta,ou=schema
m-oid: 1.3.6.1.4.1.18060.0.4.0.1.4
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=comparators/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dnis/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.4203.1.2.1.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=comparators/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=comparators/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.4203.1.2.1,ou=comparators,cn=nis,ou=schema
m-oid: 1.3.6.1.4.1.4203.1.2.1
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=normalizers/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dnis/ou%3Dnormalizers/m-oid%3D1.3.6.1.4.1.4203.1.2.1.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=normalizers/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=normalizers/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.4203.1.2.1,ou=normalizers,cn=nis,ou=schema
m-oid: 1.3.6.1.4.1.4203.1.2.1
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.1466.109.114.1.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.1,ou=comparators,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.1
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.1466.109.114.2.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.2,ou=comparators,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.2
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D1.3.6.1.4.1.1466.109.114.3.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.3,ou=comparators,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.3
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.11.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.11.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.11.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.11,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.11
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.12.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.12.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.12.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.12.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.12,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.12
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.2.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.2.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.2.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.2,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.2
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.24.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.24.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.24.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.24.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.24,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.24
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.ComparableComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.3.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.3.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.3.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.3,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.3
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.4.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.4.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.4.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.4,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.4
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimToLowerComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.5.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.5.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.5.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.5.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.5,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.5
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.7.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dcomparators/m-oid%3D2.5.13.7.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.7.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.7.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.7,ou=comparators,cn=system,ou=schema
m-oid: 2.5.13.7
-m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimCachingNormalizingComparator
+m-fqcn: org.apache.directory.api.ldap.model.schema.comparators.DeepTrimComparator
objectclass: metaComparator
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D1.3.6.1.4.1.1466.109.114.1.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.1,ou=normalizers,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.1
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D1.3.6.1.4.1.1466.109.114.2.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.2,ou=normalizers,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.2
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D1.3.6.1.4.1.1466.109.114.3.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=1.3.6.1.4.1.1466.109.114.3,ou=normalizers,cn=system,ou=schema
m-oid: 1.3.6.1.4.1.1466.109.114.3
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.11.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.11.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.11.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.11,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.11
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.12.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.12.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.12.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.12.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.12,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.12
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.2.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.2.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.2.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.2,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.2
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.24.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.24.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.24.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.24.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.24,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.24
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.3.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.3.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.3.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.3,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.3
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.4.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.4.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.4.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.4,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.4
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimToLowerNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.5.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.5.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.5.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.5.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.5,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.5
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.7.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsystem/ou%3Dnormalizers/m-oid%3D2.5.13.7.ldif?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.7.ldif (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.7.ldif Mon May 9 17:22:19 2016
@@ -1,7 +1,7 @@
version: 1
dn: m-oid=2.5.13.7,ou=normalizers,cn=system,ou=schema
m-oid: 2.5.13.7
-m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.CachingDeepTrimNormalizer
+m-fqcn: org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimNormalizer
objectclass: metaNormalizer
objectclass: metaTop
objectclass: top
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java Mon May 9 17:22:19 2016
@@ -160,7 +160,7 @@ public class SchemaManagerEnableDisableL
assertEquals( 430, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 55, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 47, schemaManager.getNormalizerRegistry().size() );
assertEquals( 123, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 80, schemaManager.getLdapSyntaxRegistry().size() );
@@ -207,7 +207,7 @@ public class SchemaManagerEnableDisableL
assertEquals( 462, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 50, schemaManager.getComparatorRegistry().size() );
assertEquals( 56, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 139, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 82, schemaManager.getLdapSyntaxRegistry().size() );
@@ -248,7 +248,7 @@ public class SchemaManagerEnableDisableL
assertEquals( 430, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 55, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 47, schemaManager.getNormalizerRegistry().size() );
assertEquals( 123, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 80, schemaManager.getLdapSyntaxRegistry().size() );
@@ -300,7 +300,7 @@ public class SchemaManagerEnableDisableL
assertEquals( 504, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 50, schemaManager.getComparatorRegistry().size() );
assertEquals( 56, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 147, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 82, schemaManager.getLdapSyntaxRegistry().size() );
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java Mon May 9 17:22:19 2016
@@ -228,7 +228,7 @@ public class SchemaManagerLoadTest
assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 35, schemaManager.getComparatorRegistry().size() );
assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
@@ -258,7 +258,7 @@ public class SchemaManagerLoadTest
assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -287,7 +287,7 @@ public class SchemaManagerLoadTest
assertEquals( 148, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 44, schemaManager.getComparatorRegistry().size() );
assertEquals( 50, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 42, schemaManager.getNormalizerRegistry().size() );
assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
@@ -316,7 +316,7 @@ public class SchemaManagerLoadTest
assertEquals( 71, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 40, schemaManager.getComparatorRegistry().size() );
assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 40, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 39, schemaManager.getNormalizerRegistry().size() );
assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
@@ -345,7 +345,7 @@ public class SchemaManagerLoadTest
assertEquals( 99, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -377,7 +377,7 @@ public class SchemaManagerLoadTest
assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -407,7 +407,7 @@ public class SchemaManagerLoadTest
assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -439,7 +439,7 @@ public class SchemaManagerLoadTest
assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -470,7 +470,7 @@ public class SchemaManagerLoadTest
assertEquals( 105, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -500,7 +500,7 @@ public class SchemaManagerLoadTest
assertEquals( 107, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -536,7 +536,7 @@ public class SchemaManagerLoadTest
assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -574,7 +574,7 @@ public class SchemaManagerLoadTest
assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 35, schemaManager.getComparatorRegistry().size() );
assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
@@ -602,7 +602,7 @@ public class SchemaManagerLoadTest
assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
@@ -641,7 +641,7 @@ public class SchemaManagerLoadTest
assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 35, schemaManager.getComparatorRegistry().size() );
assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
@@ -675,7 +675,7 @@ public class SchemaManagerLoadTest
assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 35, schemaManager.getComparatorRegistry().size() );
assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
@@ -715,7 +715,7 @@ public class SchemaManagerLoadTest
assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 36, schemaManager.getComparatorRegistry().size() );
assertEquals( 42, schemaManager.getMatchingRuleRegistry().size() );
- assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+ assertEquals( 34, schemaManager.getNormalizerRegistry().size() );
assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );