You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/12 19:55:30 UTC
svn commit: r1080975 [2/2] - in /directory:
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/
...
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1080975&r1=1080974&r2=1080975&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java Sat Mar 12 18:55:29 2011
@@ -40,7 +40,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -458,7 +458,7 @@ public class StringValueAttributeTypeTes
});
mr.setSyntax( s );
- mr.setLdapComparator( new LdapComparator<String>( mr.getOid() )
+ mr.setLdapComparator( new AbstractLdapComparator<String>( mr.getOid() )
{
private static final long serialVersionUID = 1L;
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1080975&r1=1080974&r2=1080975&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Mar 12 18:55:29 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.EntityFactory;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -392,11 +392,11 @@ public class SchemaEntityFactory impleme
/**
* Class load a comparator instances
*/
- private LdapComparator<?> classLoadComparator( SchemaManager schemaManager, String oid, String className,
+ private AbstractLdapComparator<?> classLoadComparator( SchemaManager schemaManager, String oid, String className,
EntryAttribute byteCode ) throws Exception
{
// Try to class load the comparator
- LdapComparator<?> comparator = null;
+ AbstractLdapComparator<?> comparator = null;
Class<?> clazz = null;
String byteCodeStr = StringConstants.EMPTY;
@@ -417,7 +417,7 @@ public class SchemaEntityFactory impleme
{
Constructor<?> constructor = clazz.getConstructor( new Class[]
{ String.class } );
- comparator = ( LdapComparator<?> ) constructor.newInstance( new Object[]
+ comparator = ( AbstractLdapComparator<?> ) constructor.newInstance( new Object[]
{ oid } );
}
catch ( NoSuchMethodException nsme )
@@ -426,7 +426,7 @@ public class SchemaEntityFactory impleme
// In this case, we will have to check that the OID is the same than
// the one we got in the Comparator entry
clazz.getConstructor();
- comparator = ( LdapComparator<?> ) clazz.newInstance();
+ comparator = ( AbstractLdapComparator<?> ) clazz.newInstance();
if ( !comparator.getOid().equals( oid ) )
{
@@ -449,7 +449,7 @@ public class SchemaEntityFactory impleme
/**
* {@inheritDoc}
*/
- public LdapComparator<?> getLdapComparator( SchemaManager schemaManager,
+ public AbstractLdapComparator<?> getLdapComparator( SchemaManager schemaManager,
LdapComparatorDescription comparatorDescription, Registries targetRegistries, String schemaName )
throws Exception
{
@@ -476,7 +476,7 @@ public class SchemaEntityFactory impleme
EntryAttribute byteCode = getByteCode( comparatorDescription, SchemaConstants.COMPARATOR );
// Class load the comparator
- LdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
+ AbstractLdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
// Update the common fields
setSchemaObjectProperties( comparator, comparatorDescription, schema );
@@ -488,7 +488,7 @@ public class SchemaEntityFactory impleme
/**
* {@inheritDoc}
*/
- public LdapComparator<?> getLdapComparator( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+ public AbstractLdapComparator<?> getLdapComparator( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
String schemaName ) throws LdapException
{
checkEntry( entry, SchemaConstants.COMPARATOR );
@@ -524,7 +524,7 @@ public class SchemaEntityFactory impleme
try
{
// Class load the comparator
- LdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
+ AbstractLdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
// Update the common fields
setSchemaObjectProperties( comparator, entry, schema );
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1080975&r1=1080974&r2=1080975&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sat Mar 12 18:55:29 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.EntityFactory;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
@@ -805,7 +805,7 @@ public class DefaultSchemaManager implem
{
for ( Entry entry : schemaLoader.loadComparators( schema ) )
{
- LdapComparator<?> comparator = factory.getLdapComparator( this, entry, registries, schema.getSchemaName() );
+ AbstractLdapComparator<?> comparator = factory.getLdapComparator( this, entry, registries, schema.getSchemaName() );
addSchemaObject( registries, comparator, schema );
}
@@ -1538,7 +1538,7 @@ public class DefaultSchemaManager implem
/**
* {@inheritDoc}
*/
- public LdapComparator<?> lookupComparatorRegistry( String oid ) throws LdapException
+ public AbstractLdapComparator<?> lookupComparatorRegistry( String oid ) throws LdapException
{
return registries.getComparatorRegistry().lookup( oid );
}
@@ -1599,7 +1599,7 @@ public class DefaultSchemaManager implem
return registries.getGlobalOidRegistry().contains( schemaObject.getOid() );
}
- if ( schemaObject instanceof LdapComparator<?> )
+ if ( schemaObject instanceof AbstractLdapComparator<?> )
{
return registries.getComparatorRegistry().contains( schemaObject.getOid() );
}
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1080975&r1=1080974&r2=1080975&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Sat Mar 12 18:55:29 2011
@@ -38,7 +38,7 @@ import com.mycila.junit.concurrent.Concu
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
@@ -832,7 +832,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- LdapComparator<?> lc = new BooleanComparator( oid );
+ AbstractLdapComparator<?> lc = new BooleanComparator( oid );
assertTrue( schemaManager.add( lc ) );
@@ -842,7 +842,7 @@ public class SchemaManagerAddTest
assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
- LdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
+ AbstractLdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
assertNotNull( added );
assertEquals( lc.getClass().getName(), added.getFqcn() );
@@ -857,11 +857,11 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- LdapComparator<?> bc = new BooleanComparator( oid );
+ AbstractLdapComparator<?> bc = new BooleanComparator( oid );
assertTrue( schemaManager.add( bc ) );
- LdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
+ AbstractLdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
assertNotNull( added );
assertEquals( bc.getClass().getName(), added.getFqcn() );
@@ -871,7 +871,7 @@ public class SchemaManagerAddTest
assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
- LdapComparator<?> lc = new CsnComparator( oid );
+ AbstractLdapComparator<?> lc = new CsnComparator( oid );
assertFalse( schemaManager.add( lc ) );
@@ -899,7 +899,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- LdapComparator<?> lc = new BooleanComparator( oid );
+ AbstractLdapComparator<?> lc = new BooleanComparator( oid );
// using java.sql.ResultSet cause it is very unlikely to get loaded
// in ADS, as the FQCN is not the one expected
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1080975&r1=1080974&r2=1080975&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Sat Mar 12 18:55:29 2011
@@ -36,7 +36,7 @@ import com.mycila.junit.concurrent.Concu
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapProtocolErrorException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
@@ -139,7 +139,7 @@ public class SchemaManagerDelTest
{
try
{
- LdapComparator<?> comparator = schemaManager.lookupComparatorRegistry( oid );
+ AbstractLdapComparator<?> comparator = schemaManager.lookupComparatorRegistry( oid );
return comparator != null;
}
@@ -352,7 +352,7 @@ public class SchemaManagerDelTest
int ctrSize = schemaManager.getComparatorRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- LdapComparator<?> lc = new BooleanComparator( "0.1.1" );
+ AbstractLdapComparator<?> lc = new BooleanComparator( "0.1.1" );
assertTrue( schemaManager.add( lc ) );
assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
@@ -384,7 +384,7 @@ public class SchemaManagerDelTest
int ctrSize = schemaManager.getComparatorRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- LdapComparator<?> lc = new BooleanComparator( "0.0" );
+ AbstractLdapComparator<?> lc = new BooleanComparator( "0.0" );
assertFalse( schemaManager.delete( lc ) );
List<Throwable> errors = schemaManager.getErrors();
@@ -402,7 +402,7 @@ public class SchemaManagerDelTest
int ctrSize = schemaManager.getComparatorRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- LdapComparator<?> lc = schemaManager.lookupComparatorRegistry( "2.5.13.0" );
+ AbstractLdapComparator<?> lc = schemaManager.lookupComparatorRegistry( "2.5.13.0" );
// shouldn't be deleted cause there is a MR associated with it
assertFalse( schemaManager.delete( lc ) );
@@ -436,7 +436,7 @@ public class SchemaManagerDelTest
assertTrue( isComparatorPresent( schemaManager, OID ) );
// Now try to remove the C
- LdapComparator<?> lc = schemaManager.lookupComparatorRegistry( OID );
+ AbstractLdapComparator<?> lc = schemaManager.lookupComparatorRegistry( OID );
// shouldn't be deleted cause there is a MR associated with it
assertFalse( schemaManager.delete( lc ) );