You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2009/06/27 20:03:51 UTC
svn commit: r789005 - in /directory:
apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/
shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/
Author: kayyagari
Date: Sat Jun 27 18:03:50 2009
New Revision: 789005
URL: http://svn.apache.org/viewvc?rev=789005&view=rev
Log:
o removed the wrong control in delete method
o changed the @Ignored test comment
Modified:
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
Modified: directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=789005&r1=789004&r2=789005&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sat Jun 27 18:03:50 2009
@@ -145,7 +145,7 @@
}
- @Ignore( "this method is failing, need to figure out the issue" )
+ @Ignore( "enable this test when the TreeDelete control gets created" )
@Test
public void testDeleteWithCascadeControl() throws Exception
{
Modified: directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=789005&r1=789004&r2=789005&view=diff
==============================================================================
--- directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java Sat Jun 27 18:03:50 2009
@@ -112,7 +112,6 @@
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.CascadeControl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -1919,9 +1918,10 @@
if( deleteAllChildren )
{
- if( isControlSupported( CascadeControl.CONTROL_OID ) )
+ // TODO replace with a constant name, after adding support for treedelete control in core
+ if( isControlSupported( "1.2.840.113556.1.4.805" ) )
{
- delRequest.add( new CascadeControl() );
+ //delRequest.add( new TreeDeleteControl() );
}
else
{