Author: elecharny Date: Mon Apr 6 22:19:48 2009 New Revision: 762533 URL: http://svn.apache.org/viewvc?rev=762533&view=rev Log: Reverted back to use javax.naming.Control. We have to find a better solution ... Modified: directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractMessage.java directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/Message.java Modified: directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=762533&r1=762532&r2=762533&view=diff ============================================================================== --- directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java (original) +++ directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java Mon Apr 6 22:19:48 2009 @@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.naming.InvalidNameException; +import javax.naming.ldap.Control; import javax.net.ssl.SSLContext; import org.apache.directory.shared.asn1.ber.IAsn1Container; @@ -48,7 +49,6 @@ import org.apache.directory.shared.ldap.client.api.messages.BindRequestImpl; import org.apache.directory.shared.ldap.client.api.messages.BindResponse; import org.apache.directory.shared.ldap.client.api.messages.BindResponseImpl; -import org.apache.directory.shared.ldap.client.api.messages.Control; import org.apache.directory.shared.ldap.client.api.messages.IntermediateResponse; import org.apache.directory.shared.ldap.client.api.messages.IntermediateResponseImpl; import org.apache.directory.shared.ldap.client.api.messages.LdapResult; Modified: directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractMessage.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractMessage.java?rev=762533&r1=762532&r2=762533&view=diff ============================================================================== --- directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractMessage.java (original) +++ directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractMessage.java Mon Apr 6 22:19:48 2009 @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; +import javax.naming.ldap.Control; import org.apache.directory.shared.ldap.client.api.exception.LdapException; Modified: directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/Message.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/Message.java?rev=762533&r1=762532&r2=762533&view=diff ============================================================================== --- directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/Message.java (original) +++ directory/shared/branches/shared-replication/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/Message.java Mon Apr 6 22:19:48 2009 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.directory.shared.ldap.client.api.exception.LdapException; +import javax.naming.ldap.Control; /**