Author: elecharny
Date: Mon Jan 8 11:43:47 2007
New Revision: 494177
URL: http://svn.apache.org/viewvc?view=rev&rev=494177
Log:
Patch for DIRSERVER-783.
- No more BasicAttribute and BasicAttributes. Use AttributeImpl and AttributesImpl now.
- No more ModificationItem. use ModificationItemImpl now
- lot of refactoring of imports : no more import xxx.*;
Modified:
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddAttributeOperation.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/DeleteAttributeOperation.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/ReplaceAttributeOperation.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageCodecTest.java
directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddAttributeOperation.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddAttributeOperation.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddAttributeOperation.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddAttributeOperation.java
Mon Jan 8 11:43:47 2007
@@ -23,10 +23,10 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.mitosis.common.CSN;
@@ -60,7 +60,7 @@
protected void execute1( PartitionNexus nexus ) throws NamingException
{
- Attributes attrs = new BasicAttributes( true );
+ Attributes attrs = new AttributesImpl( true );
attrs.put( getAttribute() );
nexus.modify( getName(), DirContext.ADD_ATTRIBUTE, attrs );
}
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
Mon Jan 8 11:43:47 2007
@@ -88,7 +88,7 @@
String rdn = normalizedName.get( normalizedName.size() - 1 );
// Remove the attribute first in case we're using a buggy
- // LockableAttributesImpl which doesn't replace old attributes
+ // AttributesImpl which doesn't replace old attributes
// when we put a new one.
entry.remove( NamespaceTools.getRdnAttribute( rdn ) );
entry.put( NamespaceTools.getRdnAttribute( rdn ), NamespaceTools.getRdnValue( rdn
) );
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/DeleteAttributeOperation.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/DeleteAttributeOperation.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/DeleteAttributeOperation.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/DeleteAttributeOperation.java
Mon Jan 8 11:43:47 2007
@@ -23,10 +23,10 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.mitosis.common.CSN;
@@ -60,7 +60,7 @@
protected void execute1( PartitionNexus nexus ) throws NamingException
{
- Attributes attrs = new BasicAttributes( true );
+ Attributes attrs = new AttributesImpl( true );
attrs.put( getAttribute() );
nexus.modify( getName(), DirContext.REMOVE_ATTRIBUTE, attrs );
}
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
Mon Jan 8 11:43:47 2007
@@ -28,15 +28,15 @@
import javax.naming.OperationNotSupportedException;
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.directory.SearchControls;
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.NamespaceTools;
import org.apache.directory.mitosis.common.CSN;
@@ -138,7 +138,7 @@
CompositeOperation result = new CompositeOperation( csn );
// Transform into replace operation.
- result.add( new ReplaceAttributeOperation( csn, normalizedName, new BasicAttribute(
Constants.ENTRY_DELETED,
+ result.add( new ReplaceAttributeOperation( csn, normalizedName, new AttributeImpl(
Constants.ENTRY_DELETED,
"true" ) ) );
return addDefaultOperations( result, csn, normalizedName );
@@ -166,7 +166,7 @@
}
// Resurrect the entry in case it is deleted.
- result.add( new ReplaceAttributeOperation( csn, normalizedName, new BasicAttribute(
Constants.ENTRY_DELETED,
+ result.add( new ReplaceAttributeOperation( csn, normalizedName, new AttributeImpl(
Constants.ENTRY_DELETED,
"false" ) ) );
return addDefaultOperations( result, null, normalizedName );
@@ -181,7 +181,7 @@
* sets {@link Constants#ENTRY_DELETED} to "false" to resurrect the
* entry the modified attributes belong to.
*/
- public Operation newModify( LdapDN normalizedName, ModificationItem[] items )
+ public Operation newModify( LdapDN normalizedName, ModificationItemImpl[] items )
{
CSN csn = newCSN();
CompositeOperation result = new CompositeOperation( csn );
@@ -189,12 +189,12 @@
// Transform into multiple {@link AttributeOperation}s.
for ( int i = 0; i < length; i++ )
{
- ModificationItem item = items[i];
+ ModificationItemImpl item = items[i];
result.add( newModify( csn, normalizedName, item.getModificationOp(), item.getAttribute()
) );
}
// Resurrect the entry in case it is deleted.
- result.add( new ReplaceAttributeOperation( csn, normalizedName, new BasicAttribute(
Constants.ENTRY_DELETED,
+ result.add( new ReplaceAttributeOperation( csn, normalizedName, new AttributeImpl(
Constants.ENTRY_DELETED,
"false" ) ) );
return addDefaultOperations( result, csn, normalizedName );
@@ -283,7 +283,7 @@
LdapDN oldEntryName = new LdapDN( sr.getName() );
// Delete the old entry
- result.add( new ReplaceAttributeOperation( csn, oldEntryName, new BasicAttribute(
Constants.ENTRY_DELETED,
+ result.add( new ReplaceAttributeOperation( csn, oldEntryName, new AttributeImpl(
Constants.ENTRY_DELETED,
"true" ) ) );
// Get the old entry attributes and replace RDN if required
@@ -351,7 +351,7 @@
*/
private CompositeOperation addDefaultOperations( CompositeOperation result, CSN csn,
LdapDN normalizedName )
{
- result.add( new ReplaceAttributeOperation( csn, normalizedName, new BasicAttribute(
Constants.ENTRY_CSN, csn
+ result.add( new ReplaceAttributeOperation( csn, normalizedName, new AttributeImpl(
Constants.ENTRY_CSN, csn
.toOctetString() ) ) );
return result;
}
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/ReplaceAttributeOperation.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/ReplaceAttributeOperation.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/ReplaceAttributeOperation.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/ReplaceAttributeOperation.java
Mon Jan 8 11:43:47 2007
@@ -23,10 +23,10 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.mitosis.common.CSN;
@@ -60,7 +60,7 @@
protected void execute1( PartitionNexus nexus ) throws NamingException
{
- Attributes attrs = new BasicAttributes( true );
+ Attributes attrs = new AttributesImpl( true );
attrs.put( getAttribute() );
nexus.modify( getName(), DirContext.REPLACE_ATTRIBUTE, attrs );
}
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
Mon Jan 8 11:43:47 2007
@@ -24,10 +24,10 @@
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 org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.NamespaceTools;
import org.apache.directory.mitosis.common.CSN;
@@ -104,7 +104,7 @@
}
// Create a glue entry.
- Attributes entry = new BasicAttributes( true );
+ Attributes entry = new AttributesImpl( true );
//// Add RDN attribute.
String rdn = name.get( name.size() - 1 );
@@ -113,7 +113,7 @@
entry.put( rdnAttribute, rdnValue );
//// Add objectClass attribute.
- Attribute objectClassAttr = new BasicAttribute( "objectClass" );
+ Attribute objectClassAttr = new AttributeImpl( "objectClass" );
objectClassAttr.add( "top" );
objectClassAttr.add( "extensibleObject" );
entry.put( objectClassAttr );
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
(original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
Mon Jan 8 11:43:47 2007
@@ -33,7 +33,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;
@@ -63,6 +62,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.FilterParserImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.filter.LoggingFilter;
@@ -384,7 +384,7 @@
}
- public void modify( NextInterceptor next, LdapDN name, ModificationItem[] items ) throws
NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] items )
throws NamingException
{
Operation op = operationFactory.newModify( name, items );
op.execute( nexus, store, attrRegistry );
Modified: directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
(original)
+++ directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
Mon Jan 8 11:43:47 2007
@@ -32,7 +32,6 @@
import javax.naming.InitialContext;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
@@ -49,6 +48,7 @@
import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.jndi.CoreContextFactory;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.mina.util.AvailablePortFinder;
/**
@@ -78,7 +78,7 @@
LdapContext ctxB = getReplicaContext( "B" );
LdapContext ctxC = getReplicaContext( "C" );
- Attributes entry = new BasicAttributes( true );
+ Attributes entry = new AttributesImpl( true );
entry.put( "cn", "test" );
entry.put( "objectClass", "top" );
ctxA.bind( "cn=test,ou=system", entry );
@@ -95,13 +95,13 @@
LdapContext ctxB = getReplicaContext( "B" );
LdapContext ctxC = getReplicaContext( "C" );
- Attributes entryA = new BasicAttributes( true );
+ Attributes entryA = new AttributesImpl( true );
entryA.put( "cn", "test" );
entryA.put( "ou", "A" );
entryA.put( "objectClass", "top" );
ctxA.bind( "cn=test,ou=system", entryA );
- Attributes entryB = new BasicAttributes( true );
+ Attributes entryB = new AttributesImpl( true );
entryB.put( "cn", "test" );
entryB.put( "ou", "B" );
entryB.put( "objectClass", "top" );
Modified: directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageCodecTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageCodecTest.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageCodecTest.java
(original)
+++ directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageCodecTest.java
Mon Jan 8 11:43:47 2007
@@ -21,7 +21,6 @@
import javax.naming.InvalidNameException;
-import javax.naming.directory.BasicAttribute;
import org.apache.directory.mitosis.common.ReplicaId;
import org.apache.directory.mitosis.common.DefaultCSN;
@@ -30,6 +29,7 @@
import org.apache.directory.mitosis.service.protocol.codec.LogEntryMessageEncoder;
import org.apache.directory.mitosis.service.protocol.message.BaseMessage;
import org.apache.directory.mitosis.service.protocol.message.LogEntryMessage;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -41,7 +41,7 @@
super(
new LogEntryMessage( 1234, new AddAttributeOperation( new DefaultCSN( System.currentTimeMillis(),
new ReplicaId( "testReplica0" ), 1234 ), new LdapDN( "ou=system" ),
- new BasicAttribute( "Hello", "Test" ) ) ), new LogEntryMessageEncoder(),
new LogEntryMessageDecoder() );
+ new AttributeImpl( "Hello", "Test" ) ) ), new LogEntryMessageEncoder(), new
LogEntryMessageDecoder() );
}
Modified: directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java?view=diff&rev=494177&r1=494176&r2=494177
==============================================================================
--- directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java
(original)
+++ directory/trunks/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java
Mon Jan 8 11:43:47 2007
@@ -30,8 +30,6 @@
import java.util.Set;
import javax.naming.Name;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.LdapName;
import junit.framework.Assert;
@@ -47,6 +45,8 @@
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.SchemaManager;
import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.mitosis.common.CSN;
import org.apache.directory.mitosis.common.CSNFactory;
@@ -191,20 +191,20 @@
{
CSN csn = csnFactory.newInstance( REPLICA_ID );
CompositeOperation op1 = new CompositeOperation( csn );
- op1.add( new AddEntryOperation( csn, new LdapDN( "ou=a" ), new BasicAttributes( true
) ) );
- op1.add( new AddAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
- op1.add( new ReplaceAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
- op1.add( new DeleteAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
+ op1.add( new AddEntryOperation( csn, new LdapDN( "ou=a" ), new AttributesImpl( true
) ) );
+ op1.add( new AddAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
+ op1.add( new ReplaceAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
+ op1.add( new DeleteAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
store.putLog( op1 );
testGetLogs( csn, op1 );
csn = csnFactory.newInstance( OTHER_REPLICA_ID );
CompositeOperation op2 = new CompositeOperation( csn );
- op2.add( new AddEntryOperation( csn, new LdapDN( "ou=a" ), new BasicAttributes( true
) ) );
- op2.add( new AddAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
- op2.add( new ReplaceAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
- op2.add( new DeleteAttributeOperation( csn, new LdapDN( "ou=a" ), new BasicAttribute(
"id", "valie" ) ) );
+ op2.add( new AddEntryOperation( csn, new LdapDN( "ou=a" ), new AttributesImpl( true
) ) );
+ op2.add( new AddAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
+ op2.add( new ReplaceAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
+ op2.add( new DeleteAttributeOperation( csn, new LdapDN( "ou=a" ), new AttributeImpl(
"id", "valie" ) ) );
store.putLog( op2 );
testGetLogs( csn, op2 );
|