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 [4/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/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.SearchScope;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -106,7 +106,7 @@ public class StoreUtils
*/
private static ExprNode getFilter( SchemaManager schemaManager, String principal ) throws Exception
{
- AttributeType type = schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
+ MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
Value<String> value = new StringValue( type, principal );
return new EqualityNode<String>( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, value );
}
Modified: directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java (original)
+++ directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java Sun Mar 20 21:22:39 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
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;
@@ -226,7 +226,7 @@ public abstract class AbstractLdifPartit
* {@inheritDoc}
*/
@Override
- public Index<?, Entry, Long> getSystemIndex( AttributeType attributeType ) throws Exception
+ public Index<?, Entry, Long> getSystemIndex( MutableAttributeTypeImpl attributeType ) throws Exception
{
return wrappedPartition.getSystemIndex( attributeType );
}
@@ -246,7 +246,7 @@ public abstract class AbstractLdifPartit
* {@inheritDoc}
*/
@Override
- public Index<?, Entry, Long> getUserIndex( AttributeType attributeType ) throws Exception
+ public Index<?, Entry, Long> getUserIndex( MutableAttributeTypeImpl attributeType ) throws Exception
{
return wrappedPartition.getUserIndex( attributeType );
}
@@ -266,7 +266,7 @@ public abstract class AbstractLdifPartit
* {@inheritDoc}
*/
@Override
- public boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception
+ public boolean hasSystemIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception
{
return wrappedPartition.hasSystemIndexOn( attributeType );
}
@@ -276,7 +276,7 @@ public abstract class AbstractLdifPartit
* {@inheritDoc}
*/
@Override
- public boolean hasUserIndexOn( AttributeType attributeType ) throws Exception
+ public boolean hasUserIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception
{
return wrappedPartition.hasUserIndexOn( attributeType );
}
Modified: directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Sun Mar 20 21:22:39 2011
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Ava;
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.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -564,7 +564,7 @@ public class LdifPartition extends Abstr
// First, get the AT name, or OID
String normAT = ava.getNormType();
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( normAT );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( normAT );
String atName = at.getName();
@@ -598,7 +598,7 @@ public class LdifPartition extends Abstr
{
// First, get the AT name, or OID
String normAT = rdn.getNormType();
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( normAT );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( normAT );
String atName = at.getName();
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Sun Mar 20 21:22:39 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
-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.mina.core.service.IoHandler;
@@ -100,7 +100,7 @@ class LdapProtocolHandler extends Demuxi
try
{
- AttributeType type = schemaManager.lookupAttributeTypeRegistry( id );
+ MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( id );
return !type.getSyntax().isHumanReadable();
}
catch ( Exception e )
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sun Mar 20 21:22:39 2011
@@ -70,7 +70,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
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.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class SearchHandler extends LdapR
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
/** cached to save redundant lookups into registries */
- private AttributeType OBJECT_CLASS_AT;
+ private MutableAttributeTypeImpl OBJECT_CLASS_AT;
protected ReplicationProvider replicationProvider;
@@ -936,7 +936,7 @@ public class SearchHandler extends LdapR
if ( presenceNode.isSchemaAware() )
{
- AttributeType attributeType = presenceNode.getAttributeType();
+ MutableAttributeTypeImpl attributeType = presenceNode.getAttributeType();
if ( attributeType.equals( OBJECT_CLASS_AT ) )
{
@@ -1292,7 +1292,7 @@ public class SearchHandler extends LdapR
if ( filter.isSchemaAware() )
{
- AttributeType attributeType = ( (PresenceNode) req.getFilter() ).getAttributeType();
+ MutableAttributeTypeImpl attributeType = ( (PresenceNode) req.getFilter() ).getAttributeType();
isRootDSEFilter = attributeType.equals( OBJECT_CLASS_AT );
}
else
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Sun Mar 20 21:22:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
import org.apache.directory.shared.ldap.model.message.BindRequest;
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.AttributeTypeOptions;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.slf4j.Logger;
@@ -85,7 +85,7 @@ public class CramMd5CallbackHandler exte
ExprNode filter = FilterParser.parse( schemaManager, "(uid=" + username + ")" );
Set<AttributeTypeOptions> returningAttributes = new HashSet<AttributeTypeOptions>();
- AttributeType passwordAT = adminSession.getDirectoryService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+ MutableAttributeTypeImpl passwordAT = adminSession.getDirectoryService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
returningAttributes.add( new AttributeTypeOptions( passwordAT) );
bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Sun Mar 20 21:22:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
import org.apache.directory.shared.ldap.model.message.BindRequest;
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.AttributeTypeOptions;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.slf4j.Logger;
@@ -87,7 +87,7 @@ public class DigestMd5CallbackHandler ex
ExprNode filter = FilterParser.parse( schemaManager, "(uid=" + username + ")" );
Set<AttributeTypeOptions> returningAttributes = new HashSet<AttributeTypeOptions>();
- AttributeType passwordAT = adminSession.getDirectoryService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+ MutableAttributeTypeImpl passwordAT = adminSession.getDirectoryService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
returningAttributes.add( new AttributeTypeOptions( passwordAT) );
bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.SearchRequest;
-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;
@@ -120,7 +120,7 @@ public class PagedSearchContext
{
try
{
- AttributeType at = schemaManager.lookupAttributeTypeRegistry( attribute );
+ MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( attribute );
requestSet.add( at.getOid() );
}
catch ( LdapException le )
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Sun Mar 20 21:22:39 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.DnSerializer;
-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.Unicode;
import org.slf4j.Logger;
@@ -169,7 +169,7 @@ public class ReplicaEventMessage impleme
try
{
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
// Create the attribute we will read
DefaultEntryAttribute attribute = new DefaultEntryAttribute( attributeType );
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Sun Mar 20 21:22:39 2011
@@ -81,7 +81,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl;
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.AttributeTypeOptions;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.util.Strings;
@@ -140,7 +140,7 @@ public class SyncReplConsumer implements
/** the cookie that was saved last time */
private byte[] lastSavedCookie;
- private static AttributeType ENTRY_UUID_AT;
+ private static MutableAttributeTypeImpl ENTRY_UUID_AT;
private static final PresenceNode ENTRY_UUID_PRESENCE_FILTER = new PresenceNode( SchemaConstants.ENTRY_UUID_AT );
@@ -150,7 +150,7 @@ public class SyncReplConsumer implements
private Dn configEntryDn;
- private static AttributeType COOKIE_AT_TYPE;
+ private static MutableAttributeTypeImpl COOKIE_AT_TYPE;
/**
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Sun Mar 20 21:22:39 2011
@@ -87,7 +87,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.SearchResultReference;
import org.apache.directory.shared.ldap.model.message.SearchResultReferenceImpl;
import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,7 +113,7 @@ public class SyncReplProvider implements
/** The reference on the Ldap server instance */
protected LdapServer ldapServer;
- private AttributeType objectClassAttributeType;
+ private MutableAttributeTypeImpl objectClassAttributeType;
private Map<Integer, ReplicaEventLog> replicaLogMap = new HashMap<Integer, ReplicaEventLog>();
@@ -782,7 +782,7 @@ public class SyncReplProvider implements
{
PresenceNode presenceNode = ( PresenceNode ) req.getFilter();
- AttributeType at = session.getCoreSession().getDirectoryService().getSchemaManager()
+ MutableAttributeTypeImpl at = session.getCoreSession().getDirectoryService().getSchemaManager()
.lookupAttributeTypeRegistry( presenceNode.getAttribute() );
if ( at.getOid().equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
{
Modified: directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Sun Mar 20 21:22:39 2011
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
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.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.slf4j.Logger;
@@ -481,10 +481,10 @@ public class ConfigPartitionReader
/**
* Read all the required fields (AttributeTypes) for a given Entry.
*/
- private void readFields( AdsBaseBean bean, Entry entry, Set<AttributeType> attributeTypes, boolean mandatory )
+ private void readFields( AdsBaseBean bean, Entry entry, Set<MutableAttributeTypeImpl> attributeTypes, boolean mandatory )
throws NoSuchFieldException, IllegalAccessException, Exception
{
- for ( AttributeType attributeType : attributeTypes )
+ for ( MutableAttributeTypeImpl attributeType : attributeTypes )
{
String fieldName = attributeType.getName();
String beanFieldName = fieldName;
@@ -513,10 +513,10 @@ public class ConfigPartitionReader
}
// Get the associated AttributeType
- AttributeType beanAT = schemaManager.getAttributeType( fieldName );
+ MutableAttributeTypeImpl beanAT = schemaManager.getAttributeType( fieldName );
// Check if this AT has the ads-compositeElement as a superior
- AttributeType superior = beanAT.getSuperior();
+ MutableAttributeTypeImpl superior = beanAT.getSuperior();
if ( ( superior != null )
&& superior.getOid().equals( ConfigSchemaConstants.ADS_COMPOSITE_ELEMENT_AT.getOid() ) )
@@ -624,9 +624,9 @@ public class ConfigPartitionReader
/**
* Get the list of MUST AttributeTypes for an objectClass
*/
- private Set<AttributeType> getAllMusts( ObjectClass objectClass )
+ private Set<MutableAttributeTypeImpl> getAllMusts( ObjectClass objectClass )
{
- Set<AttributeType> musts = new HashSet<AttributeType>();
+ Set<MutableAttributeTypeImpl> musts = new HashSet<MutableAttributeTypeImpl>();
// First, gets the direct MUST
musts.addAll( objectClass.getMustAttributeTypes() );
@@ -649,9 +649,9 @@ public class ConfigPartitionReader
/**
* Get the list of MAY AttributeTypes for an objectClass
*/
- private Set<AttributeType> getAllMays( ObjectClass objectClass )
+ private Set<MutableAttributeTypeImpl> getAllMays( ObjectClass objectClass )
{
- Set<AttributeType> mays = new HashSet<AttributeType>();
+ Set<MutableAttributeTypeImpl> mays = new HashSet<MutableAttributeTypeImpl>();
// First, gets the direct MAY
mays.addAll( objectClass.getMayAttributeTypes() );
@@ -674,7 +674,7 @@ public class ConfigPartitionReader
/**
* Helper method to print a list of AT's names.
*/
- private String dumpATs( Set<AttributeType> attributeTypes )
+ private String dumpATs( Set<MutableAttributeTypeImpl> attributeTypes )
{
if ( ( attributeTypes == null ) || ( attributeTypes.size() == 0 ) )
{
@@ -685,7 +685,7 @@ public class ConfigPartitionReader
boolean isFirst = true;
sb.append( '{' );
- for ( AttributeType attributeType : attributeTypes )
+ for ( MutableAttributeTypeImpl attributeType : attributeTypes )
{
if ( isFirst )
{
@@ -715,7 +715,7 @@ public class ConfigPartitionReader
// Search for the element starting at some point in the DIT
// Prepare the search request
- AttributeType adsdAt = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
+ MutableAttributeTypeImpl adsdAt = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
EqualityNode<?> filter = new EqualityNode( adsdAt, new StringValue( name ) );
SearchControls controls = new SearchControls();
controls.setSearchScope( scope.ordinal() );
@@ -767,12 +767,12 @@ public class ConfigPartitionReader
// Now, read the AttributeTypes and store the values into the bean fields
// The MAY
- Set<AttributeType> mays = getAllMays( objectClass );
+ Set<MutableAttributeTypeImpl> mays = getAllMays( objectClass );
LOG.debug( "Fetching the following MAY attributes : {}", dumpATs( mays ) );
readFields( bean, entry, mays, OPTIONNAL );
// The MUST
- Set<AttributeType> musts = getAllMusts( objectClass );
+ Set<MutableAttributeTypeImpl> musts = getAllMusts( objectClass );
LOG.debug( "Fetching the following MAY attributes : {}", dumpATs( musts ) );
readFields( bean, entry, musts, MANDATORY );
Modified: directory/apacheds/branches/akarasulu/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java (original)
+++ directory/apacheds/branches/akarasulu/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java Sun Mar 20 21:22:39 2011
@@ -99,7 +99,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.ldif.LdapLdifException;
import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
import org.apache.directory.shared.ldap.model.ldif.LdifReader;
-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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -983,7 +983,7 @@ public class ServiceBuilder
try
{
- AttributeType indexAT = schemaManager.lookupAttributeTypeRegistry( indexFileName );
+ MutableAttributeTypeImpl indexAT = schemaManager.lookupAttributeTypeRegistry( indexFileName );
indexFileName = indexAT.getOid();
}
catch ( LdapException le )
Modified: directory/apacheds/branches/akarasulu/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/branches/akarasulu/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sun Mar 20 21:22:39 2011
@@ -63,7 +63,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.SearchScope;
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.AttributeTypeOptions;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader;
@@ -278,19 +278,19 @@ public class ApacheDsService
directoryService.startup();
- AttributeType ocAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+ MutableAttributeTypeImpl ocAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
MANDATORY_ENTRY_ATOP_MAP.put( ocAt.getName(), new AttributeTypeOptions( ocAt ) );
- AttributeType uuidAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_UUID_AT );
+ MutableAttributeTypeImpl uuidAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_UUID_AT );
MANDATORY_ENTRY_ATOP_MAP.put( uuidAt.getName(), new AttributeTypeOptions( uuidAt ) );
- AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
+ MutableAttributeTypeImpl csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
MANDATORY_ENTRY_ATOP_MAP.put( csnAt.getName(), new AttributeTypeOptions( csnAt ) );
- AttributeType creatorAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATORS_NAME_AT );
+ MutableAttributeTypeImpl creatorAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATORS_NAME_AT );
MANDATORY_ENTRY_ATOP_MAP.put( creatorAt.getName(), new AttributeTypeOptions( creatorAt ) );
- AttributeType createdTimeAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATE_TIMESTAMP_AT );
+ MutableAttributeTypeImpl createdTimeAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATE_TIMESTAMP_AT );
MANDATORY_ENTRY_ATOP_MAP.put( createdTimeAt.getName(), new AttributeTypeOptions( createdTimeAt ) );
if ( isConfigPartitionFirstExtraction )
@@ -642,7 +642,7 @@ public class ApacheDsService
{
ClonedServerEntry entry = cursor.get();
- AttributeType atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.ENTRY_UUID_AT ).getAttributeType();
+ MutableAttributeTypeImpl atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.ENTRY_UUID_AT ).getAttributeType();
EntryAttribute uuidAt = entry.get( atType );
String uuid = ( uuidAt == null ? null : uuidAt.getString() );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Mar 20 21:22:39 2011
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.ExprNode;
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;
/**
@@ -307,7 +307,7 @@ public abstract class BTreePartition<ID>
return entry;
}
- for ( AttributeType attributeType : ( entry.getOriginalEntry() ).getAttributeTypes() )
+ for ( MutableAttributeTypeImpl attributeType : ( entry.getOriginalEntry() ).getAttributeTypes() )
{
if ( !lookupContext.getAttrsId().contains( attributeType.getOid() ) )
{
@@ -347,10 +347,10 @@ public abstract class BTreePartition<ID>
public abstract void addIndexOn( Index<?, Entry, ID> index ) throws Exception;
- public abstract boolean hasUserIndexOn( AttributeType attributeType ) throws Exception;
+ public abstract boolean hasUserIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception;
- public abstract boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception;
+ public abstract boolean hasSystemIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception;
public abstract Index<String, Entry, ID> getPresenceIndex();
@@ -426,10 +426,10 @@ public abstract class BTreePartition<ID>
}
- public abstract Index<?, Entry, ID> getUserIndex( AttributeType attributeType ) throws Exception;
+ public abstract Index<?, Entry, ID> getUserIndex( MutableAttributeTypeImpl attributeType ) throws Exception;
- public abstract Index<?, Entry, ID> getSystemIndex( AttributeType attributeType ) throws Exception;
+ public abstract Index<?, Entry, ID> getSystemIndex( MutableAttributeTypeImpl attributeType ) throws Exception;
public abstract ID getEntryId( Dn dn ) throws LdapException;
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java Sun Mar 20 21:22:39 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
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;
/**
@@ -193,7 +193,7 @@ public abstract class AbstractXdbmPartit
/**
* {@inheritDoc}
*/
- public final boolean hasUserIndexOn( AttributeType attributeType ) throws Exception
+ public final boolean hasUserIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception
{
return store.hasUserIndexOn( attributeType );
}
@@ -202,7 +202,7 @@ public abstract class AbstractXdbmPartit
/**
* {@inheritDoc}
*/
- public final boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception
+ public final boolean hasSystemIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception
{
return store.hasSystemIndexOn( attributeType );
}
@@ -211,7 +211,7 @@ public abstract class AbstractXdbmPartit
/**
* {@inheritDoc}
*/
- public final Index<?, Entry, ID> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException
+ public final Index<?, Entry, ID> getUserIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException
{
return store.getUserIndex( attributeType );
}
@@ -220,7 +220,7 @@ public abstract class AbstractXdbmPartit
/**
* {@inheritDoc}
*/
- public final Index<?, Entry, ID> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException
+ public final Index<?, Entry, ID> getSystemIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException
{
return store.getSystemIndex( attributeType );
}
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.xdbm
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -36,7 +36,7 @@ public abstract class AbstractIndex<K, O
protected String attributeId;
/** the attribute type resolved for this JdbmIndex */
- protected AttributeType attributeType;
+ protected MutableAttributeTypeImpl attributeType;
/** the size (number of index entries) for the cache */
protected int cacheSize = DEFAULT_INDEX_CACHE_SIZE;
@@ -74,7 +74,7 @@ public abstract class AbstractIndex<K, O
/**
* {@inheritDoc}
*/
- public AttributeType getAttribute()
+ public MutableAttributeTypeImpl getAttribute()
{
return attributeType;
}
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sun Mar 20 21:22:39 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Ava;
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.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.slf4j.Logger;
@@ -72,10 +72,10 @@ public abstract class AbstractStore<E, I
public static final int DEFAULT_CACHE_SIZE = 10000;
/** Cached attributes types to avoid lookup all over the code */
- protected AttributeType OBJECT_CLASS_AT;
- protected AttributeType ENTRY_CSN_AT;
- protected AttributeType ENTRY_UUID_AT;
- protected AttributeType ALIASED_OBJECT_NAME_AT;
+ protected MutableAttributeTypeImpl OBJECT_CLASS_AT;
+ protected MutableAttributeTypeImpl ENTRY_CSN_AT;
+ protected MutableAttributeTypeImpl ENTRY_UUID_AT;
+ protected MutableAttributeTypeImpl ALIASED_OBJECT_NAME_AT;
/** true if initialized */
protected boolean initialized;
@@ -275,7 +275,7 @@ public abstract class AbstractStore<E, I
for ( String oid : userIndices.keySet() )
{
// check that the attributeType has an EQUALITY matchingRule
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
MatchingRule mr = attributeType.getEquality();
if ( mr != null )
@@ -453,7 +453,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public boolean hasIndexOn( AttributeType attributeType ) throws LdapException
+ public boolean hasIndexOn( MutableAttributeTypeImpl attributeType ) throws LdapException
{
return hasUserIndexOn( attributeType ) || hasSystemIndexOn( attributeType );
}
@@ -471,7 +471,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public boolean hasUserIndexOn( AttributeType attributeType ) throws LdapException
+ public boolean hasUserIndexOn( MutableAttributeTypeImpl attributeType ) throws LdapException
{
return userIndices.containsKey( attributeType.getOid() );
}
@@ -489,7 +489,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public boolean hasSystemIndexOn( AttributeType attributeType ) throws LdapException
+ public boolean hasSystemIndexOn( MutableAttributeTypeImpl attributeType ) throws LdapException
{
return systemIndices.containsKey( attributeType.getOid() );
}
@@ -525,7 +525,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public Index<?, E, ID> getIndex( AttributeType attributeType ) throws IndexNotFoundException
+ public Index<?, E, ID> getIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException
{
String id = attributeType.getOid();
@@ -564,7 +564,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public Index<?, E, ID> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException
+ public Index<?, E, ID> getUserIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException
{
String id = attributeType.getOid();
@@ -598,7 +598,7 @@ public abstract class AbstractStore<E, I
/**
* {@inheritDoc}
*/
- public Index<?, E, ID> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException
+ public Index<?, E, ID> getSystemIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException
{
String id = attributeType.getOid();
@@ -1033,7 +1033,7 @@ public abstract class AbstractStore<E, I
ID id = getEntryId( dn );
Entry entry = master.get( id );
- for ( AttributeType attributeType : mods.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl attributeType : mods.getAttributeTypes() )
{
EntryAttribute attr = mods.get( attributeType );
@@ -1195,7 +1195,7 @@ public abstract class AbstractStore<E, I
String newNormType = newAtav.getNormType();
Object newNormValue = newAtav.getNormValue().get();
- AttributeType newRdnAttrType = schemaManager.lookupAttributeTypeRegistry( newNormType );
+ MutableAttributeTypeImpl newRdnAttrType = schemaManager.lookupAttributeTypeRegistry( newNormType );
entry.add( newRdnAttrType, newAtav.getUpValue() );
@@ -1252,7 +1252,7 @@ public abstract class AbstractStore<E, I
{
String oldNormType = oldAtav.getNormType();
String oldNormValue = oldAtav.getNormValue().getString();
- AttributeType oldRdnAttrType = schemaManager.lookupAttributeTypeRegistry( oldNormType );
+ MutableAttributeTypeImpl oldRdnAttrType = schemaManager.lookupAttributeTypeRegistry( oldNormType );
entry.remove( oldRdnAttrType, oldNormValue );
if ( hasUserIndexOn( oldNormType ) )
@@ -1728,7 +1728,7 @@ public abstract class AbstractStore<E, I
}
}
- AttributeType attrType = schemaManager.lookupAttributeTypeRegistry( modsOid );
+ MutableAttributeTypeImpl attrType = schemaManager.lookupAttributeTypeRegistry( modsOid );
/*
* If there are no attribute values in the modifications then this
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.xdbm
import java.net.URI;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -208,7 +208,7 @@ public class GenericIndex<K, O, ID> exte
}
- public AttributeType getAttribute()
+ public MutableAttributeTypeImpl getAttribute()
{
throw new UnsupportedOperationException();
}
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.xdbm
import java.net.URI;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -123,7 +123,7 @@ public interface Index<K, O, ID>
*
* @return the id of the Index's attribute
*/
- AttributeType getAttribute();
+ MutableAttributeTypeImpl getAttribute();
/**
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Sun Mar 20 21:22:39 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
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;
@@ -347,7 +347,7 @@ public interface Store<E, ID extends Com
* User's <strong>or</strong> System's index list
* @throws Exception If something went wrong
*/
- boolean hasIndexOn( AttributeType attributeType ) throws Exception;
+ boolean hasIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception;
/**
@@ -367,7 +367,7 @@ public interface Store<E, ID extends Com
* User's index list
* @throws Exception If something went wrong
*/
- boolean hasUserIndexOn( AttributeType attributeType ) throws Exception;
+ boolean hasUserIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception;
/**
@@ -387,7 +387,7 @@ public interface Store<E, ID extends Com
* System's index list
* @throws Exception If something went wrong
*/
- boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception;
+ boolean hasSystemIndexOn( MutableAttributeTypeImpl attributeType ) throws Exception;
/**
@@ -405,7 +405,7 @@ public interface Store<E, ID extends Com
* @return The associated user <strong>or</strong> system index
* @throws IndexNotFoundException If the index does not exist
*/
- Index<?, E, ID> getIndex( AttributeType attributeType ) throws IndexNotFoundException;
+ Index<?, E, ID> getIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException;
/**
@@ -423,7 +423,7 @@ public interface Store<E, ID extends Com
* @return The associated user index
* @throws IndexNotFoundException If the index does not exist
*/
- Index<?, E, ID> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException;
+ Index<?, E, ID> getUserIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException;
/**
@@ -441,7 +441,7 @@ public interface Store<E, ID extends Com
* @return The associated system index
* @throws IndexNotFoundException If the index does not exist
*/
- Index<?, E, ID> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException;
+ Index<?, E, ID> getSystemIndex( MutableAttributeTypeImpl attributeType ) throws IndexNotFoundException;
/**
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-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;
@@ -61,7 +61,7 @@ public class AvlIndex<K, O> extends Abst
}
- public void init( SchemaManager schemaManager, AttributeType attributeType ) throws Exception
+ public void init( SchemaManager schemaManager, MutableAttributeTypeImpl attributeType ) throws Exception
{
this.attributeType = attributeType;
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.ParentIdAndRdn;
import org.apache.directory.server.xdbm.ParentIdAndRdnComparator;
-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.SchemaManager;
@@ -48,7 +48,7 @@ public class AvlRdnIndex<E> extends AvlI
}
- public void init( SchemaManager schemaManager, AttributeType attributeType ) throws Exception
+ public void init( SchemaManager schemaManager, MutableAttributeTypeImpl attributeType ) throws Exception
{
this.attributeType = attributeType;
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -65,7 +65,7 @@ public class ApproximateCursor<V, ID ext
{
this.approximateEvaluator = approximateEvaluator;
- AttributeType attributeType = approximateEvaluator.getExpression().getAttributeType();
+ MutableAttributeTypeImpl attributeType = approximateEvaluator.getExpression().getAttributeType();
Value<V> value = approximateEvaluator.getExpression().getValue();
if ( db.hasIndexOn( attributeType ) )
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.filter.ApproximateNode;
-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.SchemaManager;
@@ -96,11 +96,11 @@ public class ApproximateEvaluator<T, ID
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -64,7 +64,7 @@ public class EqualityCursor<V, ID extend
{
this.equalityEvaluator = equalityEvaluator;
- AttributeType attributeType = equalityEvaluator.getExpression().getAttributeType();
+ MutableAttributeTypeImpl attributeType = equalityEvaluator.getExpression().getAttributeType();
Value<V> value = equalityEvaluator.getExpression().getValue();
if ( db.hasIndexOn( attributeType ) )
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.filter.EqualityNode;
-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.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
@@ -131,11 +131,11 @@ public class EqualityEvaluator<T, ID ext
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -70,7 +70,7 @@ public class GreaterEqCursor<V, ID exten
{
this.greaterEqEvaluator = greaterEqEvaluator;
- AttributeType attributeType = greaterEqEvaluator.getExpression().getAttributeType();
+ MutableAttributeTypeImpl attributeType = greaterEqEvaluator.getExpression().getAttributeType();
if ( db.hasIndexOn( attributeType ) )
{
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
-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.SchemaManager;
@@ -129,11 +129,11 @@ public class GreaterEqEvaluator<T, ID ex
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
@@ -180,11 +180,11 @@ public class GreaterEqEvaluator<T, ID ex
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.search.Evaluator;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.filter.SimpleNode;
-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.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -48,7 +48,7 @@ public abstract class LeafEvaluator<T, I
protected final SchemaManager schemaManager;
/** The AttributeType we will use for the evaluation */
- protected final AttributeType attributeType;
+ protected final MutableAttributeTypeImpl attributeType;
/** The associated normalizer */
protected Normalizer normalizer;
@@ -73,7 +73,7 @@ public abstract class LeafEvaluator<T, I
/**
* @return The AttributeType
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -70,7 +70,7 @@ public class LessEqCursor<V, ID extends
{
this.lessEqEvaluator = lessEqEvaluator;
- AttributeType attributeType = lessEqEvaluator.getExpression().getAttributeType();
+ MutableAttributeTypeImpl attributeType = lessEqEvaluator.getExpression().getAttributeType();
if ( db.hasIndexOn( attributeType ) )
{
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.filter.LessEqNode;
-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.SchemaManager;
@@ -137,11 +137,11 @@ public class LessEqEvaluator<T, ID exten
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
@@ -177,11 +177,11 @@ public class LessEqEvaluator<T, ID exten
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Sun Mar 20 21:22:39 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
/**
@@ -47,7 +47,7 @@ public class PresenceCursor<ID extends C
public PresenceCursor( Store<Entry, ID> db, PresenceEvaluator<ID> presenceEvaluator ) throws Exception
{
this.presenceEvaluator = presenceEvaluator;
- AttributeType type = presenceEvaluator.getAttributeType();
+ MutableAttributeTypeImpl type = presenceEvaluator.getAttributeType();
// we don't maintain a presence index for objectClass, entryUUID, and entryCSN
// as it doesn't make sense because every entry has such an attribute
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.
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.filter.PresenceNode;
-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;
@@ -48,7 +48,7 @@ public class PresenceEvaluator<ID extend
private final Store<Entry, ID> db;
/** The AttributeType we will use for the evaluation */
- private final AttributeType attributeType;
+ private final MutableAttributeTypeImpl attributeType;
/** The SchemaManager instance */
private final SchemaManager schemaManager;
@@ -82,7 +82,7 @@ public class PresenceEvaluator<ID extend
}
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
@@ -151,11 +151,11 @@ public class PresenceEvaluator<ID extend
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
do
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Sun Mar 20 21:22:39 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.filter.SubstringNode;
-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.SchemaManager;
@@ -60,7 +60,7 @@ public class SubstringEvaluator<ID exten
private final Pattern regex;
/** The AttributeType we will use for the evaluation */
- private final AttributeType attributeType;
+ private final MutableAttributeTypeImpl attributeType;
/** The associated normalizer */
private final Normalizer normalizer;
@@ -289,11 +289,11 @@ public class SubstringEvaluator<ID exten
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
@@ -406,11 +406,11 @@ public class SubstringEvaluator<ID exten
// TODO check to see if descendant handling is necessary for the
// index so we can match properly even when for example a name
// attribute is used instead of more specific commonName
- Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
+ Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( attributeType );
while ( descendants.hasNext() )
{
- AttributeType descendant = descendants.next();
+ MutableAttributeTypeImpl descendant = descendants.next();
attr = entry.get( descendant );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Sun Mar 20 21:22:39 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
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.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.ldap.schemaextractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -74,13 +74,13 @@ public class AbstractStoreTest
private static Dn EXAMPLE_COM;
/** The OU AttributType instance */
- private static AttributeType OU_AT;
+ private static MutableAttributeTypeImpl OU_AT;
/** The CN AttributType instance */
- private static AttributeType CN_AT;
+ private static MutableAttributeTypeImpl CN_AT;
/** The UID AttributType instance */
- private static AttributeType UID_AT;
+ private static MutableAttributeTypeImpl UID_AT;
@BeforeClass
@@ -332,7 +332,7 @@ public class AbstractStoreTest
Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
List<Modification> mods = new ArrayList<Modification>();
- AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
+ MutableAttributeTypeImpl csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
EntryAttribute attrib = new DefaultEntryAttribute( csnAt );
CsnFactory csnF = new CsnFactory( 0 );
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Sun Mar 20 21:22:39 2011
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException;
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.schemaextractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -88,13 +88,13 @@ public class AvlStoreTest
private static Dn EXAMPLE_COM;
/** The OU AttributeType instance */
- private static AttributeType OU_AT;
+ private static MutableAttributeTypeImpl OU_AT;
/** The DC AttributeType instance */
- private static AttributeType DC_AT;
+ private static MutableAttributeTypeImpl DC_AT;
/** The ApacheAlias AttributeType instance */
- private static AttributeType APACHE_ALIAS_AT;
+ private static MutableAttributeTypeImpl APACHE_ALIAS_AT;
@BeforeClass
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.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/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java Sun Mar 20 21:22:39 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.SimpleNode;
import org.apache.directory.shared.ldap.model.filter.SubstringNode;
import org.apache.directory.shared.ldap.model.name.NameComponentNormalizer;
-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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,7 +138,7 @@ public class FilterNormalizingVisitor im
{
Value<?> normalized = null;
- AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( attribute );
+ MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( attribute );
if ( attributeType.getSyntax().isHumanReadable() )
{