directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r924273 - in /directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi: MultiBaseSearch.java SingleBaseSearch.java
Date Wed, 17 Mar 2010 13:17:02 GMT
Author: elecharny
Date: Wed Mar 17 13:17:02 2010
New Revision: 924273

URL: http://svn.apache.org/viewvc?rev=924273&view=rev
Log:
Fixed Exceptions

Modified:
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java?rev=924273&r1=924272&r2=924273&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
(original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
Wed Mar 17 13:17:02 2010
@@ -33,10 +33,11 @@ import org.apache.directory.server.proto
 import org.apache.directory.server.protocol.shared.catalog.Catalog;
 import org.apache.directory.server.protocol.shared.catalog.GetCatalog;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
-import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.sun.jndi.ldap.LdapName;
+
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 
@@ -85,7 +86,7 @@ public class MultiBaseSearch implements 
             GetRecords getRecords = new GetRecords( question );
             String baseDn = catalog.getBaseDn( question.getDomainName() );
             CoreSession session = directoryService.getSession();
-            DirContext dirContext = new ServerLdapContext( directoryService, session, new
DN( baseDn ) );
+            DirContext dirContext = new ServerLdapContext( directoryService, session, new
LdapName( baseDn ) );
             return getRecords.execute( dirContext, null );
         }
         catch ( LdapNoSuchObjectException lnnfe )

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java?rev=924273&r1=924272&r2=924273&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java
(original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java
Wed Mar 17 13:17:02 2010
@@ -35,10 +35,11 @@ import org.apache.directory.server.dns.m
 import org.apache.directory.server.dns.store.jndi.operations.GetRecords;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
-import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.sun.jndi.ldap.LdapName;
+
 
 /**
  * A JNDI-backed search strategy implementation.  This search strategy searches a
@@ -62,7 +63,7 @@ public class SingleBaseSearch implements
         try
         {
             CoreSession session = directoryService.getSession();
-            ctx = new ServerLdapContext( directoryService, session, new DN( searchBaseDn
) );
+            ctx = new ServerLdapContext( directoryService, session, new LdapName( searchBaseDn
) );
         } catch ( Exception e )
         {
             throw new ServiceConfigurationException( I18n.err( I18n.ERR_649, searchBaseDn
), e );



Mime
View raw message