svn commit: r494175 - in /directory/trunks/apacheds/protocol-shared/src: main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java

[el...@apache.org]

Author: elecharny
Date: Mon Jan  8 11:42:52 2007
New Revision: 494175

URL: http://svn.apache.org/viewvc?view=rev&rev=494175
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/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
    directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java

Modified: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?view=diff&rev=494175&r1=494174&r2=494175
==============================================================================
--- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (original)
+++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Mon Jan  8 11:42:52 2007
@@ -62,8 +62,8 @@
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -188,8 +188,8 @@
 
         partConfig.setSuffix( "dc=example, dc=com" );
 
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
-        LockableAttributeImpl objectClass = new LockableAttributeImpl( "objectClass" );
+        AttributesImpl attrs = new AttributesImpl();
+        AttributeImpl objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "domain" );
         attrs.put( objectClass );
@@ -215,8 +215,8 @@
 
         partConfig.setSuffix( "dc=apache, dc=org" );
 
-        LockableAttributesImpl attrs = new LockableAttributesImpl();
-        LockableAttributeImpl objectClass = new LockableAttributeImpl( "objectClass" );
+        AttributesImpl attrs = new AttributesImpl();
+        AttributeImpl objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "domain" );
         attrs.put( objectClass );

Modified: directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java?view=diff&rev=494175&r1=494174&r2=494175
==============================================================================
--- directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java (original)
+++ directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java Mon Jan  8 11:42:52 2007
@@ -25,11 +25,11 @@
 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 org.apache.directory.server.protocol.shared.AbstractBackingStoreTest;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
 
 
 /**
@@ -60,8 +60,8 @@
         env.put( Context.PROVIDER_URL, "dc=example,dc=com" );
         DirContext ctx = ( DirContext ) factory.getInitialContext( env );
 
-        Attributes matchAttrs = new BasicAttributes( true );
-        matchAttrs.put( new BasicAttribute( "krb5PrincipalName", "kadmin/changepw@EXAMPLE.COM" ) );
+        Attributes matchAttrs = new AttributesImpl( true );
+        matchAttrs.put( new AttributeImpl( "krb5PrincipalName", "kadmin/changepw@EXAMPLE.COM" ) );
 
         Attributes attributes = ctx.getAttributes( "ou=users" );
         System.out.println( attributes );