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 2006/01/05 10:05:06 UTC
svn commit: r366131 - in
/directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support:
CompareHandler.java ModifyDnHandler.java SearchHandler.java
Author: elecharny
Date: Thu Jan 5 01:05:00 2006
New Revision: 366131
URL: http://svn.apache.org/viewcvs?rev=366131&view=rev
Log:
Backporting DN-refactoring to this branch
Modified:
directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/CompareHandler.java
directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/ModifyDnHandler.java
directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/SearchHandler.java
Modified: directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/CompareHandler.java
URL: http://svn.apache.org/viewcvs/directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/CompareHandler.java?rev=366131&r1=366130&r2=366131&view=diff
==============================================================================
--- directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/CompareHandler.java (original)
+++ directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/CompareHandler.java Thu Jan 5 01:05:00 2006
@@ -17,16 +17,17 @@
package org.apache.ldap.server.protocol.support;
+import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
+import org.apache.ldap.common.codec.util.LdapDN;
import org.apache.ldap.common.exception.LdapException;
import org.apache.ldap.common.message.CompareRequest;
import org.apache.ldap.common.message.CompareResponse;
import org.apache.ldap.common.message.CompareResponseImpl;
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.ldap.server.jndi.ServerLdapContext;
import org.apache.ldap.server.protocol.SessionRegistry;
@@ -56,7 +57,7 @@
{
LdapContext ctx = SessionRegistry.getSingleton().getLdapContext( session, null, true );
ServerLdapContext newCtx = ( ServerLdapContext ) ctx.lookup( "" );
- LdapName name = new LdapName( req.getName() );
+ Name name = new LdapDN( req.getName() );
if ( newCtx.compare( name, req.getAttributeId(), req.getAssertionValue() ) )
{
Modified: directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/ModifyDnHandler.java
URL: http://svn.apache.org/viewcvs/directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/ModifyDnHandler.java?rev=366131&r1=366130&r2=366131&view=diff
==============================================================================
--- directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/ModifyDnHandler.java (original)
+++ directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/ModifyDnHandler.java Thu Jan 5 01:05:00 2006
@@ -16,6 +16,7 @@
*/
package org.apache.ldap.server.protocol.support;
+import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
@@ -26,7 +27,7 @@
import org.apache.ldap.common.message.ModifyDnResponse;
import org.apache.ldap.common.message.ModifyDnResponseImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.name.LdapDN;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.protocol.SessionRegistry;
@@ -74,38 +75,25 @@
if (req.isMove())
{
- LdapName oldDn = new LdapName( req.getName() );
- LdapName newDn = null;
+ Name oldDn = new LdapDN( req.getName() );
+ Name newDn = new LdapDN( req.getNewSuperior() );
- String newSuperior = req.getNewSuperior();
-
- if ( StringTools.isEmpty( newSuperior ) )
+ if ( req.getNewRdn() != null )
{
- newDn = (LdapName)oldDn.getPrefix( 1 );
+ newDn.add( req.getNewRdn() );
}
else
{
- newDn = new LdapName( req.getNewSuperior() );
- }
-
-
- if (req.getNewRdn() != null)
- {
- newDn.add( req.getNewRdn() );
+ newDn.add( oldDn.get( oldDn.size() - 1 ) );
}
- else
- {
- newDn.add( oldDn.getRdn() );
- }
-
- ctx.rename( new LdapName( req.getName() ), newDn );
+ ctx.rename( new LdapDN( req.getName() ), newDn );
}
else
{
- LdapName newDn = new LdapName( req.getName() );
+ Name newDn = new LdapDN( req.getName() );
newDn.remove( newDn.size() - 1 );
newDn.add( req.getNewRdn() );
- ctx.rename( new LdapName( req.getName() ), newDn );
+ ctx.rename( new LdapDN( req.getName() ), newDn );
}
}
catch ( NamingException e )
Modified: directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/SearchHandler.java
URL: http://svn.apache.org/viewcvs/directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/SearchHandler.java?rev=366131&r1=366130&r2=366131&view=diff
==============================================================================
--- directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/SearchHandler.java (original)
+++ directory/branches/DN-refactoring/ldap-protocol/src/main/java/org/apache/ldap/server/protocol/support/SearchHandler.java Thu Jan 5 01:05:00 2006
@@ -41,7 +41,7 @@
import org.apache.ldap.common.message.SearchResponseEntryImpl;
import org.apache.ldap.common.message.SearchResponseReference;
import org.apache.ldap.common.message.SearchResponseReferenceImpl;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.name.LdapDN;
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.ldap.server.configuration.Configuration;
@@ -139,7 +139,7 @@
}
ctx.addToEnvironment( DEREFALIASES_KEY, req.getDerefAliases().getName() );
- list = ( ( ServerLdapContext ) ctx ).search( new LdapName( req.getBase() ), req.getFilter(), controls );
+ list = ( ( ServerLdapContext ) ctx ).search( new LdapDN( req.getBase() ), req.getFilter(), controls );
if( list.hasMore() )
{