svn commit: r494168 - in /directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools: CapacityTestCommand.java commands/importcmd/ImportCommandExecutor.java

[el...@apache.org]

Author: elecharny
Date: Mon Jan  8 11:40:54 2007
New Revision: 494168

URL: http://svn.apache.org/viewvc?view=rev&rev=494168
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/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
    directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java

Modified: directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java?view=diff&rev=494168&r1=494167&r2=494168
==============================================================================
--- directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java (original)
+++ directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java Mon Jan  8 11:40:54 2007
@@ -26,7 +26,6 @@
 
 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;
 
@@ -35,6 +34,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 
@@ -130,7 +130,7 @@
     
     private Attributes generateLdif( int counter )
     {
-        BasicAttributes attrs = new BasicAttributes( "objectClass", "top", true );
+        Attributes attrs = new AttributesImpl( "objectClass", "top", true );
         Attribute oc = attrs.get( "objectClass" );
         oc.add( "person" );
         oc.add( "organizationalPerson" );

Modified: directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java?view=diff&rev=494168&r1=494167&r2=494168
==============================================================================
--- directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java (original)
+++ directory/trunks/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java Mon Jan  8 11:40:54 2007
@@ -40,7 +40,6 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.configuration.ServerStartupConfiguration;
 import org.apache.directory.server.tools.ToolCommandListener;
@@ -71,6 +70,7 @@
 import org.apache.directory.shared.ldap.codec.util.LdapResultEnum;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
+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.name.Rdn;
@@ -440,7 +440,7 @@
 
         while ( modifications.hasNext() )
         {
-            ModificationItem modification = ( ModificationItem ) modifications.next();
+            ModificationItemImpl modification = ( ModificationItemImpl ) modifications.next();
 
             switch ( modification.getModificationOp() )
             {