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/20 22:22:47 UTC
svn commit: r1083574 [5/12] - in /directory:
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/changelog/
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/aka...
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sun Mar 20 21:22:39 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.StringValue;
import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -164,7 +164,7 @@ public class GreaterEqTest
@Test
public void testCursorIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
@@ -401,7 +401,7 @@ public class GreaterEqTest
@Test
public void testCursorNotIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
@@ -551,7 +551,7 @@ public class GreaterEqTest
@Test
public void testEvaluatorIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
@@ -596,7 +596,7 @@ public class GreaterEqTest
@Test
public void testEvaluatorWithDescendantValue() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
@@ -623,7 +623,7 @@ public class GreaterEqTest
@Test
public void testEvaluatorWithoutDescendants() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
@@ -641,7 +641,7 @@ public class GreaterEqTest
@Test
public void testEvaluatorNotIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
@@ -688,7 +688,7 @@ public class GreaterEqTest
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
MutableLdapSyntaxImpl syntax = new BogusSyntax( 1 );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
@@ -717,7 +717,7 @@ public class GreaterEqTest
mr.setSyntax( syntax );
mr.setLdapComparator( new StringComparator( "1.1" ) );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
+ MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sun Mar 20 21:22:39 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.StringValue;
import org.apache.directory.shared.ldap.model.filter.LessEqNode;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -164,7 +164,7 @@ public class LessEqTest
@Test
public void testCursorIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
@@ -421,7 +421,7 @@ public class LessEqTest
@Test
public void testCursorNotIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
@@ -575,7 +575,7 @@ public class LessEqTest
@Test
public void testEvaluatorIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
@@ -621,7 +621,7 @@ public class LessEqTest
@Test
public void testEvaluatorWithDescendantValue() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
@@ -649,7 +649,7 @@ public class LessEqTest
@Test
public void testEvaluatorWithoutDescendants() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
@@ -667,7 +667,7 @@ public class LessEqTest
@Test
public void testEvaluatorNotIndexed() throws Exception
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
@@ -714,7 +714,7 @@ public class LessEqTest
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
MutableLdapSyntaxImpl syntax = new BogusSyntax( 1 );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
@@ -745,7 +745,7 @@ public class LessEqTest
mr.setSyntax( syntax );
mr.setLdapComparator( new StringComparator( "1.1" ) );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
+ MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
Modified: directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sun Mar 20 21:22:39 2011
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.ldif.LdifReader;
import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -790,7 +790,7 @@ public class PartitionFrame extends JFra
*/
public void showIndexDialog( String idxAttr ) throws Exception
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( idxAttr );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( idxAttr );
Index index;
boolean isSystem = partition.hasSystemIndexOn( attributeType );
Modified: directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializerTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializerTest.java (original)
+++ directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializerTest.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.io.ObjectOutputStream;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.EntryAttributeSerializer;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
import org.junit.BeforeClass;
@@ -53,8 +53,8 @@ public class SchemaAwareEntryAttributeSe
private static byte[] data2 = new byte[] {0x05, 0x06, 0x07, 0x08};
private static byte[] data3 = new byte[] {0x09, 0x0A, 0x0B, 0x0C};
- private static AttributeType cn = null;
- private static AttributeType userCertificate = null;
+ private static MutableAttributeTypeImpl cn = null;
+ private static MutableAttributeTypeImpl userCertificate = null;
private static SchemaManager schemaManager;
Modified: directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareValueSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareValueSerializerTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareValueSerializerTest.java (original)
+++ directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareValueSerializerTest.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.io.ObjectOutputStream;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
import org.apache.directory.shared.ldap.model.entry.StringValue;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
import org.apache.directory.shared.util.StringConstants;
@@ -74,8 +74,8 @@ public class SchemaAwareValueSerializerT
public static void setup() throws Exception
{
schemaManager = new DefaultSchemaManager();
- AttributeType cn = schemaManager.getAttributeType( "cn" );
- AttributeType userCertificate = schemaManager.getAttributeType( "userCertificate" );
+ MutableAttributeTypeImpl cn = schemaManager.getAttributeType( "cn" );
+ MutableAttributeTypeImpl userCertificate = schemaManager.getAttributeType( "userCertificate" );
bv1 = new BinaryValue( userCertificate, data );
bv2 = new BinaryValue( userCertificate, StringConstants.EMPTY_BYTES );
Modified: directory/shared/branches/akarasulu/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/akarasulu/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sun Mar 20 21:22:39 2011
@@ -126,7 +126,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.extended.SearchNoDResponse;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
@@ -3286,9 +3286,9 @@ public class LdapNetworkConnection exten
olsp.setQuirksMode( true );
olsp.parse( schemaFile );
- List<AttributeType> atList = olsp.getAttributeTypes();
+ List<MutableAttributeTypeImpl> atList = olsp.getAttributeTypes();
AttributeTypeRegistry atRegistry = schemaManager.getRegistries().getAttributeTypeRegistry();
- for ( AttributeType atType : atList )
+ for ( MutableAttributeTypeImpl atType : atList )
{
atRegistry.addMappingFor( atType );
}
@@ -3470,7 +3470,7 @@ public class LdapNetworkConnection exten
{
try
{
- AttributeType type = schemaManager.lookupAttributeTypeRegistry( id );
+ MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( id );
return !type.getSyntax().isHumanReadable();
}
catch ( Exception e )
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/antlr/ACIItem.g?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/antlr/ACIItem.g (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/antlr/ACIItem.g Sun Mar 20 21:22:39 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.util.
import org.apache.directory.shared.util.OptionalComponentsMonitor;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
@@ -450,7 +450,7 @@ allUserAttributeTypes
attributeType
{
log.debug( "entered attributeType()" );
- Set<AttributeType> attributeTypeSet = null;
+ Set<MutableAttributeTypeImpl> attributeTypeSet = null;
}
:
ID_attributeType ( SP )+ attributeTypeSet=attributeTypeSet
@@ -462,7 +462,7 @@ attributeType
allAttributeValues
{
log.debug( "entered allAttributeValues()" );
- Set<AttributeType> attributeTypeSet = null;
+ Set<MutableAttributeTypeImpl> attributeTypeSet = null;
}
:
ID_allAttributeValues ( SP )+ attributeTypeSet=attributeTypeSet
@@ -524,7 +524,7 @@ attributeValue
selfValue
{
log.debug( "entered selfValue()" );
- Set<AttributeType> attributeTypeSet = null;
+ Set<MutableAttributeTypeImpl> attributeTypeSet = null;
}
:
ID_selfValue ( SP )+ attributeTypeSet=attributeTypeSet
@@ -582,7 +582,7 @@ aMaxValueCount returns [ MaxValueCountEl
maxValueCount = null;
String oid = null;
Token token = null;
- AttributeType attributeType = null;
+ MutableAttributeTypeImpl attributeType = null;
}
:
OPEN_CURLY ( SP )*
@@ -654,8 +654,8 @@ restrictedValue returns [ RestrictedByEl
String typeOid = null;
String valuesInOid = null;
restrictedValue = null;
- AttributeType attributeType = null;
- AttributeType valueInAttributeType = null;
+ MutableAttributeTypeImpl attributeType = null;
+ MutableAttributeTypeImpl valueInAttributeType = null;
}
:
OPEN_CURLY ( SP )*
@@ -682,12 +682,12 @@ restrictedValue returns [ RestrictedByEl
}
;
-attributeTypeSet returns [ Set<AttributeType> attributeTypeSet ]
+attributeTypeSet returns [ Set<MutableAttributeTypeImpl> attributeTypeSet ]
{
log.debug( "entered attributeTypeSet()" );
String oid = null;
- attributeTypeSet = new HashSet<AttributeType>();
- AttributeType attributeType = null;
+ attributeTypeSet = new HashSet<MutableAttributeTypeImpl>();
+ MutableAttributeTypeImpl attributeType = null;
}
:
OPEN_CURLY ( SP )*
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public abstract class AbstractAttributeTypeProtectedItem extends ProtectedItem
{
/** The attribute types. */
- protected final Set<AttributeType> attributeTypes;
+ protected final Set<MutableAttributeTypeImpl> attributeTypes;
/**
@@ -42,7 +42,7 @@ public abstract class AbstractAttributeT
*
* @param attributeTypes the collection of attribute IDs
*/
- protected AbstractAttributeTypeProtectedItem( Set<AttributeType> attributeTypes )
+ protected AbstractAttributeTypeProtectedItem( Set<MutableAttributeTypeImpl> attributeTypes )
{
this.attributeTypes = Collections.unmodifiableSet( attributeTypes );
}
@@ -53,7 +53,7 @@ public abstract class AbstractAttributeT
*
* @return the iterator of all attribute types
*/
- public Iterator<AttributeType> iterator()
+ public Iterator<MutableAttributeTypeImpl> iterator()
{
return attributeTypes.iterator();
}
@@ -108,7 +108,7 @@ public abstract class AbstractAttributeT
buf.append( "{ " );
boolean isFirst = true;
- for ( AttributeType attributeType : attributeTypes )
+ for ( MutableAttributeTypeImpl attributeType : attributeTypes )
{
if ( isFirst )
{
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Set;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -35,7 +35,7 @@ public class AllAttributeValuesItem exte
*
* @param attributeTypes the collection of attribute IDs.
*/
- public AllAttributeValuesItem( Set<AttributeType> attributeTypes )
+ public AllAttributeValuesItem( Set<MutableAttributeTypeImpl> attributeTypes )
{
super( attributeTypes );
}
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Set;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -36,7 +36,7 @@ public class AttributeTypeItem extends A
*
* @param attributeTypes the collection of attribute IDs.
*/
- public AttributeTypeItem( Set<AttributeType> attributeTypes )
+ public AttributeTypeItem( Set<MutableAttributeTypeImpl> attributeTypes )
{
super( attributeTypes );
}
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.aci.protectedItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
public class MaxValueCountElem
{
/** The targeted AttributeType */
- private AttributeType attributeType;
+ private MutableAttributeTypeImpl attributeType;
/** The maximum number of accepted values for this attributeType */
private int maxCount;
@@ -42,7 +42,7 @@ public class MaxValueCountElem
* @param maxCount the maximum count of the attribute allowed
*/
- public MaxValueCountElem( AttributeType attributeType, int maxCount )
+ public MaxValueCountElem( MutableAttributeTypeImpl attributeType, int maxCount )
{
this.attributeType = attributeType;
this.maxCount = maxCount;
@@ -54,7 +54,7 @@ public class MaxValueCountElem
*
* @return the attribute type
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.aci.protectedItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -29,10 +29,10 @@ import org.apache.directory.shared.ldap.
public class RestrictedByElem
{
/** The AttributeType on which the restriction is applied */
- private AttributeType attributeType;
+ private MutableAttributeTypeImpl attributeType;
/** The list of allowed AttributeType values */
- private AttributeType valuesIn;
+ private MutableAttributeTypeImpl valuesIn;
/**
@@ -41,7 +41,7 @@ public class RestrictedByElem
* @param attributeType the attribute type to restrict
* @param valuesIn the attribute type only whose values are allowed in <tt>attributeType</tt>.
*/
- public RestrictedByElem( AttributeType attributeType, AttributeType valuesIn )
+ public RestrictedByElem( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl valuesIn )
{
this.attributeType = attributeType;
this.valuesIn = valuesIn;
@@ -53,7 +53,7 @@ public class RestrictedByElem
*
* @return the attribute type
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
@@ -65,7 +65,7 @@ public class RestrictedByElem
*
* @return the list of allowed AttributeType values
*/
- public AttributeType getValuesIn()
+ public MutableAttributeTypeImpl getValuesIn()
{
return valuesIn;
}
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Set;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -40,7 +40,7 @@ public class SelfValueItem extends Abstr
*
* @param attributeTypes the collection of attribute IDs.
*/
- public SelfValueItem( Set<AttributeType> attributeTypes )
+ public SelfValueItem( Set<MutableAttributeTypeImpl> attributeTypes )
{
super( attributeTypes );
}
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,18 +56,18 @@ public class ProtectedItem_AllAttributeV
@Before
public void initNames() throws Exception
{
- Set<AttributeType> colA = new HashSet<AttributeType>();
- colA.add( new AttributeType( "aa" ) );
- colA.add( new AttributeType( "bb" ) );
- colA.add( new AttributeType( "cc" ) );
- Set<AttributeType> colB = new HashSet<AttributeType>();
- colB.add( new AttributeType( "aa" ) );
- colB.add( new AttributeType( "bb" ) );
- colB.add( new AttributeType( "cc" ) );
- Set<AttributeType> colC = new HashSet<AttributeType>();
- colC.add( new AttributeType( "bb" ) );
- colC.add( new AttributeType( "cc" ) );
- colC.add( new AttributeType( "dd" ) );
+ Set<MutableAttributeTypeImpl> colA = new HashSet<MutableAttributeTypeImpl>();
+ colA.add( new MutableAttributeTypeImpl( "aa" ) );
+ colA.add( new MutableAttributeTypeImpl( "bb" ) );
+ colA.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colB = new HashSet<MutableAttributeTypeImpl>();
+ colB.add( new MutableAttributeTypeImpl( "aa" ) );
+ colB.add( new MutableAttributeTypeImpl( "bb" ) );
+ colB.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colC = new HashSet<MutableAttributeTypeImpl>();
+ colC.add( new MutableAttributeTypeImpl( "bb" ) );
+ colC.add( new MutableAttributeTypeImpl( "cc" ) );
+ colC.add( new MutableAttributeTypeImpl( "dd" ) );
allAttributeValuesA = new AllAttributeValuesItem( colA );
allAttributeValuesACopy = new AllAttributeValuesItem( colA );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,18 +56,18 @@ public class ProtectedItem_AttributeType
@Before
public void initNames() throws Exception
{
- Set<AttributeType> colA = new HashSet<AttributeType>();
- colA.add( new AttributeType( "aa" ) );
- colA.add( new AttributeType( "bb" ) );
- colA.add( new AttributeType( "cc" ) );
- Set<AttributeType> colB = new HashSet<AttributeType>();
- colB.add( new AttributeType( "aa" ) );
- colB.add( new AttributeType( "bb" ) );
- colB.add( new AttributeType( "cc" ) );
- Set<AttributeType> colC = new HashSet<AttributeType>();
- colC.add( new AttributeType( "bb" ) );
- colC.add( new AttributeType( "cc" ) );
- colC.add( new AttributeType( "dd" ) );
+ Set<MutableAttributeTypeImpl> colA = new HashSet<MutableAttributeTypeImpl>();
+ colA.add( new MutableAttributeTypeImpl( "aa" ) );
+ colA.add( new MutableAttributeTypeImpl( "bb" ) );
+ colA.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colB = new HashSet<MutableAttributeTypeImpl>();
+ colB.add( new MutableAttributeTypeImpl( "aa" ) );
+ colB.add( new MutableAttributeTypeImpl( "bb" ) );
+ colB.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colC = new HashSet<MutableAttributeTypeImpl>();
+ colC.add( new MutableAttributeTypeImpl( "bb" ) );
+ colC.add( new MutableAttributeTypeImpl( "cc" ) );
+ colC.add( new MutableAttributeTypeImpl( "dd" ) );
attributeTypeA = new AttributeTypeItem( colA );
attributeTypeACopy = new AttributeTypeItem( colA );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,10 +58,10 @@ public class ProtectedItem_MaxValueCount
public void initNames() throws Exception
{
- MaxValueCountElem mvciA = new MaxValueCountElem( new AttributeType( "aa" ), 1 );
- MaxValueCountElem mvciB = new MaxValueCountElem( new AttributeType( "bb" ), 2 );
- MaxValueCountElem mvciC = new MaxValueCountElem( new AttributeType( "cc" ), 3 );
- MaxValueCountElem mvciD = new MaxValueCountElem( new AttributeType( "dd" ), 4 );
+ MaxValueCountElem mvciA = new MaxValueCountElem( new MutableAttributeTypeImpl( "aa" ), 1 );
+ MaxValueCountElem mvciB = new MaxValueCountElem( new MutableAttributeTypeImpl( "bb" ), 2 );
+ MaxValueCountElem mvciC = new MaxValueCountElem( new MutableAttributeTypeImpl( "cc" ), 3 );
+ MaxValueCountElem mvciD = new MaxValueCountElem( new MutableAttributeTypeImpl( "dd" ), 4 );
Set<MaxValueCountElem> colA = new HashSet<MaxValueCountElem>();
colA.add( mvciA );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,10 +57,10 @@ public class ProtectedItem_RestrictedByT
@Before
public void initNames() throws Exception
{
- RestrictedByElem rbiA = new RestrictedByElem( new AttributeType( "aa" ), new AttributeType( "aa" ) );
- RestrictedByElem rbiB = new RestrictedByElem( new AttributeType( "bb" ), new AttributeType( "bb" ) );
- RestrictedByElem rbiC = new RestrictedByElem( new AttributeType( "cc" ), new AttributeType( "cc" ) );
- RestrictedByElem rbiD = new RestrictedByElem( new AttributeType( "dd" ), new AttributeType( "dd" ) );
+ RestrictedByElem rbiA = new RestrictedByElem( new MutableAttributeTypeImpl( "aa" ), new MutableAttributeTypeImpl( "aa" ) );
+ RestrictedByElem rbiB = new RestrictedByElem( new MutableAttributeTypeImpl( "bb" ), new MutableAttributeTypeImpl( "bb" ) );
+ RestrictedByElem rbiC = new RestrictedByElem( new MutableAttributeTypeImpl( "cc" ), new MutableAttributeTypeImpl( "cc" ) );
+ RestrictedByElem rbiD = new RestrictedByElem( new MutableAttributeTypeImpl( "dd" ), new MutableAttributeTypeImpl( "dd" ) );
Set<RestrictedByElem> colA = new HashSet<RestrictedByElem>();
colA.add( rbiA );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,18 +56,18 @@ public class ProtectedItem_SelfValueTest
@Before
public void initNames() throws Exception
{
- Set<AttributeType> colA = new HashSet<AttributeType>();
- colA.add( new AttributeType( "aa" ) );
- colA.add( new AttributeType( "bb" ) );
- colA.add( new AttributeType( "cc" ) );
- Set<AttributeType> colB = new HashSet<AttributeType>();
- colB.add( new AttributeType( "aa" ) );
- colB.add( new AttributeType( "bb" ) );
- colB.add( new AttributeType( "cc" ) );
- Set<AttributeType> colC = new HashSet<AttributeType>();
- colC.add( new AttributeType( "bb" ) );
- colC.add( new AttributeType( "cc" ) );
- colC.add( new AttributeType( "dd" ) );
+ Set<MutableAttributeTypeImpl> colA = new HashSet<MutableAttributeTypeImpl>();
+ colA.add( new MutableAttributeTypeImpl( "aa" ) );
+ colA.add( new MutableAttributeTypeImpl( "bb" ) );
+ colA.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colB = new HashSet<MutableAttributeTypeImpl>();
+ colB.add( new MutableAttributeTypeImpl( "aa" ) );
+ colB.add( new MutableAttributeTypeImpl( "bb" ) );
+ colB.add( new MutableAttributeTypeImpl( "cc" ) );
+ Set<MutableAttributeTypeImpl> colC = new HashSet<MutableAttributeTypeImpl>();
+ colC.add( new MutableAttributeTypeImpl( "bb" ) );
+ colC.add( new MutableAttributeTypeImpl( "cc" ) );
+ colC.add( new MutableAttributeTypeImpl( "dd" ) );
selfValueA = new SelfValueItem( colA );
selfValueACopy = new SelfValueItem( colA );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,22 +62,22 @@ public class MaxValueCountItemTest
public void initNames() throws Exception
{
itemsA = new HashSet<MaxValueCountElem>();
- itemsA.add( new MaxValueCountElem( new AttributeType("aa"), 1 ) );
- itemsA.add( new MaxValueCountElem( new AttributeType("aa"), 2 ) );
- itemsA.add( new MaxValueCountElem( new AttributeType("aa"), 3 ) );
+ itemsA.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 1 ) );
+ itemsA.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 2 ) );
+ itemsA.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 3 ) );
// Sets aren't ordered, so adding order must not matter
itemsB = new HashSet<MaxValueCountElem>();
- itemsB.add( new MaxValueCountElem( new AttributeType("aa"), 2 ) );
- itemsB.add( new MaxValueCountElem( new AttributeType("aa"), 3 ) );
- itemsB.add( new MaxValueCountElem( new AttributeType("aa"), 1 ) );
+ itemsB.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 2 ) );
+ itemsB.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 3 ) );
+ itemsB.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 1 ) );
itemsC = new HashSet<MaxValueCountElem>();
- itemsC.add( new MaxValueCountElem( new AttributeType("aa"), 1 ) );
- itemsC.add( new MaxValueCountElem( new AttributeType("bb"), 2 ) );
- itemsC.add( new MaxValueCountElem( new AttributeType("aa"), 3 ) );
+ itemsC.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 1 ) );
+ itemsC.add( new MaxValueCountElem( new MutableAttributeTypeImpl("bb"), 2 ) );
+ itemsC.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 3 ) );
itemsD = new HashSet<MaxValueCountElem>();
- itemsD.add( new MaxValueCountElem( new AttributeType("aa"), 1 ) );
- itemsD.add( new MaxValueCountElem( new AttributeType("aa"), 2 ) );
- itemsD.add( new MaxValueCountElem( new AttributeType("aa"), 4 ) );
+ itemsD.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 1 ) );
+ itemsD.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 2 ) );
+ itemsD.add( new MaxValueCountElem( new MutableAttributeTypeImpl("aa"), 4 ) );
maxValueCountItemA = new MaxValueCountItem( itemsA );
maxValueCountItemACopy = new MaxValueCountItem( itemsA );
maxValueCountItemB = new MaxValueCountItem( itemsB );
Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,22 +62,22 @@ public class RestrictedByItemTest
public void initNames() throws Exception
{
elemsA = new HashSet<RestrictedByElem>();
- elemsA.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("aa") ) );
- elemsA.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("bb") ) );
- elemsA.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("cc") ) );
+ elemsA.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("aa") ) );
+ elemsA.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("bb") ) );
+ elemsA.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("cc") ) );
// Sets aren't ordered, so adding order must not matter
elemsB = new HashSet<RestrictedByElem>();
- elemsB.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("bb") ) );
- elemsB.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("cc") ) );
- elemsB.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("aa") ) );
+ elemsB.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("bb") ) );
+ elemsB.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("cc") ) );
+ elemsB.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("aa") ) );
elemsC = new HashSet<RestrictedByElem>();
- elemsC.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("aa") ) );
- elemsC.add( new RestrictedByElem( new AttributeType("bb"), new AttributeType("bb") ) );
- elemsC.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("cc") ) );
+ elemsC.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("aa") ) );
+ elemsC.add( new RestrictedByElem( new MutableAttributeTypeImpl("bb"), new MutableAttributeTypeImpl("bb") ) );
+ elemsC.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("cc") ) );
elemsD = new HashSet<RestrictedByElem>();
- elemsD.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("aa") ) );
- elemsD.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("bb") ) );
- elemsD.add( new RestrictedByElem( new AttributeType("aa"), new AttributeType("dd") ) );
+ elemsD.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("aa") ) );
+ elemsD.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("bb") ) );
+ elemsD.add( new RestrictedByElem( new MutableAttributeTypeImpl("aa"), new MutableAttributeTypeImpl("dd") ) );
restrictedByItemA = new RestrictedByItem( elemsA );
restrictedByItemACopy = new RestrictedByItem( elemsA );
restrictedByItemB = new RestrictedByItem( elemsB );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/antlr/schema.g?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/antlr/schema.g (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/antlr/schema.g Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.NameForm;
import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
import org.apache.directory.shared.ldap.model.schema.parsers.ParserMonitor;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
@@ -245,7 +245,7 @@ options {
openLdapSchema returns [List<Object> list = new ArrayList<Object>()]
{
- AttributeType attributeType = null;
+ MutableAttributeTypeImpl attributeType = null;
ObjectClass objectClass = null;
OpenLdapObjectIdentifierMacro oloid = null;
}
@@ -288,7 +288,7 @@ openLdapObjectClass returns [ObjectClass
;
-openLdapAttributeType returns [AttributeType attributeType]
+openLdapAttributeType returns [MutableAttributeTypeImpl attributeType]
{
matchedProduction( "openLdapAttributeType()" );
}
@@ -389,13 +389,13 @@ objectClassDescription returns [ObjectCl
* xstring = "X" HYPHEN 1*( ALPHA / HYPHEN / USCORE )
* </pre>
*/
-attributeTypeDescription returns [AttributeType attributeType]
+attributeTypeDescription returns [MutableAttributeTypeImpl attributeType]
{
matchedProduction( "attributeTypeDescription()" );
ElementTracker et = new ElementTracker();
}
:
- ( oid:STARTNUMERICOID { attributeType = new AttributeType(numericoid(oid.getText())); } )
+ ( oid:STARTNUMERICOID { attributeType = new MutableAttributeTypeImpl(numericoid(oid.getText())); } )
(
( name:NAME { et.track("NAME", name); attributeType.setNames(qdescrs(name.getText())); } )
|
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/antlr/subtree-specification.g?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/antlr/subtree-specification.g Sun Mar 20 21:22:39 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.util.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.StringValue;
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.MutableAttributeTypeImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +98,7 @@ options
private SchemaManager schemaManager;
/** The ObjectClass AT */
- AttributeType OBJECT_CLASS_AT;
+ MutableAttributeTypeImpl OBJECT_CLASS_AT;
private ComponentsMonitor subtreeSpecificationComponentsMonitor = null;
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.io.ObjectOutput;
import org.apache.directory.shared.i18n.I18n;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -47,7 +47,7 @@ public abstract class AbstractValue<T> i
private static final Logger LOG = LoggerFactory.getLogger( AbstractValue.class );
/** reference to the attributeType zssociated with the value */
- protected transient AttributeType attributeType;
+ protected transient MutableAttributeTypeImpl attributeType;
/** the wrapped binary value */
protected T wrappedValue;
@@ -97,7 +97,7 @@ public abstract class AbstractValue<T> i
/**
* {@inheritDoc}
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
@@ -106,7 +106,7 @@ public abstract class AbstractValue<T> i
/**
* {@inheritDoc}
*/
- public void apply( AttributeType attributeType )
+ public void apply( MutableAttributeTypeImpl attributeType )
{
if ( this.attributeType != null )
{
@@ -249,7 +249,7 @@ public abstract class AbstractValue<T> i
/**
* {@inheritDoc}
*/
- public boolean instanceOf( AttributeType attributeType ) throws LdapException
+ public boolean instanceOf( MutableAttributeTypeImpl attributeType ) throws LdapException
{
if ( ( attributeType != null ) && this.attributeType.equals( attributeType ) )
{
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeTypeException;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
@@ -70,7 +70,7 @@ public final class AttributeUtils
* @param entry the entry to remove the attribute from
* @return the Attribute that is removed
*/
- public static Attribute removeAttribute( AttributeType type, Attributes entry )
+ public static Attribute removeAttribute( MutableAttributeTypeImpl type, Attributes entry )
{
Attribute attr = entry.get( type.getOid() );
@@ -208,7 +208,7 @@ public final class AttributeUtils
* @param type the attribute type specification
* @return an Attribute with matching the attributeType spec or null
*/
- public static Attribute getAttribute( Attributes attrs, AttributeType type )
+ public static Attribute getAttribute( Attributes attrs, MutableAttributeTypeImpl type )
{
// check if the attribute's OID is used
Attribute attr = attrs.get( type.getOid() );
@@ -253,7 +253,7 @@ public final class AttributeUtils
* @return <code>true</code> if the value exists in the attribute
* @throws LdapException If something went wrong while accessing the data
*/
- public static boolean containsValue( Attribute attr, Value<?> compared, AttributeType type ) throws LdapException
+ public static boolean containsValue( Attribute attr, Value<?> compared, MutableAttributeTypeImpl type ) throws LdapException
{
// quick bypass test
if ( attr.contains( compared ) )
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java Sun Mar 20 21:22:39 2011
@@ -27,7 +27,7 @@ import java.util.Comparator;
import org.apache.directory.shared.i18n.I18n;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -73,7 +73,7 @@ public class BinaryValue extends Abstrac
*
* @param attributeType the schema type associated with this BinaryValue
*/
- public BinaryValue( AttributeType attributeType )
+ public BinaryValue( MutableAttributeTypeImpl attributeType )
{
if ( attributeType == null )
{
@@ -125,7 +125,7 @@ public class BinaryValue extends Abstrac
* @param attributeType the schema type associated with this BinaryValue
* @param value the binary value to wrap which may be null, or a zero length byte array
*/
- public BinaryValue( AttributeType attributeType, byte[] value )
+ public BinaryValue( MutableAttributeTypeImpl attributeType, byte[] value )
{
this( attributeType );
SyntaxChecker syntaxChecker = attributeType.getSyntax().getSyntaxChecker();
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.DnSerializer;
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.directory.shared.ldap.model.name.RdnSerializer;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.util.Strings;
import org.apache.directory.shared.util.Unicode;
@@ -71,7 +71,7 @@ public class DefaultEntry implements Ent
private Map<String, EntryAttribute> attributes = new HashMap<String, EntryAttribute>();
/** A speedup to get the ObjectClass attribute */
- private static AttributeType objectClassAttributeType;
+ private static MutableAttributeTypeImpl objectClassAttributeType;
/** The SchemaManager */
private SchemaManager schemaManager;
@@ -218,7 +218,7 @@ public class DefaultEntry implements Ent
try
{
// First get the AttributeType
- AttributeType attributeType = attribute.getAttributeType();
+ MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
if ( attributeType == null )
{
@@ -382,7 +382,7 @@ public class DefaultEntry implements Ent
* @param dn The Dn for this serverEntry. Can be null.
* @param attributeTypes The list of attributes to create, without value.
*/
- public DefaultEntry( SchemaManager schemaManager, Dn dn, AttributeType... attributeTypes )
+ public DefaultEntry( SchemaManager schemaManager, Dn dn, MutableAttributeTypeImpl... attributeTypes )
{
this.schemaManager = schemaManager;
@@ -425,7 +425,7 @@ public class DefaultEntry implements Ent
* @param attributeType The attribute to create, without value.
* @param upId The User Provided ID fro this AttributeType
*/
- public DefaultEntry( SchemaManager schemaManager, Dn dn, AttributeType attributeType, String upId )
+ public DefaultEntry( SchemaManager schemaManager, Dn dn, MutableAttributeTypeImpl attributeType, String upId )
{
this.schemaManager = schemaManager;
@@ -508,7 +508,7 @@ public class DefaultEntry implements Ent
*
* @param upId The ID
*/
- private static String getUpId( String upId, AttributeType attributeType )
+ private static String getUpId( String upId, MutableAttributeTypeImpl attributeType )
{
String normUpId = Strings.trim(upId);
@@ -541,7 +541,7 @@ public class DefaultEntry implements Ent
*
* Updates the AttributeMap.
*/
- protected void createAttribute( String upId, AttributeType attributeType, byte[]... values )
+ protected void createAttribute( String upId, MutableAttributeTypeImpl attributeType, byte[]... values )
{
EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -555,7 +555,7 @@ public class DefaultEntry implements Ent
*
* Updates the AttributeMap.
*/
- protected void createAttribute( String upId, AttributeType attributeType, String... values )
+ protected void createAttribute( String upId, MutableAttributeTypeImpl attributeType, String... values )
{
EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -569,7 +569,7 @@ public class DefaultEntry implements Ent
*
* Updates the AttributeMap.
*/
- protected void createAttribute( String upId, AttributeType attributeType, Value<?>... values )
+ protected void createAttribute( String upId, MutableAttributeTypeImpl attributeType, Value<?>... values )
{
EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -580,7 +580,7 @@ public class DefaultEntry implements Ent
/**
* Returns the attributeType from an Attribute ID.
*/
- protected AttributeType getAttributeType( String upId ) throws LdapException
+ protected MutableAttributeTypeImpl getAttributeType( String upId ) throws LdapException
{
if ( Strings.isEmpty(Strings.trim(upId)) )
{
@@ -599,7 +599,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( AttributeType attributeType, byte[]... values ) throws LdapException
+ public void add( MutableAttributeTypeImpl attributeType, byte[]... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -644,7 +644,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( AttributeType attributeType, String... values ) throws LdapException
+ public void add( MutableAttributeTypeImpl attributeType, String... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -674,7 +674,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( AttributeType attributeType, Value<?>... values ) throws LdapException
+ public void add( MutableAttributeTypeImpl attributeType, Value<?>... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -704,7 +704,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( String upId, AttributeType attributeType, byte[]... values ) throws LdapException
+ public void add( String upId, MutableAttributeTypeImpl attributeType, byte[]... values ) throws LdapException
{
// ObjectClass with binary values are not allowed
if ( attributeType.equals( objectClassAttributeType ) )
@@ -737,7 +737,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( String upId, AttributeType attributeType, Value<?>... values ) throws LdapException
+ public void add( String upId, MutableAttributeTypeImpl attributeType, Value<?>... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -767,7 +767,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public void add( String upId, AttributeType attributeType, String... values ) throws LdapException
+ public void add( String upId, MutableAttributeTypeImpl attributeType, String... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -804,7 +804,7 @@ public class DefaultEntry implements Ent
// Loop on all the added attributes
for ( EntryAttribute attribute : attributes )
{
- AttributeType attributeType = attribute.getAttributeType();
+ MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
if ( attributeType != null )
{
@@ -1064,7 +1064,7 @@ public class DefaultEntry implements Ent
return this.attributes.size() == 0;
}
- AttributeType attributeType = entryAttribute.getAttributeType();
+ MutableAttributeTypeImpl attributeType = entryAttribute.getAttributeType();
if ( ( entryAttribute == null ) || !this.attributes.containsKey( attributeType.getOid() ) )
{
@@ -1149,7 +1149,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean containsAttribute( AttributeType attributeType )
+ public boolean containsAttribute( MutableAttributeTypeImpl attributeType )
{
if ( attributeType == null )
{
@@ -1163,7 +1163,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean contains( AttributeType attributeType, byte[]... values )
+ public boolean contains( MutableAttributeTypeImpl attributeType, byte[]... values )
{
if ( attributeType == null )
{
@@ -1186,7 +1186,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean contains( AttributeType attributeType, String... values )
+ public boolean contains( MutableAttributeTypeImpl attributeType, String... values )
{
if ( attributeType == null )
{
@@ -1209,7 +1209,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean contains( AttributeType attributeType, Value<?>... values )
+ public boolean contains( MutableAttributeTypeImpl attributeType, Value<?>... values )
{
if ( attributeType == null )
{
@@ -1347,7 +1347,7 @@ public class DefaultEntry implements Ent
{
try
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( id );
return attributes.get( attributeType.getOid() );
}
@@ -1374,7 +1374,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute get( AttributeType attributeType )
+ public EntryAttribute get( MutableAttributeTypeImpl attributeType )
{
if ( attributeType != null )
{
@@ -1390,9 +1390,9 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public Set<AttributeType> getAttributeTypes()
+ public Set<MutableAttributeTypeImpl> getAttributeTypes()
{
- Set<AttributeType> attributeTypes = new HashSet<AttributeType>();
+ Set<MutableAttributeTypeImpl> attributeTypes = new HashSet<MutableAttributeTypeImpl>();
for ( EntryAttribute attribute : attributes.values() )
{
@@ -1575,7 +1575,7 @@ public class DefaultEntry implements Ent
}
// Search for the corresponding AttributeType, based on the upID
- AttributeType attributeType = null;
+ MutableAttributeTypeImpl attributeType = null;
try
{
@@ -1616,12 +1616,12 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
**/
- public List<EntryAttribute> set( AttributeType... attributeTypes )
+ public List<EntryAttribute> set( MutableAttributeTypeImpl... attributeTypes )
{
List<EntryAttribute> removed = new ArrayList<EntryAttribute>();
// Now, loop on all the attributeType to add
- for ( AttributeType attributeType : attributeTypes )
+ for ( MutableAttributeTypeImpl attributeType : attributeTypes )
{
if ( attributeType == null )
{
@@ -1688,7 +1688,7 @@ public class DefaultEntry implements Ent
if ( attribute.getAttributeType() == null )
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( attribute.getId() );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( attribute.getId() );
attribute.setAttributeType( attributeType );
}
@@ -1709,7 +1709,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( AttributeType attributeType, byte[]... values ) throws LdapException
+ public EntryAttribute put( MutableAttributeTypeImpl attributeType, byte[]... values ) throws LdapException
{
return put( null, attributeType, values );
}
@@ -1718,7 +1718,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( AttributeType attributeType, String... values ) throws LdapException
+ public EntryAttribute put( MutableAttributeTypeImpl attributeType, String... values ) throws LdapException
{
return put( null, attributeType, values );
}
@@ -1727,7 +1727,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( AttributeType attributeType, Value<?>... values ) throws LdapException
+ public EntryAttribute put( MutableAttributeTypeImpl attributeType, Value<?>... values ) throws LdapException
{
return put( null, attributeType, values );
}
@@ -1736,7 +1736,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( String upId, AttributeType attributeType, byte[]... values ) throws LdapException
+ public EntryAttribute put( String upId, MutableAttributeTypeImpl attributeType, byte[]... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -1755,7 +1755,7 @@ public class DefaultEntry implements Ent
{
if ( !Strings.isEmpty(upId) )
{
- AttributeType tempAT = getAttributeType( upId );
+ MutableAttributeTypeImpl tempAT = getAttributeType( upId );
if ( !tempAT.equals( attributeType ) )
{
@@ -1786,7 +1786,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( String upId, AttributeType attributeType, String... values ) throws LdapException
+ public EntryAttribute put( String upId, MutableAttributeTypeImpl attributeType, String... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -1805,7 +1805,7 @@ public class DefaultEntry implements Ent
{
if ( !Strings.isEmpty(upId) )
{
- AttributeType tempAT = getAttributeType( upId );
+ MutableAttributeTypeImpl tempAT = getAttributeType( upId );
if ( !tempAT.equals( attributeType ) )
{
@@ -1829,7 +1829,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public EntryAttribute put( String upId, AttributeType attributeType, Value<?>... values ) throws LdapException
+ public EntryAttribute put( String upId, MutableAttributeTypeImpl attributeType, Value<?>... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -1848,7 +1848,7 @@ public class DefaultEntry implements Ent
{
if ( !Strings.isEmpty(upId) )
{
- AttributeType tempAT = getAttributeType( upId );
+ MutableAttributeTypeImpl tempAT = getAttributeType( upId );
if ( !tempAT.equals( attributeType ) )
{
@@ -1891,7 +1891,7 @@ public class DefaultEntry implements Ent
{
for ( EntryAttribute attribute : attributes )
{
- AttributeType attributeType = attribute.getAttributeType();
+ MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
if ( attributeType == null )
{
@@ -1915,7 +1915,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean remove( AttributeType attributeType, byte[]... values ) throws LdapException
+ public boolean remove( MutableAttributeTypeImpl attributeType, byte[]... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -1958,7 +1958,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean remove( AttributeType attributeType, String... values ) throws LdapException
+ public boolean remove( MutableAttributeTypeImpl attributeType, String... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -2001,7 +2001,7 @@ public class DefaultEntry implements Ent
/**
* {@inheritDoc}
*/
- public boolean remove( AttributeType attributeType, Value<?>... values ) throws LdapException
+ public boolean remove( MutableAttributeTypeImpl attributeType, Value<?>... values ) throws LdapException
{
if ( attributeType == null )
{
@@ -2056,7 +2056,7 @@ public class DefaultEntry implements Ent
* @param attributes the AttributeTypes to be removed
* @return the removed attributes, if any, as a list; otherwise <code>null</code>
*/
- public List<EntryAttribute> removeAttributes( AttributeType... attributes )
+ public List<EntryAttribute> removeAttributes( MutableAttributeTypeImpl... attributes )
{
if ( ( attributes == null ) || ( attributes.length == 0 ) || ( schemaManager == null ) )
{
@@ -2065,7 +2065,7 @@ public class DefaultEntry implements Ent
List<EntryAttribute> removed = new ArrayList<EntryAttribute>( attributes.length );
- for ( AttributeType attributeType : attributes )
+ for ( MutableAttributeTypeImpl attributeType : attributes )
{
if ( attributeType == null )
{
@@ -2125,7 +2125,7 @@ public class DefaultEntry implements Ent
{
for ( String attribute : attributes )
{
- AttributeType attributeType = null;
+ MutableAttributeTypeImpl attributeType = null;
try
{
@@ -2219,7 +2219,7 @@ public class DefaultEntry implements Ent
{
try
{
- AttributeType attributeType = getAttributeType( upId );
+ MutableAttributeTypeImpl attributeType = getAttributeType( upId );
return remove( attributeType, values );
}
@@ -2299,7 +2299,7 @@ public class DefaultEntry implements Ent
{
try
{
- AttributeType attributeType = getAttributeType( upId );
+ MutableAttributeTypeImpl attributeType = getAttributeType( upId );
return remove( attributeType, values );
}
@@ -2378,7 +2378,7 @@ public class DefaultEntry implements Ent
{
try
{
- AttributeType attributeType = getAttributeType( upId );
+ MutableAttributeTypeImpl attributeType = getAttributeType( upId );
return remove( attributeType, values );
}
@@ -2561,7 +2561,7 @@ public class DefaultEntry implements Ent
{
try
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( attribute.getId() );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( attribute.getId() );
attributes.put( attributeType.getOid(), attribute );
}
@@ -2617,7 +2617,7 @@ public class DefaultEntry implements Ent
// here, to be able to restore it in the readExternal :
// we need access to the registries, which are not available
// in the ServerAttribute class.
- for ( AttributeType attributeType : getAttributeTypes() )
+ for ( MutableAttributeTypeImpl attributeType : getAttributeTypes() )
{
// Write the oid to be able to restore the AttributeType when deserializing
// the attribute
@@ -2684,7 +2684,7 @@ public class DefaultEntry implements Ent
try
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
// Create the attribute we will read
EntryAttribute attribute = new DefaultEntryAttribute( attributeType );
@@ -2925,7 +2925,7 @@ public class DefaultEntry implements Ent
if ( schemaManager != null )
{
- AttributeType attributeType = schemaManager.getAttributeType( id );
+ MutableAttributeTypeImpl attributeType = schemaManager.getAttributeType( id );
if ( attributeType != objectClassAttributeType )
{