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 2010/01/28 00:44:35 UTC
svn commit: r903910 - in /directory/clients/ldap/trunk: ./ ldap-client-api/
ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/
ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/
ldap-client-api/src/main/java/or...
Author: elecharny
Date: Wed Jan 27 23:44:35 2010
New Revision: 903910
URL: http://svn.apache.org/viewvc?rev=903910&view=rev
Log:
fixed some compilation errors, cleaned some pom.xml, removed the local Control classes
Removed:
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractControl.java
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/control/
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/
Modified:
directory/clients/ldap/trunk/ldap-client-api/pom.xml
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractMessage.java
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/Message.java
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
directory/clients/ldap/trunk/ldap-client-test/pom.xml
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/clients/ldap/trunk/pom.xml
Modified: directory/clients/ldap/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/pom.xml?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/pom.xml (original)
+++ directory/clients/ldap/trunk/ldap-client-api/pom.xml Wed Jan 27 23:44:35 2010
@@ -62,7 +62,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Wed Jan 27 23:44:35 2010
@@ -77,8 +77,6 @@
import org.apache.directory.ldap.client.api.message.SearchResultDone;
import org.apache.directory.ldap.client.api.message.SearchResultEntry;
import org.apache.directory.ldap.client.api.message.SearchResultReference;
-import org.apache.directory.ldap.client.api.message.control.Control;
-import org.apache.directory.ldap.client.api.message.control.ControlImpl;
import org.apache.directory.ldap.client.api.protocol.LdapProtocolCodecFactory;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -88,7 +86,7 @@
import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.TwixTransformer;
+import org.apache.directory.shared.ldap.codec.LdapTransformer;
import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
@@ -126,6 +124,8 @@
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
+import org.apache.directory.shared.ldap.message.control.ControlImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -289,7 +289,7 @@
{
ControlCodec ctrl = new ControlCodec();
- ctrl.setControlType( control.getID() );
+ ctrl.setControlType( control.getOid() );
ctrl.setControlValue( control.getValue() );
message.addControl( ctrl );
@@ -1037,7 +1037,7 @@
*/
public BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
{
- ResponseFuture responseFuture = bind( bindRequest, null );
+ BindFuture bindFuture = bind( bindRequest, null );
// Get the result from the future
try
@@ -1046,7 +1046,7 @@
long timeout = getTimeout( bindRequest.getTimeout() );
// Get the response, blocking
- BindResponse bindResponse = (BindResponse)responseFuture.get( timeout, TimeUnit.MILLISECONDS );
+ BindResponse bindResponse = (BindResponse)bindFuture.get( timeout, TimeUnit.MILLISECONDS );
// Everything is fine, return the response
LOG.debug( "Bind successful : {}", bindResponse );
@@ -1056,7 +1056,7 @@
catch ( TimeoutException te )
{
// Send an abandon request
- if( !responseFuture.isCancelled() )
+ if( !bindFuture.isCancelled() )
{
abandon( bindRequest.getMessageId() );
}
@@ -1073,7 +1073,7 @@
ldapException.initCause( ie );
// Send an abandon request
- if( !responseFuture.isCancelled() )
+ if( !bindFuture.isCancelled() )
{
abandon( bindRequest.getMessageId() );
}
@@ -1196,6 +1196,7 @@
// Send the request to the server
WriteFuture writeFuture = ldapSession.write( bindMessage );
+ // Wait for the message to be sent to the server
writeFuture.awaitUninterruptibly( timeOut );
return bindFuture;
@@ -1326,7 +1327,7 @@
{
ExprNode filterNode = FilterParser.parse( searchRequest.getFilter() );
- filter = TwixTransformer.transformFilter( filterNode );
+ filter = LdapTransformer.transformFilter( filterNode );
}
catch ( ParseException pe )
{
@@ -1556,6 +1557,7 @@
BindResponse bindResponse = convert( bindResponseCodec );
futureMap.remove( bindResponseCodec.getMessageId() );
+
// remove the listener from the listener map
BindListener bindListener = ( BindListener ) listenerMap.remove( bindResponseCodec.getMessageId() );
Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractMessage.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractMessage.java?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractMessage.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/AbstractMessage.java Wed Jan 27 23:44:35 2010
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.directory.ldap.client.api.exception.LdapException;
-import org.apache.directory.ldap.client.api.message.control.Control;
+import org.apache.directory.shared.ldap.message.control.Control;
/**
@@ -90,7 +90,7 @@
{
for ( Control control:controls )
{
- this.controls.put( control.getID(), control );
+ this.controls.put( control.getOid(), control );
}
}
@@ -142,7 +142,7 @@
{
for ( Control ctrl:controls )
{
- this.controls.remove( ctrl.getID() );
+ this.controls.remove( ctrl.getOid() );
}
}
@@ -169,7 +169,7 @@
for ( Control control:controls.values() )
{
sb.append( " " ).append( control.getClass().getSimpleName() );
- sb.append( ":" ).append( control.getID() ).append( "\n" );
+ sb.append( ":" ).append( control.getOid() ).append( "\n" );
}
}
Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/Message.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/Message.java?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/Message.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/Message.java Wed Jan 27 23:44:35 2010
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.directory.ldap.client.api.exception.LdapException;
-import org.apache.directory.ldap.client.api.message.control.Control;
+import org.apache.directory.shared.ldap.message.control.Control;
/**
Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java Wed Jan 27 23:44:35 2010
@@ -25,7 +25,6 @@
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.LdapDecoder;
import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -62,7 +61,7 @@
public void decode( IoSession session, IoBuffer buffer, ProtocolDecoderOutput out ) throws Exception
{
// Allocate a LdapMessage Container
- Asn1Decoder ldapDecoder = new LdapDecoder();
+ Asn1Decoder ldapDecoder = new Asn1Decoder();
IAsn1Container ldapMessageContainer = (LdapMessageContainer)session.getAttribute( "LDAP-Container" );
ByteBuffer buf = buffer.buf();
int currentPos = 0;
Modified: directory/clients/ldap/trunk/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/pom.xml?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/pom.xml (original)
+++ directory/clients/ldap/trunk/ldap-client-test/pom.xml Wed Jan 27 23:44:35 2010
@@ -54,6 +54,12 @@
</dependency>
<dependency>
+ <artifactId>ldap-client-api</artifactId>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
@@ -65,19 +71,24 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.directory.client.ldap</groupId>
- <artifactId>ldap-client-api</artifactId>
- <version>${version}</version>
+ <artifactId>ldap-client-api</artifactId>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Wed Jan 27 23:44:35 2010
@@ -34,7 +34,6 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -95,7 +94,6 @@
@Test
- @Ignore
public void testGetSupportedControls() throws Exception
{
LdapConnection connection = new LdapConnection( "localhost", ldapServer.getPort() );
Modified: directory/clients/ldap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/pom.xml?rev=903910&r1=903909&r2=903910&view=diff
==============================================================================
--- directory/clients/ldap/trunk/pom.xml (original)
+++ directory/clients/ldap/trunk/pom.xml Wed Jan 27 23:44:35 2010
@@ -41,10 +41,15 @@
<!-- Set versions for depending projects -->
<org.apache.directory.shared.version>0.9.18-SNAPSHOT</org.apache.directory.shared.version>
<org.apache.directory.server.version>1.5.6-SNAPSHOT</org.apache.directory.server.version>
+ <skin.version>1.0.1</skin.version>
+
+ <!-- Set version for other jars -->
+ <commons.io.version>1.4</commons.io.version>
<commons.pool.version>1.5.4</commons.pool.version>
- <mina.core.version>2.0.0-RC1</mina.core.version>
<junit.version>4.7</junit.version>
- <skin.version>1.0.1</skin.version>
+ <mina.core.version>2.0.0-RC1</mina.core.version>
+ <slf4j.log4j12.version>1.5.10</slf4j.log4j12.version>
+ <log4j.version>1.2.14</log4j.version>
</properties>
<url>http://directory.apache.org/apacheds/1.5</url>
@@ -79,6 +84,12 @@
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -89,15 +100,17 @@
<artifactId>mina-core</artifactId>
<version>${mina.core.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.10</version>
+ <version>${slf4j.log4j12.version}</version>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</dependencyManagement>