You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/29 18:48:53 UTC
svn commit: r1065085 -
/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Author: akarasulu
Date: Sat Jan 29 17:48:52 2011
New Revision: 1065085
URL: http://svn.apache.org/viewvc?rev=1065085&view=rev
Log:
shared at least is building now without the DSML modules
Modified:
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1065085&r1=1065084&r2=1065085&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Jan 29 17:48:52 2011
@@ -59,44 +59,19 @@ import org.apache.directory.ldap.client.
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.MessageEncoderException;
-import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
+import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.*;
-import org.apache.directory.shared.ldap.model.entry.Modification;
-import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.exception.*;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.exception.LdapOperationException;
import org.apache.directory.shared.ldap.model.filter.SearchScope;
-import org.apache.directory.shared.ldap.model.message.AbandonRequest;
-import org.apache.directory.shared.ldap.model.message.AbandonRequestImpl;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-import org.apache.directory.shared.ldap.model.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.model.message.AddResponse;
import org.apache.directory.shared.ldap.model.message.*;
-import org.apache.directory.shared.ldap.model.message.BindRequest;
-import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.model.message.BindResponse;
-import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
-import org.apache.directory.shared.ldap.model.message.CompareResponse;
-import org.apache.directory.shared.ldap.model.message.DeleteRequest;
-import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.model.message.DeleteResponse;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.IntermediateResponse;
-import org.apache.directory.shared.ldap.model.message.IntermediateResponseImpl;
-import org.apache.directory.shared.ldap.model.message.LdapResult;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
@@ -113,6 +88,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.UnbindRequest;
import org.apache.directory.shared.ldap.model.message.UnbindRequestImpl;
import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.BasicControl;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
import org.apache.directory.shared.ldap.message.extended.nod.AddNoDResponse;
import org.apache.directory.shared.ldap.message.extended.nod.BindNoDResponse;
@@ -214,6 +190,9 @@ public class LdapNetworkConnection exten
/** the schema manager */
private SchemaManager schemaManager;
+ /** the ldap codec service */
+ ILdapCodecService codec = new DefaultLdapCodecService();
+
/** the SslFilter key */
private static final String SSL_FILTER_KEY = "sslFilter";
@@ -597,7 +576,7 @@ public class LdapNetworkConnection exten
connected.set( true );
// And inject the current Ldap container into the session
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ Asn1Container ldapMessageContainer = new LdapMessageContainer<MessageDecorator<Message>>( codec );
// Store the container into the session
ldapSession.setAttribute( "LDAP-Container", ldapMessageContainer );
@@ -2488,7 +2467,7 @@ public class LdapNetworkConnection exten
{
DeleteRequest deleteRequest = new DeleteRequestImpl();
deleteRequest.setName( dn );
- deleteRequest.addControl( new ControlImpl( treeDeleteOid ) );
+ deleteRequest.addControl( new BasicControl( treeDeleteOid ) );
return delete( deleteRequest );
}
else
@@ -2519,7 +2498,7 @@ public class LdapNetworkConnection exten
{
DeleteRequest deleteRequest = new DeleteRequestImpl();
deleteRequest.setName( newDn );
- deleteRequest.addControl( new ControlImpl( treeDeleteOid ) );
+ deleteRequest.addControl( new BasicControl( treeDeleteOid ) );
return delete( deleteRequest );
}
else
@@ -3342,11 +3321,7 @@ public class LdapNetworkConnection exten
continue;
}
- Control control = new ControlImpl( cc.getOid() );
- control.setValue( cc.getValue() );
- control.setCritical( cc.isCritical() );
-
- message.addControl( control );
+ message.addControl( cc );
}
}
}
Re: svn commit: r1065085 - /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Posted by Alex Karasulu <ak...@apache.org>.
I'm fixing the issues now. Gimme a few hours and then it should all be ok.
On Sat, Jan 29, 2011 at 10:49 PM, Stefan Seelmann <se...@apache.org>wrote:
> On Sat, Jan 29, 2011 at 6:48 PM, <ak...@apache.org> wrote:
> > Author: akarasulu
> > Date: Sat Jan 29 17:48:52 2011
> > New Revision: 1065085
> >
> > URL: http://svn.apache.org/viewvc?rev=1065085&view=rev
> > Log:
> > shared at least is building now without the DSML modules
>
> Not really:
> Tests run: 2148, Failures: 18, Errors: 85, Skipped: 2
>
> http://vmbuild.apache.org/continuum/buildResult.action?buildId=2924&projectGroupId=6&projectId=207&projectName=Apache+Directory+Shared
>
> May I suggest to
> - copy the current trunk to a branch where you can continue the refactoring
> - revert trunk to r1064845
> ?
>
> Kind Regards,
> Stefan
>
--
Alex Karasulu
My Blog :: http://www.jroller.com/akarasulu/
Apache Directory Server :: http://directory.apache.org
Apache MINA :: http://mina.apache.org
To set up a meeting with me: http://tungle.me/AlexKarasulu
Re: svn commit: r1065085 - /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Posted by Stefan Seelmann <se...@apache.org>.
On Sat, Jan 29, 2011 at 6:48 PM, <ak...@apache.org> wrote:
> Author: akarasulu
> Date: Sat Jan 29 17:48:52 2011
> New Revision: 1065085
>
> URL: http://svn.apache.org/viewvc?rev=1065085&view=rev
> Log:
> shared at least is building now without the DSML modules
Not really:
Tests run: 2148, Failures: 18, Errors: 85, Skipped: 2
http://vmbuild.apache.org/continuum/buildResult.action?buildId=2924&projectGroupId=6&projectId=207&projectName=Apache+Directory+Shared
May I suggest to
- copy the current trunk to a branch where you can continue the refactoring
- revert trunk to r1064845
?
Kind Regards,
Stefan