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 2011/04/01 01:21:52 UTC
svn commit: r1087504 [4/4] - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
dsml/parser/src/test/java/org/apache/directory/shared/d...
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java Thu Mar 31 23:21:50 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -102,7 +102,7 @@ public class LdifRevertorTest
Entry deletedEntry = new DefaultEntry( dn );
- EntryAttribute oc = new DefaultEntryAttribute( "objectClass" );
+ Attribute oc = new DefaultEntryAttribute( "objectClass" );
oc.add( "top", "person" );
deletedEntry.put( oc );
@@ -129,7 +129,7 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou" );
+ Attribute ou = new DefaultEntryAttribute( "ou" );
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
@@ -156,7 +156,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.ADD_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
@@ -173,7 +173,7 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou" );
+ Attribute ou = new DefaultEntryAttribute( "ou" );
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
@@ -201,7 +201,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.ADD_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
@@ -218,7 +218,7 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou", "apache", "acme corp" );
+ Attribute ou = new DefaultEntryAttribute( "ou", "apache", "acme corp" );
modifiedEntry.put( ou );
Dn dn = new Dn( "cn=test, ou=system" );
@@ -244,7 +244,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.ADD_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
@@ -261,13 +261,13 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou" );
+ Attribute ou = new DefaultEntryAttribute( "ou" );
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
Dn dn = new Dn( "cn=test, ou=system" );
- EntryAttribute ouModified = new DefaultEntryAttribute( "ou" );
+ Attribute ouModified = new DefaultEntryAttribute( "ou" );
ouModified.add( "directory" );
ouModified.add( "BigCompany inc." );
@@ -293,7 +293,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.REPLACE_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( ou, attr );
@@ -310,7 +310,7 @@ public class LdifRevertorTest
Dn dn = new Dn( "cn=test, ou=system" );
- EntryAttribute newOu = new DefaultEntryAttribute( "ou" );
+ Attribute newOu = new DefaultEntryAttribute( "ou" );
newOu.add( "apache" );
newOu.add( "acme corp" );
@@ -335,7 +335,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.REPLACE_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
@@ -352,7 +352,7 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou" );
+ Attribute ou = new DefaultEntryAttribute( "ou" );
ou.add( "apache" );
ou.add( "acme corp" );
modifiedEntry.put( ou );
@@ -379,7 +379,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.REPLACE_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
@@ -555,7 +555,7 @@ public class LdifRevertorTest
{
Entry modifiedEntry = buildEntry();
- EntryAttribute ou = new DefaultEntryAttribute( "ou" );
+ Attribute ou = new DefaultEntryAttribute( "ou" );
ou.add( "apache" );
ou.add( "acme corp" );
modifiedEntry.put( ou );
@@ -581,7 +581,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.REMOVE_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
@@ -618,7 +618,7 @@ public class LdifRevertorTest
assertEquals( ModificationOperation.REMOVE_ATTRIBUTE, modif.getOperation() );
- EntryAttribute attr = modif.getAttribute();
+ Attribute attr = modif.getAttribute();
assertNotNull( attr );
assertEquals( "ou", attr.getId() );
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java Thu Mar 31 23:21:50 2011
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.MessageException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -59,9 +59,9 @@ public class AddRequestImplTest
* the id for the attribute
* @return the AttributeImpl assembled for testing
*/
- private EntryAttribute getAttribute( String id ) throws LdapException
+ private Attribute getAttribute( String id ) throws LdapException
{
- EntryAttribute attr = new DefaultEntryAttribute( id );
+ Attribute attr = new DefaultEntryAttribute( id );
attr.add( "value0" );
attr.add( "value1" );
attr.add( "value2" );
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Thu Mar 31 23:21:50 2011
@@ -31,7 +31,7 @@ import java.util.Map;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -76,7 +76,7 @@ public class ModifyRequestImplTest
// do nothing
}
- EntryAttribute attr = new DefaultEntryAttribute( "attr0" );
+ Attribute attr = new DefaultEntryAttribute( "attr0" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -185,7 +185,7 @@ public class ModifyRequestImplTest
public void testNotEqualDiffModOps() throws LdapException
{
ModifyRequestImpl req0 = getRequest();
- EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
+ Attribute attr = new DefaultEntryAttribute( "attr3" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -212,7 +212,7 @@ public class ModifyRequestImplTest
public void testNotEqualDiffModCount() throws LdapException
{
ModifyRequestImpl req0 = getRequest();
- EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
+ Attribute attr = new DefaultEntryAttribute( "attr3" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -233,7 +233,7 @@ public class ModifyRequestImplTest
public void testNotEqualDiffModIds() throws LdapException
{
ModifyRequestImpl req0 = getRequest();
- EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
+ Attribute attr = new DefaultEntryAttribute( "attr3" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -260,7 +260,7 @@ public class ModifyRequestImplTest
public void testNotEqualDiffModValues() throws LdapException
{
ModifyRequestImpl req0 = getRequest();
- EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
+ Attribute attr = new DefaultEntryAttribute( "attr3" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -295,7 +295,7 @@ public class ModifyRequestImplTest
try
{
- EntryAttribute attr = new DefaultEntryAttribute( "attr0" );
+ Attribute attr = new DefaultEntryAttribute( "attr0" );
attr.add( "val0" );
attr.add( "val1" );
attr.add( "val2" );
@@ -447,7 +447,7 @@ public class ModifyRequestImplTest
}
- public void addModification( EntryAttribute attr, ModificationOperation modOp )
+ public void addModification( Attribute attr, ModificationOperation modOp )
{
}
@@ -467,7 +467,7 @@ public class ModifyRequestImplTest
}
- public void replace( EntryAttribute attr )
+ public void replace( Attribute attr )
{
}
@@ -482,7 +482,7 @@ public class ModifyRequestImplTest
}
- public void add( EntryAttribute attr )
+ public void add( Attribute attr )
{
}
@@ -497,7 +497,7 @@ public class ModifyRequestImplTest
}
- public void remove( EntryAttribute attr )
+ public void remove( Attribute attr )
{
}
};
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java Thu Mar 31 23:21:50 2011
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Test;
@@ -52,9 +52,9 @@ public class SearchResultEntryImplTest
* @param id the id for the attribute
* @return the EntryAttribute assembled for testing
*/
- private EntryAttribute getEntry( String id ) throws LdapException
+ private Attribute getEntry( String id ) throws LdapException
{
- EntryAttribute attr = new DefaultEntryAttribute( id );
+ Attribute attr = new DefaultEntryAttribute( id );
attr.add( "value0" );
attr.add( "value1" );
attr.add( "value2" );
Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Thu Mar 31 23:21:50 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.conv
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
import org.apache.directory.shared.util.Strings;
@@ -171,7 +171,7 @@ public abstract class SchemaElementImpl
else
{
Entry entry = new DefaultEntry();
- EntryAttribute attribute = new DefaultEntryAttribute( "m-name" );
+ Attribute attribute = new DefaultEntryAttribute( "m-name" );
for ( String name : names )
{
@@ -198,7 +198,7 @@ public abstract class SchemaElementImpl
else
{
Entry entry = new DefaultEntry();
- EntryAttribute attribute = new DefaultEntryAttribute( "m-description", description );
+ Attribute attribute = new DefaultEntryAttribute( "m-description", description );
entry.put( attribute );
@@ -230,7 +230,7 @@ public abstract class SchemaElementImpl
StringBuilder sb = new StringBuilder();
Entry entry = new DefaultEntry();
- EntryAttribute attribute = new DefaultEntryAttribute( id );
+ Attribute attribute = new DefaultEntryAttribute( id );
for ( String extension : extensions.keySet() )
{
Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java Thu Mar 31 23:21:50 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -37,7 +37,7 @@ public class AttributeClassLoader extend
{
/** The attribute. */
- private EntryAttribute attribute;
+ private Attribute attribute;
/**
@@ -55,7 +55,7 @@ public class AttributeClassLoader extend
* @param attribute the new attribute
* @throws LdapException if the attribute is not binary.
*/
- public void setAttribute( EntryAttribute attribute ) throws LdapException
+ public void setAttribute( Attribute attribute ) throws LdapException
{
if ( attribute.isHumanReadable() )
{
Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Thu Mar 31 23:21:50 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -101,7 +101,7 @@ public class SchemaEntityFactory impleme
private String getOid( Entry entry, String objectType ) throws LdapInvalidAttributeValueException
{
// The OID
- EntryAttribute mOid = entry.get( MetaSchemaConstants.M_OID_AT );
+ Attribute mOid = entry.get( MetaSchemaConstants.M_OID_AT );
if ( mOid == null )
{
@@ -240,7 +240,7 @@ public class SchemaEntityFactory impleme
if ( entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT ) != null )
{
Set<String> depsSet = new HashSet<String>();
- EntryAttribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
+ Attribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
for ( Value<?> value : depsAttr )
{
@@ -257,7 +257,7 @@ public class SchemaEntityFactory impleme
/**
* Class load a syntaxChecker instance
*/
- private SyntaxChecker classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className, EntryAttribute byteCode )
+ private SyntaxChecker classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className, Attribute byteCode )
throws Exception
{
// Try to class load the syntaxChecker
@@ -327,7 +327,7 @@ public class SchemaEntityFactory impleme
String className = getFqcn( entry, SchemaConstants.SYNTAX_CHECKER );
// The ByteCode
- EntryAttribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
+ Attribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
try
{
@@ -374,7 +374,7 @@ public class SchemaEntityFactory impleme
String fqcn = getFqcn( syntaxCheckerDescription, SchemaConstants.SYNTAX_CHECKER );
// get the byteCode
- EntryAttribute byteCode = getByteCode( syntaxCheckerDescription, SchemaConstants.SYNTAX_CHECKER );
+ Attribute byteCode = getByteCode( syntaxCheckerDescription, SchemaConstants.SYNTAX_CHECKER );
// Class load the SyntaxChecker
SyntaxChecker syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, fqcn, byteCode );
@@ -390,7 +390,7 @@ public class SchemaEntityFactory impleme
* Class load a comparator instances
*/
private LdapComparator<?> classLoadComparator( SchemaManager schemaManager, String oid, String className,
- EntryAttribute byteCode ) throws Exception
+ Attribute byteCode ) throws Exception
{
// Try to class load the comparator
LdapComparator<?> comparator = null;
@@ -470,7 +470,7 @@ public class SchemaEntityFactory impleme
String fqcn = getFqcn( comparatorDescription, SchemaConstants.COMPARATOR );
// get the byteCode
- EntryAttribute byteCode = getByteCode( comparatorDescription, SchemaConstants.COMPARATOR );
+ Attribute byteCode = getByteCode( comparatorDescription, SchemaConstants.COMPARATOR );
// Class load the comparator
LdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
@@ -516,7 +516,7 @@ public class SchemaEntityFactory impleme
String fqcn = getFqcn( entry, SchemaConstants.COMPARATOR );
// The ByteCode
- EntryAttribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
+ Attribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
try
{
@@ -540,7 +540,7 @@ public class SchemaEntityFactory impleme
* Class load a normalizer instances
*/
private Normalizer classLoadNormalizer( SchemaManager schemaManager, String oid, String className,
- EntryAttribute byteCode ) throws Exception
+ Attribute byteCode ) throws Exception
{
// Try to class load the normalizer
Class<?> clazz = null;
@@ -601,7 +601,7 @@ public class SchemaEntityFactory impleme
String fqcn = getFqcn( normalizerDescription, SchemaConstants.NORMALIZER );
// get the byteCode
- EntryAttribute byteCode = getByteCode( normalizerDescription, SchemaConstants.NORMALIZER );
+ Attribute byteCode = getByteCode( normalizerDescription, SchemaConstants.NORMALIZER );
// Class load the normalizer
Normalizer normalizer = classLoadNormalizer( schemaManager, oid, fqcn, byteCode );
@@ -647,7 +647,7 @@ public class SchemaEntityFactory impleme
String className = getFqcn( entry, SchemaConstants.NORMALIZER );
// The ByteCode
- EntryAttribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
+ Attribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
try
{
@@ -703,7 +703,7 @@ public class SchemaEntityFactory impleme
LdapSyntax syntax = new LdapSyntax( oid );
// The isHumanReadable field
- EntryAttribute mHumanReadable = entry.get( MetaSchemaConstants.X_HUMAN_READABLE_AT );
+ Attribute mHumanReadable = entry.get( MetaSchemaConstants.X_HUMAN_READABLE_AT );
if ( mHumanReadable != null )
{
@@ -753,7 +753,7 @@ public class SchemaEntityFactory impleme
MatchingRule matchingRule = new MatchingRule( oid );
// The syntax field
- EntryAttribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );
+ Attribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );
if ( mSyntax != null )
{
@@ -773,7 +773,7 @@ public class SchemaEntityFactory impleme
/**
* Create a list of string from a multivalued attribute's values
*/
- private List<String> getStrings( EntryAttribute attr )
+ private List<String> getStrings( Attribute attr )
{
if ( attr == null )
{
@@ -825,7 +825,7 @@ public class SchemaEntityFactory impleme
ObjectClass oc = new ObjectClass( oid );
// The Sup field
- EntryAttribute mSuperiors = entry.get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
+ Attribute mSuperiors = entry.get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
if ( mSuperiors != null )
{
@@ -833,7 +833,7 @@ public class SchemaEntityFactory impleme
}
// The May field
- EntryAttribute mMay = entry.get( MetaSchemaConstants.M_MAY_AT );
+ Attribute mMay = entry.get( MetaSchemaConstants.M_MAY_AT );
if ( mMay != null )
{
@@ -841,7 +841,7 @@ public class SchemaEntityFactory impleme
}
// The Must field
- EntryAttribute mMust = entry.get( MetaSchemaConstants.M_MUST_AT );
+ Attribute mMust = entry.get( MetaSchemaConstants.M_MUST_AT );
if ( mMust != null )
{
@@ -849,7 +849,7 @@ public class SchemaEntityFactory impleme
}
// The objectClassType field
- EntryAttribute mTypeObjectClass = entry.get( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT );
+ Attribute mTypeObjectClass = entry.get( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT );
if ( mTypeObjectClass != null )
{
@@ -900,7 +900,7 @@ public class SchemaEntityFactory impleme
AttributeType attributeType = new AttributeType( oid );
// Syntax
- EntryAttribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );
+ Attribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );
if ( ( mSyntax != null ) && ( mSyntax.get() != null ) )
{
@@ -908,7 +908,7 @@ public class SchemaEntityFactory impleme
}
// Syntax Length
- EntryAttribute mSyntaxLength = entry.get( MetaSchemaConstants.M_LENGTH_AT );
+ Attribute mSyntaxLength = entry.get( MetaSchemaConstants.M_LENGTH_AT );
if ( mSyntaxLength != null )
{
@@ -916,7 +916,7 @@ public class SchemaEntityFactory impleme
}
// Equality
- EntryAttribute mEquality = entry.get( MetaSchemaConstants.M_EQUALITY_AT );
+ Attribute mEquality = entry.get( MetaSchemaConstants.M_EQUALITY_AT );
if ( mEquality != null )
{
@@ -924,7 +924,7 @@ public class SchemaEntityFactory impleme
}
// Ordering
- EntryAttribute mOrdering = entry.get( MetaSchemaConstants.M_ORDERING_AT );
+ Attribute mOrdering = entry.get( MetaSchemaConstants.M_ORDERING_AT );
if ( mOrdering != null )
{
@@ -932,14 +932,14 @@ public class SchemaEntityFactory impleme
}
// Substr
- EntryAttribute mSubstr = entry.get( MetaSchemaConstants.M_SUBSTR_AT );
+ Attribute mSubstr = entry.get( MetaSchemaConstants.M_SUBSTR_AT );
if ( mSubstr != null )
{
attributeType.setSubstringOid( mSubstr.getString() );
}
- EntryAttribute mSupAttributeType = entry.get( MetaSchemaConstants.M_SUP_ATTRIBUTE_TYPE_AT );
+ Attribute mSupAttributeType = entry.get( MetaSchemaConstants.M_SUP_ATTRIBUTE_TYPE_AT );
// Sup
if ( mSupAttributeType != null )
@@ -948,7 +948,7 @@ public class SchemaEntityFactory impleme
}
// isCollective
- EntryAttribute mCollective = entry.get( MetaSchemaConstants.M_COLLECTIVE_AT );
+ Attribute mCollective = entry.get( MetaSchemaConstants.M_COLLECTIVE_AT );
if ( mCollective != null )
{
@@ -957,7 +957,7 @@ public class SchemaEntityFactory impleme
}
// isSingleValued
- EntryAttribute mSingleValued = entry.get( MetaSchemaConstants.M_SINGLE_VALUE_AT );
+ Attribute mSingleValued = entry.get( MetaSchemaConstants.M_SINGLE_VALUE_AT );
if ( mSingleValued != null )
{
@@ -966,7 +966,7 @@ public class SchemaEntityFactory impleme
}
// isReadOnly
- EntryAttribute mNoUserModification = entry.get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
+ Attribute mNoUserModification = entry.get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
if ( mNoUserModification != null )
{
@@ -975,7 +975,7 @@ public class SchemaEntityFactory impleme
}
// Usage
- EntryAttribute mUsage = entry.get( MetaSchemaConstants.M_USAGE_AT );
+ Attribute mUsage = entry.get( MetaSchemaConstants.M_USAGE_AT );
if ( mUsage != null )
{
@@ -996,7 +996,7 @@ public class SchemaEntityFactory impleme
private String getFqcn( Entry entry, String objectType ) throws LdapInvalidAttributeValueException
{
// The FQCN
- EntryAttribute mFqcn = entry.get( MetaSchemaConstants.M_FQCN_AT );
+ Attribute mFqcn = entry.get( MetaSchemaConstants.M_FQCN_AT );
if ( mFqcn == null )
{
@@ -1031,7 +1031,7 @@ public class SchemaEntityFactory impleme
/**
* Process the ByteCode attribute
*/
- private EntryAttribute getByteCode( LoadableSchemaObject description, String objectType )
+ private Attribute getByteCode( LoadableSchemaObject description, String objectType )
{
String byteCodeString = description.getBytecode();
@@ -1043,7 +1043,7 @@ public class SchemaEntityFactory impleme
}
byte[] bytecode = Base64.decode( byteCodeString.toCharArray() );
- EntryAttribute attr = new DefaultEntryAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
+ Attribute attr = new DefaultEntryAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
return attr;
}
@@ -1065,7 +1065,7 @@ public class SchemaEntityFactory impleme
throws LdapInvalidAttributeValueException
{
// The isObsolete field
- EntryAttribute mObsolete = entry.get( MetaSchemaConstants.M_OBSOLETE_AT );
+ Attribute mObsolete = entry.get( MetaSchemaConstants.M_OBSOLETE_AT );
if ( mObsolete != null )
{
@@ -1074,7 +1074,7 @@ public class SchemaEntityFactory impleme
}
// The description field
- EntryAttribute mDescription = entry.get( MetaSchemaConstants.M_DESCRIPTION_AT );
+ Attribute mDescription = entry.get( MetaSchemaConstants.M_DESCRIPTION_AT );
if ( mDescription != null )
{
@@ -1082,7 +1082,7 @@ public class SchemaEntityFactory impleme
}
// The names field
- EntryAttribute names = entry.get( MetaSchemaConstants.M_NAME_AT );
+ Attribute names = entry.get( MetaSchemaConstants.M_NAME_AT );
if ( names != null )
{
@@ -1097,7 +1097,7 @@ public class SchemaEntityFactory impleme
}
// The isEnabled field
- EntryAttribute mDisabled = entry.get( MetaSchemaConstants.M_DISABLED_AT );
+ Attribute mDisabled = entry.get( MetaSchemaConstants.M_DISABLED_AT );
// If the SchemaObject has an explicit m-disabled attribute, then use it.
// Otherwise, inherit it from the schema
@@ -1112,7 +1112,7 @@ public class SchemaEntityFactory impleme
}
// The isReadOnly field
- EntryAttribute mIsReadOnly = entry.get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
+ Attribute mIsReadOnly = entry.get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
if ( mIsReadOnly != null )
{