You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/01/08 03:44:40 UTC
svn commit: r493916 [3/7] - in /directory/branches: apacheds/1.0/core-unit/
apacheds/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/
apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/
apacheds/1.0/core-unit/src/te...
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Sun Jan 7 18:44:33 2007
@@ -26,7 +26,6 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -38,6 +37,7 @@
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +121,7 @@
}
- public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
nexus.modify( name, mods );
}
@@ -776,7 +776,7 @@
}
- public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -1211,7 +1211,7 @@
}
- public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Sun Jan 7 18:44:33 2007
@@ -27,12 +27,12 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -109,7 +109,7 @@
/**
* Calls the next interceptor's {@link Interceptor#modify(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])}.
*/
- void modify( LdapDN name, ModificationItem[] items ) throws NamingException;
+ void modify( LdapDN name, ModificationItemImpl[] items ) throws NamingException;
/**
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Sun Jan 7 18:44:33 2007
@@ -41,6 +41,7 @@
import org.apache.directory.server.core.configuration.SyncConfiguration;
import org.apache.directory.shared.ldap.exception.LdapServiceUnavailableException;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -149,7 +150,19 @@
}
+ public void modifyAttributes( String name, ModificationItemImpl[] mods ) throws NamingException
+ {
+ throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
+ }
+
+
public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
+ {
+ throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
+ }
+
+
+ public void modifyAttributes( Name name, ModificationItemImpl[] mods ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Sun Jan 7 18:44:33 2007
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.jndi;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,8 +29,8 @@
import java.io.ObjectOutputStream;
import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
/**
@@ -167,7 +167,7 @@
* objectClass: javaContainer
* objectClass: javaSerializedObject
*/
- Attribute objectClass = new LockableAttributeImpl( "objectClass" );
+ Attribute objectClass = new AttributeImpl( "objectClass" );
objectClass.add( TOP_ATTR );
objectClass.add( JOBJECT_ATTR );
objectClass.add( JCONTAINER_ATTR );
@@ -180,7 +180,7 @@
// Add all the class names this object can be cast to:
Class[] classes = obj.getClass().getClasses();
- Attribute javaClassNames = new LockableAttributeImpl( JCLASSNAMES_ATTR );
+ Attribute javaClassNames = new AttributeImpl( JCLASSNAMES_ATTR );
for ( int ii = 0; ii < classes.length; ii++ )
{
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Jan 7 18:44:33 2007
@@ -54,7 +54,7 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -289,7 +289,7 @@
*/
public Context createSubcontext( Name name ) throws NamingException
{
- Attributes attributes = new LockableAttributesImpl();
+ Attributes attributes = new AttributesImpl();
LdapDN target = buildTarget( name );
injectRdnAttributeValues( target, attributes );
@@ -391,7 +391,7 @@
else if ( obj instanceof Serializable )
{
// Serialize and add outAttrs
- Attributes attributes = new LockableAttributesImpl();
+ Attributes attributes = new AttributesImpl();
if ( outAttrs != null && outAttrs.size() > 0 )
{
NamingEnumeration list = outAttrs.getAll();
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Jan 7 18:44:33 2007
@@ -50,6 +50,7 @@
import org.apache.directory.shared.ldap.filter.FilterParserImpl;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -162,19 +163,51 @@
* @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
* javax.naming.directory.ModificationItem[])
*/
- public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
+ public void modifyAttributes( String name, ModificationItemImpl[] mods ) throws NamingException
{
modifyAttributes( new LdapDN( name ), mods );
}
+ /**
+ * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
+ * javax.naming.directory.ModificationItem[])
+ */
+ public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
+ {
+ ModificationItemImpl[] newMods = new ModificationItemImpl[ mods.length ];
+
+ for ( int i = 0; i < mods.length; i++ )
+ {
+ newMods[i] = new ModificationItemImpl( mods[i] );
+ }
+
+ modifyAttributes( new LdapDN( name ), newMods );
+ }
+
/**
* @see javax.naming.directory.DirContext#modifyAttributes(
* javax.naming.Name, javax.naming.directory.ModificationItem[])
*/
- public void modifyAttributes( Name name, ModificationItem[] mods ) throws NamingException
+ public void modifyAttributes( Name name, ModificationItemImpl[] mods ) throws NamingException
{
getNexusProxy().modify( buildTarget( name ), mods );
+ }
+
+ /**
+ * @see javax.naming.directory.DirContext#modifyAttributes(
+ * javax.naming.Name, javax.naming.directory.ModificationItem[])
+ */
+ public void modifyAttributes( Name name, ModificationItem[] mods ) throws NamingException
+ {
+ ModificationItemImpl[] newMods = new ModificationItemImpl[ mods.length ];
+
+ for ( int i = 0; i < mods.length; i++ )
+ {
+ newMods[i] = new ModificationItemImpl( mods[i] );
+ }
+
+ getNexusProxy().modify( buildTarget( name ), newMods );
}
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Sun Jan 7 18:44:33 2007
@@ -27,7 +27,6 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -47,6 +46,7 @@
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -119,7 +119,7 @@
}
- public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+ public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
{
LdapDN normalized = LdapDN.normalize( name, attributeRegistry.getNormalizerMapping() );
nextInterceptor.modify( normalized, items );
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Sun Jan 7 18:44:33 2007
@@ -29,10 +29,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -52,6 +49,9 @@
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -138,11 +138,11 @@
{
String principal = getPrincipal().getName();
- BasicAttribute attribute = new BasicAttribute( "creatorsName" );
+ Attribute attribute = new AttributeImpl( "creatorsName" );
attribute.add( principal );
entry.put( attribute );
- attribute = new BasicAttribute( "createTimestamp" );
+ attribute = new AttributeImpl( "createTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
entry.put( attribute );
@@ -156,12 +156,12 @@
nextInterceptor.modify( name, modOp, attrs );
// add operational attributes after call in case the operation fails
- Attributes attributes = new BasicAttributes( true );
- BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+ Attributes attributes = new AttributesImpl( true );
+ Attribute attribute = new AttributeImpl( "modifiersName" );
attribute.add( getPrincipal().getName() );
attributes.put( attribute );
- attribute = new BasicAttribute( "modifyTimestamp" );
+ attribute = new AttributeImpl( "modifyTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
attributes.put( attribute );
@@ -169,17 +169,17 @@
}
- public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
+ public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItemImpl[] items ) throws NamingException
{
nextInterceptor.modify( name, items );
// add operational attributes after call in case the operation fails
- Attributes attributes = new BasicAttributes( true );
- BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+ Attributes attributes = new AttributesImpl( true );
+ Attribute attribute = new AttributeImpl( "modifiersName" );
attribute.add( getPrincipal().getName() );
attributes.put( attribute );
- attribute = new BasicAttribute( "modifyTimestamp" );
+ attribute = new AttributeImpl( "modifyTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
attributes.put( attribute );
@@ -193,12 +193,12 @@
nextInterceptor.modifyRn( name, newRn, deleteOldRn );
// add operational attributes after call in case the operation fails
- Attributes attributes = new BasicAttributes( true );
- BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+ Attributes attributes = new AttributesImpl( true );
+ Attribute attribute = new AttributeImpl( "modifiersName" );
attribute.add( getPrincipal().getName() );
attributes.put( attribute );
- attribute = new BasicAttribute( "modifyTimestamp" );
+ attribute = new AttributeImpl( "modifyTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
attributes.put( attribute );
@@ -215,12 +215,12 @@
nextInterceptor.move( name, newParentName );
// add operational attributes after call in case the operation fails
- Attributes attributes = new BasicAttributes( true );
- BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+ Attributes attributes = new AttributesImpl( true );
+ Attribute attribute = new AttributeImpl( "modifiersName" );
attribute.add( getPrincipal().getName() );
attributes.put( attribute );
- attribute = new BasicAttribute( "modifyTimestamp" );
+ attribute = new AttributeImpl( "modifyTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
attributes.put( attribute );
@@ -234,12 +234,12 @@
nextInterceptor.move( name, newParentName, newRn, deleteOldRn );
// add operational attributes after call in case the operation fails
- Attributes attributes = new BasicAttributes( true );
- BasicAttribute attribute = new BasicAttribute( "modifiersName" );
+ Attributes attributes = new AttributesImpl( true );
+ Attribute attribute = new AttributeImpl( "modifiersName" );
attribute.add( getPrincipal().getName() );
attributes.put( attribute );
- attribute = new BasicAttribute( "modifyTimestamp" );
+ attribute = new AttributeImpl( "modifyTimestamp" );
attribute.add( DateUtils.getGeneralizedTime() );
attributes.put( attribute );
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Sun Jan 7 18:44:33 2007
@@ -29,10 +29,10 @@
import javax.naming.OperationNotSupportedException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -233,11 +233,11 @@
NamingEnumeration e = mods.getAll();
while ( e.hasMore() )
{
- items.add( new ModificationItem( modOp, ( Attribute ) e.next() ) );
+ items.add( new ModificationItemImpl( modOp, ( Attribute ) e.next() ) );
}
- ModificationItem[] itemsArray = new ModificationItem[items.size()];
- itemsArray = ( ModificationItem[] ) items.toArray( itemsArray );
+ ModificationItemImpl[] itemsArray = new ModificationItemImpl[items.size()];
+ itemsArray = ( ModificationItemImpl[] ) items.toArray( itemsArray );
modify( name, itemsArray );
}
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sun Jan 7 18:44:33 2007
@@ -38,7 +38,6 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -57,9 +56,10 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.message.EntryChangeControl;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.PersistentSearchControl;
import org.apache.directory.shared.ldap.message.SubentriesControl;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
@@ -132,38 +132,38 @@
{
// setup that root DSE
this.rootDSE = rootDSE;
- Attribute attr = new LockableAttributeImpl( "subschemaSubentry" );
+ Attribute attr = new AttributeImpl( "subschemaSubentry" );
attr.add( "cn=schema,ou=system" );
rootDSE.put( attr );
- attr = new LockableAttributeImpl( "supportedLDAPVersion" );
+ attr = new AttributeImpl( "supportedLDAPVersion" );
rootDSE.put( attr );
attr.add( "3" );
- attr = new LockableAttributeImpl( "supportedFeatures" );
+ attr = new AttributeImpl( "supportedFeatures" );
rootDSE.put( attr );
attr.add( "1.3.6.1.4.1.4203.1.5.1" );
- attr = new LockableAttributeImpl( "supportedExtension" );
+ attr = new AttributeImpl( "supportedExtension" );
rootDSE.put( attr );
attr.add( NoticeOfDisconnect.EXTENSION_OID );
- attr = new LockableAttributeImpl( "supportedControl" );
+ attr = new AttributeImpl( "supportedControl" );
rootDSE.put( attr );
attr.add( PersistentSearchControl.CONTROL_OID );
attr.add( EntryChangeControl.CONTROL_OID );
attr.add( SubentriesControl.CONTROL_OID );
attr.add( ManageDsaITControl.CONTROL_OID );
- attr = new LockableAttributeImpl( "objectClass" );
+ attr = new AttributeImpl( "objectClass" );
rootDSE.put( attr );
attr.add( "top" );
attr.add( "extensibleObject" );
- attr = new LockableAttributeImpl( NAMINGCTXS_ATTR );
+ attr = new AttributeImpl( NAMINGCTXS_ATTR );
rootDSE.put( attr );
- attr = new LockableAttributeImpl( VENDORNAME_ATTR );
+ attr = new AttributeImpl( VENDORNAME_ATTR );
attr.add( ASF );
rootDSE.put( attr );
@@ -177,7 +177,7 @@
log.error( "failed to log version properties" );
}
- attr = new LockableAttributeImpl( VENDORVERSION_ATTR );
+ attr = new AttributeImpl( VENDORVERSION_ATTR );
attr.add( props.getProperty( "apacheds.version", "UNKNOWN" ) );
rootDSE.put( attr );
}
@@ -256,7 +256,7 @@
Attribute objectClassAttr = systemEntry.get( "objectClass" );
if ( objectClassAttr == null )
{
- objectClassAttr = new LockableAttributeImpl( "objectClass" );
+ objectClassAttr = new AttributeImpl( "objectClass" );
systemEntry.put( objectClassAttr );
}
objectClassAttr.add( "top" );
@@ -346,8 +346,8 @@
systemCfg.setIndexedAttributes( indexedSystemAttrs );
// Add context entry for system partition
- Attributes systemEntry = new LockableAttributesImpl();
- Attribute objectClassAttr = new LockableAttributeImpl( "objectClass" );
+ Attributes systemEntry = new AttributesImpl();
+ Attribute objectClassAttr = new AttributeImpl( "objectClass" );
objectClassAttr.add( "top" );
objectClassAttr.add( "organizationalUnit" );
objectClassAttr.add( "extensibleObject" );
@@ -701,7 +701,7 @@
/**
* @see Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])
*/
- public void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException
{
Partition backend = getBackend( dn );
backend.modify( dn, mods );
@@ -790,7 +790,7 @@
// return nothing
if ( containsOneDotOne )
{
- SearchResult result = new SearchResult( "", null, new LockableAttributesImpl(), false );
+ SearchResult result = new SearchResult( "", null, new AttributesImpl(), false );
return new SingletonEnumeration( result );
}
@@ -801,7 +801,7 @@
return new SingletonEnumeration( result );
}
- Attributes attrs = new LockableAttributesImpl();
+ Attributes attrs = new AttributesImpl();
if ( containsAsterisk )
{
for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
@@ -886,7 +886,7 @@
{
if ( dn.size() == 0 )
{
- Attributes retval = new LockableAttributesImpl();
+ Attributes retval = new AttributesImpl();
NamingEnumeration list = rootDSE.getIDs();
while ( list.hasMore() )
{
@@ -999,7 +999,7 @@
Attribute supportedExtension = rootDSE.get( "supportedExtension" );
if ( supportedExtension == null )
{
- supportedExtension = new LockableAttributeImpl( "supportedExtension" );
+ supportedExtension = new AttributeImpl( "supportedExtension" );
rootDSE.put( supportedExtension );
}
for ( Iterator oids = extensionOids.iterator(); oids.hasNext(); )
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Sun Jan 7 18:44:33 2007
@@ -27,13 +27,13 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -151,7 +151,7 @@
* @throws NamingException if there are any problems
* @see ModificationItem
*/
- void modify( LdapDN name, ModificationItem[] items ) throws NamingException;
+ void modify( LdapDN name, ModificationItemImpl[] items ) throws NamingException;
/**
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Sun Jan 7 18:44:33 2007
@@ -28,7 +28,6 @@
import javax.naming.NamingException;
import javax.naming.ServiceUnavailableException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchResult;
@@ -48,6 +47,7 @@
import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -371,13 +371,13 @@
}
- public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
modify( name, mods, null );
}
- public void modify( LdapDN name, ModificationItem[] mods, Collection bypass ) throws NamingException
+ public void modify( LdapDN name, ModificationItemImpl[] mods, Collection bypass ) throws NamingException
{
ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Jan 7 18:44:33 2007
@@ -29,7 +29,6 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -43,7 +42,8 @@
import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.util.ArrayUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -346,7 +346,7 @@
public abstract void modify( LdapDN dn, int modOp, Attributes mods ) throws NamingException;
- public abstract void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException;
+ public abstract void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException;
public NamingEnumeration list( LdapDN base ) throws NamingException
@@ -384,7 +384,7 @@
}
Attributes entry = lookup( dn );
- Attributes retval = new LockableAttributesImpl();
+ Attributes retval = new AttributesImpl();
for ( int ii = 0; ii < attrIds.length; ii++ )
{
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResult.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResult.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Sun Jan 7 18:44:33 2007
@@ -29,7 +29,7 @@
import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -121,7 +121,7 @@
}
else if ( attrIdsHasPlus )
{
- entry = new LockableAttributesImpl();
+ entry = new AttributesImpl();
// add all listed attributes
for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -158,7 +158,7 @@
}
else if ( attrIdsHasStar )
{
- entry = new LockableAttributesImpl();
+ entry = new AttributesImpl();
// add all listed operational attributes
for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -193,7 +193,7 @@
}
else
{
- entry = new LockableAttributesImpl();
+ entry = new AttributesImpl();
Attributes attrs = rec.getAttributes();
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java Sun Jan 7 18:44:33 2007
@@ -40,7 +40,7 @@
import javax.swing.JTable;
import javax.swing.JTextField;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@
private JButton m_cancelBut = new JButton();
private JPopupMenu m_popup;
- private Attributes m_childEntry = new LockableAttributesImpl();
+ private Attributes m_childEntry = new AttributesImpl();
/**
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java Sun Jan 7 18:44:33 2007
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
import jdbm.helper.Serializer;
@@ -64,7 +64,7 @@
public final Object deserialize( byte[] buf ) throws IOException
{
String id = readString( buf );
- LockableAttributeImpl attr = new LockableAttributeImpl( id );
+ AttributeImpl attr = new AttributeImpl( id );
int pos = ( id.length() << 1 ) + 4;
// read the type of the objects stored in this attribute
@@ -101,7 +101,7 @@
public static final DeserializedAttribute deserialize( byte[] buf, int offset ) throws IOException
{
final String id = readString( buf, offset );
- final LockableAttributeImpl attr = new LockableAttributeImpl( id );
+ final AttributeImpl attr = new AttributeImpl( id );
int pos = ( id.length() << 1 ) + 4 + offset;
// read the type of the objects stored in this attribute
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java Sun Jan 7 18:44:33 2007
@@ -27,8 +27,8 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import jdbm.helper.Serializer;
@@ -51,15 +51,15 @@
{
if ( buf.length == 0 )
{
- return new LockableAttributesImpl();
+ return new AttributesImpl();
}
int pos = 0;
- LockableAttributesImpl attrs = new LockableAttributesImpl();
+ AttributesImpl attrs = new AttributesImpl();
while ( pos < buf.length )
{
String id = AttributeSerializer.readString( buf, pos );
- LockableAttributeImpl attr = new LockableAttributeImpl( id );
+ AttributeImpl attr = new AttributeImpl( id );
pos += ( id.length() << 1 ) + 4;
// read the type of the objects stored in this attribute
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Sun Jan 7 18:44:33 2007
@@ -34,8 +34,6 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-
import jdbm.RecordManager;
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
@@ -59,8 +57,9 @@
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -990,7 +989,7 @@
public Attributes getIndices( BigInteger id ) throws NamingException
{
- Attributes attributes = new LockableAttributesImpl();
+ Attributes attributes = new AttributesImpl();
// Get the distinguishedName to id mapping
attributes.put( "_nDn", getEntryDn( id ) );
@@ -1011,7 +1010,7 @@
Attribute attr = attributes.get( attrId );
if ( attr == null )
{
- attr = new LockableAttributeImpl( attrId );
+ attr = new AttributeImpl( attrId );
}
attr.add( val );
attributes.put( attr );
@@ -1033,7 +1032,7 @@
Attribute attr = attributes.get( valStr );
if ( attr == null )
{
- attr = new LockableAttributeImpl( valStr );
+ attr = new AttributeImpl( valStr );
}
attr.add( rec.getEntryId() );
attributes.put( attr );
@@ -1043,7 +1042,7 @@
// Get all parent child mappings for this entry as the parent using the
// key 'child' with many entries following it.
list = hierarchyIdx.listIndices( id );
- Attribute childAttr = new LockableAttributeImpl( "_child" );
+ Attribute childAttr = new AttributeImpl( "_child" );
attributes.put( childAttr );
while ( list.hasMore() )
{
@@ -1088,7 +1087,7 @@
if ( entryAttrToAddTo == null )
{
- entryAttrToAddTo = new LockableAttributeImpl( mods.getID() );
+ entryAttrToAddTo = new AttributeImpl( mods.getID() );
entry.put( entryAttrToAddTo );
}
@@ -1285,7 +1284,7 @@
}
- public void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN dn, ModificationItemImpl[] mods ) throws NamingException
{
BigInteger id = getEntryId( dn.toString() );
Attributes entry = master.get( id );
@@ -1358,7 +1357,7 @@
Attribute rdnAttr = ServerUtils.getAttribute( newRdnAttrType, entry );
if ( rdnAttr == null )
{
- rdnAttr = new LockableAttributeImpl( newRdnAttr );
+ rdnAttr = new AttributeImpl( newRdnAttr );
}
// add the new Rdn value only if it is not already present in the entry
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sun Jan 7 18:44:33 2007
@@ -35,9 +35,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
@@ -45,8 +43,9 @@
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.jndi.CoreContextFactory;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.util.PreferencesDictionary;
@@ -61,7 +60,7 @@
public class ServerSystemPreferences extends AbstractPreferences
{
/** an empty array of ModificationItems used to get array from list */
- private static final ModificationItem[] EMPTY_MODS = new ModificationItem[0];
+ private static final ModificationItemImpl[] EMPTY_MODS = new ModificationItemImpl[0];
/** an empty array of Strings used to get array from list */
private static final String[] EMPTY_STRINGS = new String[0];
@@ -191,13 +190,13 @@
*/
private void setUpNode( String name ) throws NamingException
{
- Attributes attrs = new LockableAttributesImpl();
- Attribute attr = new LockableAttributeImpl( "objectClass" );
+ Attributes attrs = new AttributesImpl();
+ Attribute attr = new AttributeImpl( "objectClass" );
attr.add( "top" );
attr.add( "prefNode" );
attr.add( "extensibleObject" );
attrs.put( attr );
- attr = new LockableAttributeImpl( "prefNodeName" );
+ attr = new AttributeImpl( "prefNodeName" );
attr.add( name );
attrs.put( attr );
@@ -226,7 +225,7 @@
try
{
- ctx.modifyAttributes( "", ( ModificationItem[] ) changes.toArray( EMPTY_MODS ) );
+ ctx.modifyAttributes( "", ( ModificationItemImpl[] ) changes.toArray( EMPTY_MODS ) );
}
catch ( NamingException e )
{
@@ -269,7 +268,7 @@
try
{
- ctx.modifyAttributes( "", ( ModificationItem[] ) changes.toArray( EMPTY_MODS ) );
+ ctx.modifyAttributes( "", ( ModificationItemImpl[] ) changes.toArray( EMPTY_MODS ) );
}
catch ( NamingException e )
{
@@ -335,13 +334,13 @@
protected void removeSpi( String key )
{
- Attribute attr = new BasicAttribute( key );
- ModificationItem mi = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, attr );
+ Attribute attr = new AttributeImpl( key );
+ ModificationItemImpl mi = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
addDelta( mi );
}
- private void addDelta( ModificationItem mi )
+ private void addDelta( ModificationItemImpl mi )
{
String key = mi.getAttribute().getID();
List deltas = null;
@@ -372,7 +371,7 @@
List mods = ( List ) keyToChange.get( key );
for ( int ii = 0; ii < mods.size(); ii++ )
{
- ModificationItem mi = ( ModificationItem ) mods.get( ii );
+ ModificationItemImpl mi = ( ModificationItemImpl ) mods.get( ii );
if ( mi.getModificationOp() == DirContext.REMOVE_ATTRIBUTE )
{
attr = null;
@@ -402,9 +401,9 @@
protected void putSpi( String key, String value )
{
- Attribute attr = new BasicAttribute( key );
+ Attribute attr = new AttributeImpl( key );
attr.add( value );
- ModificationItem mi = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
+ ModificationItemImpl mi = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
addDelta( mi );
}
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Sun Jan 7 18:44:33 2007
@@ -35,7 +35,6 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -65,6 +64,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.LeafNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -700,7 +700,7 @@
}
- private void checkModify( LdapDN name, ModificationItem[] mods ) throws NamingException
+ private void checkModify( LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
boolean isTargetReferral = lut.isReferral( name );
@@ -764,7 +764,7 @@
}
- public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
ServerLdapContext caller = ( ServerLdapContext ) invocation.getCaller();
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Sun Jan 7 18:44:33 2007
@@ -32,9 +32,9 @@
import javax.naming.NamingException;
import javax.naming.Name;
import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.Attribute;
import java.util.Set;
import java.util.HashSet;
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sun Jan 7 18:44:33 2007
@@ -29,7 +29,12 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InvalidAttributeValueException;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
@@ -50,8 +55,9 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -263,8 +269,8 @@
}
Set set = new HashSet();
- LockableAttributesImpl attrs = new LockableAttributesImpl();
- LockableAttributeImpl attr;
+ AttributesImpl attrs = new AttributesImpl();
+ AttributeImpl attr;
for ( int ii = 0; ii < ids.length; ii++ )
{
@@ -277,7 +283,7 @@
if ( returnAllOperationalAttributes || set.contains( "objectclasses" ) )
{
- attr = new LockableAttributeImpl( "objectClasses" );
+ attr = new AttributeImpl( "objectClasses" );
Iterator list = globalRegistries.getObjectClassRegistry().list();
while ( list.hasNext() )
{
@@ -289,7 +295,7 @@
if ( returnAllOperationalAttributes || set.contains( "attributetypes" ) )
{
- attr = new LockableAttributeImpl( "attributeTypes" );
+ attr = new AttributeImpl( "attributeTypes" );
Iterator list = globalRegistries.getAttributeTypeRegistry().list();
while ( list.hasNext() )
{
@@ -301,7 +307,7 @@
if ( returnAllOperationalAttributes || set.contains( "matchingrules" ) )
{
- attr = new LockableAttributeImpl( "matchingRules" );
+ attr = new AttributeImpl( "matchingRules" );
Iterator list = globalRegistries.getMatchingRuleRegistry().list();
while ( list.hasNext() )
{
@@ -313,7 +319,7 @@
if ( returnAllOperationalAttributes || set.contains( "matchingruleuse" ) )
{
- attr = new LockableAttributeImpl( "matchingRuleUse" );
+ attr = new AttributeImpl( "matchingRuleUse" );
Iterator list = globalRegistries.getMatchingRuleUseRegistry().list();
while ( list.hasNext() )
{
@@ -325,7 +331,7 @@
if ( returnAllOperationalAttributes || set.contains( "ldapsyntaxes" ) )
{
- attr = new LockableAttributeImpl( "ldapSyntaxes" );
+ attr = new AttributeImpl( "ldapSyntaxes" );
Iterator list = globalRegistries.getSyntaxRegistry().list();
while ( list.hasNext() )
{
@@ -337,7 +343,7 @@
if ( returnAllOperationalAttributes || set.contains( "ditcontentrules" ) )
{
- attr = new LockableAttributeImpl( "dITContentRules" );
+ attr = new AttributeImpl( "dITContentRules" );
Iterator list = globalRegistries.getDitContentRuleRegistry().list();
while ( list.hasNext() )
{
@@ -349,7 +355,7 @@
if ( returnAllOperationalAttributes || set.contains( "ditstructurerules" ) )
{
- attr = new LockableAttributeImpl( "dITStructureRules" );
+ attr = new AttributeImpl( "dITStructureRules" );
Iterator list = globalRegistries.getDitStructureRuleRegistry().list();
while ( list.hasNext() )
{
@@ -361,7 +367,7 @@
if ( returnAllOperationalAttributes || set.contains( "nameforms" ) )
{
- attr = new LockableAttributeImpl( "nameForms" );
+ attr = new AttributeImpl( "nameForms" );
Iterator list = globalRegistries.getNameFormRegistry().list();
while ( list.hasNext() )
{
@@ -376,28 +382,28 @@
if ( returnAllOperationalAttributes || set.contains( "createtimestamp" ) )
{
- attr = new LockableAttributeImpl( "createTimestamp" );
+ attr = new AttributeImpl( "createTimestamp" );
attr.add( startUpTimeStamp );
attrs.put( attr );
}
if ( returnAllOperationalAttributes || set.contains( "modifytimestamp" ) )
{
- attr = new LockableAttributeImpl( "modifyTimestamp" );
+ attr = new AttributeImpl( "modifyTimestamp" );
attr.add( startUpTimeStamp );
attrs.put( attr );
}
if ( returnAllOperationalAttributes || set.contains( "creatorsname" ) )
{
- attr = new LockableAttributeImpl( "creatorsName" );
+ attr = new AttributeImpl( "creatorsName" );
attr.add( PartitionNexus.ADMIN_PRINCIPAL );
attrs.put( attr );
}
if ( returnAllOperationalAttributes || set.contains( "modifiersname" ) )
{
- attr = new LockableAttributeImpl( "modifiersName" );
+ attr = new AttributeImpl( "modifiersName" );
attr.add( PartitionNexus.ADMIN_PRINCIPAL );
attrs.put( attr );
}
@@ -419,7 +425,7 @@
// add the objectClass attribute
if ( set.contains( "*" ) || set.contains( "objectclass" ) || set.size() == minSetSize )
{
- attr = new LockableAttributeImpl( "objectClass" );
+ attr = new AttributeImpl( "objectClass" );
attr.add( "top" );
attr.add( "subschema" );
attrs.put( attr );
@@ -543,7 +549,7 @@
{
if ( changes == null && existing == null )
{
- return new LockableAttributeImpl( "objectClass" );
+ return new AttributeImpl( "objectClass" );
}
if ( changes == null )
@@ -557,7 +563,7 @@
}
else if ( existing == null )
{
- return new LockableAttributeImpl( "objectClasses" );
+ return new AttributeImpl( "objectClasses" );
}
switch ( modOp )
@@ -775,7 +781,7 @@
next.modify( name, modOp, mods );
}
- public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
// First, we get the entry from the backend. If it does not exist, then we throw an exception
Attributes entry = nexus.lookup( name );
@@ -791,7 +797,7 @@
Attributes tmpEntry = (Attributes)entry.clone();
Set modset = new HashSet();
- ModificationItem objectClassMod = null;
+ ModificationItemImpl objectClassMod = null;
// Check that we don't have two times the same modification.
// This is somehow useless, has modification operations are supposed to
@@ -889,7 +895,7 @@
}
else
{
- attr = new LockableAttributeImpl( change.getID() );
+ attr = new AttributeImpl( change.getID() );
NamingEnumeration values = change.getAll();
while ( values.hasMoreElements() )
@@ -970,7 +976,7 @@
{
tmpEntry.remove( change.getID() );
}
- attr = new LockableAttributeImpl( change.getID() );
+ attr = new AttributeImpl( change.getID() );
NamingEnumeration values = change.getAll();
@@ -1092,7 +1098,7 @@
if ( asBinary )
{
Attribute attribute = entry.get( id );
- Attribute binary = new LockableAttributeImpl( id );
+ Attribute binary = new AttributeImpl( id );
for ( int i = 0; i < attribute.size(); i++ )
{
Object value = attribute.get( i );
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
(empty)
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Sun Jan 7 18:44:33 2007
@@ -26,6 +26,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
+
import java.util.Iterator;
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Sun Jan 7 18:44:33 2007
@@ -27,6 +27,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
+
import java.util.Iterator;
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Sun Jan 7 18:44:33 2007
@@ -40,8 +40,9 @@
import org.apache.directory.shared.ldap.filter.LeafNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
-import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SubentriesControl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -53,9 +54,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
-import javax.naming.directory.*;
import javax.naming.NamingException;
import javax.naming.NamingEnumeration;
import javax.naming.Name;
@@ -290,7 +295,7 @@
*/
public Attributes getSubentryAttributes( Name dn, Attributes entryAttrs ) throws NamingException
{
- Attributes subentryAttrs = new LockableAttributesImpl();
+ Attributes subentryAttrs = new AttributesImpl();
Attribute objectClasses = entryAttrs.get( "objectClass" );
Iterator list = subentryCache.nameIterator();
while ( list.hasNext() )
@@ -311,7 +316,7 @@
operational = subentryAttrs.get( AC_SUBENTRIES );
if ( operational == null )
{
- operational = new LockableAttributeImpl( AC_SUBENTRIES );
+ operational = new AttributeImpl( AC_SUBENTRIES );
subentryAttrs.put( operational );
}
operational.add( subentryDn.toString() );
@@ -321,7 +326,7 @@
operational = subentryAttrs.get( SCHEMA_SUBENTRY );
if ( operational == null )
{
- operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
+ operational = new AttributeImpl( SCHEMA_SUBENTRY );
subentryAttrs.put( operational );
}
operational.add( subentryDn.toString() );
@@ -331,7 +336,7 @@
operational = subentryAttrs.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
if ( operational == null )
{
- operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+ operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
subentryAttrs.put( operational );
}
operational.add( subentryDn.toString() );
@@ -450,7 +455,7 @@
operational = entry.get( AC_SUBENTRIES );
if ( operational == null )
{
- operational = new LockableAttributeImpl( AC_SUBENTRIES );
+ operational = new AttributeImpl( AC_SUBENTRIES );
entry.put( operational );
}
operational.add( subentryDn.toString() );
@@ -460,7 +465,7 @@
operational = entry.get( SCHEMA_SUBENTRY );
if ( operational == null )
{
- operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
+ operational = new AttributeImpl( SCHEMA_SUBENTRY );
entry.put( operational );
}
operational.add( subentryDn.toString() );
@@ -470,7 +475,7 @@
operational = entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
if ( operational == null )
{
- operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+ operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
entry.put( operational );
}
operational.add( subentryDn.toString() );
@@ -566,7 +571,7 @@
}
- private ModificationItem[] getModsOnEntryRdnChange( Name oldName, Name newName, Attributes entry )
+ private ModificationItemImpl[] getModsOnEntryRdnChange( Name oldName, Name newName, Attributes entry )
throws NamingException
{
Attribute objectClasses = entry.get( "objectClass" );
@@ -617,7 +622,7 @@
op = DirContext.REMOVE_ATTRIBUTE;
}
- modList.add( new ModificationItem( op, opAttr ) );
+ modList.add( new ModificationItemImpl( op, opAttr ) );
}
}
}
@@ -627,15 +632,15 @@
for ( int ii = 0; ii < SUBENTRY_OPATTRS.length; ii++ )
{
int op = DirContext.ADD_ATTRIBUTE;
- Attribute opAttr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
+ Attribute opAttr = new AttributeImpl( SUBENTRY_OPATTRS[ii] );
opAttr.add( subentryDn );
- modList.add( new ModificationItem( op, opAttr ) );
+ modList.add( new ModificationItemImpl( op, opAttr ) );
}
}
}
- ModificationItem[] mods = new ModificationItem[modList.size()];
- mods = ( ModificationItem[] ) modList.toArray( mods );
+ ModificationItemImpl[] mods = new ModificationItemImpl[modList.size()];
+ mods = ( ModificationItemImpl[] ) modList.toArray( mods );
return mods;
}
@@ -700,7 +705,7 @@
newName.remove( newName.size() - 1 );
newName.add( newRn );
newName.normalize( attrRegistry.getNormalizerMapping() );
- ModificationItem[] mods = getModsOnEntryRdnChange( name, newName, entry );
+ ModificationItemImpl[] mods = getModsOnEntryRdnChange( name, newName, entry );
if ( mods.length > 0 )
{
@@ -772,7 +777,7 @@
LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( newRn );
newName.normalize( attrRegistry.getNormalizerMapping() );
- ModificationItem[] mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
+ ModificationItemImpl[] mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
if ( mods.length > 0 )
{
@@ -839,7 +844,7 @@
// attributes contained within this regular entry with name changes
LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
- ModificationItem[] mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
+ ModificationItemImpl[] mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
if ( mods.length > 0 )
{
@@ -885,13 +890,13 @@
}
}
- Attributes attrs = new LockableAttributesImpl();
+ Attributes attrs = new AttributesImpl();
attrs.put( ocFinalState );
return getSubentryTypes( attrs );
}
- private int getSubentryTypes( Attributes entry, ModificationItem[] mods ) throws NamingException
+ private int getSubentryTypes( Attributes entry, ModificationItemImpl[] mods ) throws NamingException
{
Attribute ocFinalState = ( Attribute ) entry.get( "objectClass" ).clone();
for ( int ii = 0; ii < mods.length; ii++ )
@@ -919,7 +924,7 @@
}
}
- Attributes attrs = new LockableAttributesImpl();
+ Attributes attrs = new AttributesImpl();
attrs.put( ocFinalState );
return getSubentryTypes( attrs );
}
@@ -999,12 +1004,12 @@
}
- public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods ) throws NamingException
{
Attributes entry = nexus.lookup( name );
Attribute objectClasses = ServerUtils.getAttribute( objectClassType, entry );
boolean isSubtreeSpecificationModification = false;
- ModificationItem subtreeMod = null;
+ ModificationItemImpl subtreeMod = null;
for ( int ii = 0; ii < mods.length; ii++ )
{
@@ -1088,7 +1093,7 @@
// Utility Methods
// -----------------------------------------------------------------------
- private ModificationItem[] getOperationalModsForReplace( Name oldName, Name newName, Subentry subentry,
+ private ModificationItemImpl[] getOperationalModsForReplace( Name oldName, Name newName, Subentry subentry,
Attributes entry ) throws NamingException
{
List modList = new ArrayList();
@@ -1100,7 +1105,7 @@
operational = ( Attribute ) entry.get( AC_SUBENTRIES ).clone();
if ( operational == null )
{
- operational = new LockableAttributeImpl( AC_SUBENTRIES );
+ operational = new AttributeImpl( AC_SUBENTRIES );
operational.add( newName.toString() );
}
else
@@ -1108,14 +1113,14 @@
operational.remove( oldName.toString() );
operational.add( newName.toString() );
}
- modList.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, operational ) );
+ modList.add( new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, operational ) );
}
if ( subentry.isSchemaSubentry() )
{
operational = ( Attribute ) entry.get( SCHEMA_SUBENTRY ).clone();
if ( operational == null )
{
- operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
+ operational = new AttributeImpl( SCHEMA_SUBENTRY );
operational.add( newName.toString() );
}
else
@@ -1123,14 +1128,14 @@
operational.remove( oldName.toString() );
operational.add( newName.toString() );
}
- modList.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, operational ) );
+ modList.add( new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, operational ) );
}
if ( subentry.isCollectiveSubentry() )
{
operational = ( Attribute ) entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES ).clone();
if ( operational == null )
{
- operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+ operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
operational.add( newName.toString() );
}
else
@@ -1138,11 +1143,11 @@
operational.remove( oldName.toString() );
operational.add( newName.toString() );
}
- modList.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, operational ) );
+ modList.add( new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, operational ) );
}
- ModificationItem[] mods = new ModificationItem[modList.size()];
- return ( ModificationItem[] ) modList.toArray( mods );
+ ModificationItemImpl[] mods = new ModificationItemImpl[modList.size()];
+ return ( ModificationItemImpl[] ) modList.toArray( mods );
}
@@ -1158,7 +1163,7 @@
private Attributes getSubentryOperatationalAttributes( Name name, Subentry subentry )
throws NamingException
{
- Attributes operational = new LockableAttributesImpl();
+ Attributes operational = new AttributesImpl();
if ( subentry.isAccessControlSubentry() )
{
@@ -1211,7 +1216,7 @@
* @return the set of modifications required to remove an entry's reference to
* a subentry
*/
- private ModificationItem[] getOperationalModsForRemove( LdapDN subentryDn, Attributes candidate )
+ private ModificationItemImpl[] getOperationalModsForRemove( LdapDN subentryDn, Attributes candidate )
{
List modList = new ArrayList();
String dn = subentryDn.toNormName();
@@ -1223,14 +1228,14 @@
if ( opAttr != null && opAttr.contains( dn ) )
{
- Attribute attr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
+ Attribute attr = new AttributeImpl( SUBENTRY_OPATTRS[ii] );
attr.add( dn );
- modList.add( new ModificationItem( DirContext.REMOVE_ATTRIBUTE, attr ) );
+ modList.add( new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr ) );
}
}
- ModificationItem[] mods = new ModificationItem[modList.size()];
- return ( ModificationItem[] ) modList.toArray( mods );
+ ModificationItemImpl[] mods = new ModificationItemImpl[modList.size()];
+ return ( ModificationItemImpl[] ) modList.toArray( mods );
}
@@ -1248,7 +1253,7 @@
* of the subentry
* @return the set of modifications needed to update the entry
*/
- public ModificationItem[] getOperationalModsForAdd( Attributes entry, Attributes operational )
+ public ModificationItemImpl[] getOperationalModsForAdd( Attributes entry, Attributes operational )
throws NamingException
{
List modList = new ArrayList();
@@ -1258,7 +1263,7 @@
{
int op = DirContext.REPLACE_ATTRIBUTE;
String opAttrId = ( String ) opAttrIds.next();
- Attribute result = new LockableAttributeImpl( opAttrId );
+ Attribute result = new AttributeImpl( opAttrId );
Attribute opAttrAdditions = operational.get( opAttrId );
Attribute opAttrInEntry = entry.get( opAttrId );
@@ -1279,11 +1284,11 @@
op = DirContext.ADD_ATTRIBUTE;
}
- modList.add( new ModificationItem( op, result ) );
+ modList.add( new ModificationItemImpl( op, result ) );
}
- ModificationItem[] mods = new ModificationItem[modList.size()];
- mods = ( ModificationItem[] ) modList.toArray( mods );
+ ModificationItemImpl[] mods = new ModificationItemImpl[modList.size()];
+ mods = ( ModificationItemImpl[] ) modList.toArray( mods );
return mods;
}
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?view=diff&rev=493916&r1=493915&r2=493916
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Sun Jan 7 18:44:33 2007
@@ -28,6 +28,7 @@
import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
+
import java.util.Iterator;