You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2010/03/21 21:36:55 UTC
svn commit: r925887 - in /directory/apacheds/trunk:
core-jndi/src/main/java/org/apache/directory/server/core/jndi/
protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/
server-integ/src/test/java/org/apache/directory/server/operations/...
Author: seelmann
Date: Sun Mar 21 20:36:55 2010
New Revision: 925887
URL: http://svn.apache.org/viewvc?rev=925887&view=rev
Log:
Use LdapName from javax.naming.ldap package
Modified:
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
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
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?rev=925887&r1=925886&r2=925887&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Sun Mar 21 20:36:55 2010
@@ -26,6 +26,7 @@ import javax.naming.ConfigurationExcepti
import javax.naming.Context;
import javax.naming.InvalidNameException;
import javax.naming.NamingException;
+import javax.naming.ldap.LdapName;
import javax.naming.spi.InitialContextFactory;
import org.apache.directory.server.core.CoreSession;
@@ -37,8 +38,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
-import com.sun.jndi.ldap.LdapName;
-
/**
* A simplistic implementation of {@link AbstractContextFactory}.
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=925887&r1=925886&r2=925887&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Mar 21 20:36:55 2010
@@ -42,6 +42,7 @@ import javax.naming.directory.SearchCont
import javax.naming.event.EventContext;
import javax.naming.event.NamingListener;
import javax.naming.ldap.Control;
+import javax.naming.ldap.LdapName;
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
@@ -94,8 +95,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.StringTools;
-import com.sun.jndi.ldap.LdapName;
-
/**
* A non-federated abstract Context implementation.
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=925887&r1=925886&r2=925887&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Mar 21 20:36:55 2010
@@ -44,6 +44,7 @@ import javax.naming.directory.SearchCont
import javax.naming.directory.SearchResult;
import javax.naming.event.EventDirContext;
import javax.naming.event.NamingListener;
+import javax.naming.ldap.LdapName;
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
@@ -80,8 +81,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.StringTools;
-import com.sun.jndi.ldap.LdapName;
-
/**
* The DirContext implementation for the Server Side JNDI LDAP provider.
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=925887&r1=925886&r2=925887&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Sun Mar 21 20:36:55 2010
@@ -29,6 +29,7 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.ExtendedRequest;
import javax.naming.ldap.ExtendedResponse;
import javax.naming.ldap.LdapContext;
+import javax.naming.ldap.LdapName;
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.DirectoryService;
@@ -46,8 +47,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.util.StringTools;
-import com.sun.jndi.ldap.LdapName;
-
/**
* An implementation of a JNDI LdapContext.
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=925887&r1=925886&r2=925887&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 Sun Mar 21 20:36:55 2010
@@ -20,6 +20,13 @@
package org.apache.directory.server.dns.store.jndi;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.ldap.LdapName;
+
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.jndi.ServerLdapContext;
@@ -36,14 +43,6 @@ import org.apache.directory.shared.ldap.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jndi.ldap.LdapName;
-
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-
-import java.util.Map;
-import java.util.Set;
-
/**
* A JNDI-backed search strategy implementation. This search strategy builds a catalog
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=925887&r1=925886&r2=925887&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 Sun Mar 21 20:36:55 2010
@@ -24,6 +24,7 @@ package org.apache.directory.server.dns.
import java.util.Set;
import javax.naming.directory.DirContext;
+import javax.naming.ldap.LdapName;
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.DirectoryService;
@@ -38,8 +39,6 @@ import org.apache.directory.server.proto
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
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=925887&r1=925886&r2=925887&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Sun Mar 21 20:36:55 2010
@@ -47,6 +47,7 @@ import javax.naming.directory.SchemaViol
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
+import javax.naming.ldap.LdapName;
import netscape.ldap.LDAPAttribute;
import netscape.ldap.LDAPAttributeSet;
@@ -91,8 +92,6 @@ import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jndi.ldap.LdapName;
-
/**
* Various add scenario tests.