o Added the searchBaseDN configuration element in the server annotations
o Cleaned up the SASL PLAIN test
diff --git a/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SaslBindRequestTest.java b/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SaslBindRequestTest.java
index 3081375..11d899a 100644
--- a/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SaslBindRequestTest.java
+++ b/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SaslBindRequestTest.java
@@ -30,23 +30,12 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import javax.net.ssl.TrustManagerFactory;
-import javax.security.auth.login.Configuration;
-
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
-import org.apache.directory.api.ldap.model.cursor.CursorException;
-import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.BindResponse;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.api.util.Network;
import org.apache.directory.ldap.client.api.LdapAsyncConnection;
-import org.apache.directory.ldap.client.api.LdapConnectionConfig;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
-import org.apache.directory.ldap.client.api.SaslGssApiRequest;
import org.apache.directory.ldap.client.api.SaslPlainRequest;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
@@ -102,18 +91,13 @@
{
@CreateTransport(protocol = "LDAP"),
@CreateTransport(protocol = "LDAPS")
- }
+ },
+ searchBaseDn = "ou=users,ou=system"
)
@ApplyLdifs(
{
// Entry # 1
- "dn: ou=users,dc=example,dc=com",
- "objectClass: organizationalUnit",
- "objectClass: top",
- "ou: users",
- "",
-
- "dn: uid=superuser,ou=users,dc=example,dc=com",
+ "dn: uid=superuser,ou=users,ou=system",
"objectClass: person",
"objectClass: organizationalPerson",
"objectClass: inetOrgPerson",
@@ -125,7 +109,7 @@
"userPassword: test",
"",
// Entry # 2
- "dn: uid=superuser2,ou=users,dc=example,dc=com",
+ "dn: uid=superuser2,ou=users,ou=system",
"objectClass: person",
"objectClass: organizationalPerson",
"objectClass: inetOrgPerson",
diff --git a/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java b/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
index 2492190..9347ff6 100644
--- a/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
+++ b/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
@@ -113,4 +113,7 @@
* @return The trust manager classes
*/
Class<?>[] trustManagers() default {};
+
+ /** The DN from which searches for users will be done */
+ String searchBaseDn() default "ou=users,ou=system";
}
\ No newline at end of file
diff --git a/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java b/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
index fce9df7..0d3aa46 100644
--- a/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
+++ b/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
@@ -237,6 +237,9 @@
ldapServer.setMaxSizeLimit( createLdapServer.maxSizeLimit() );
ldapServer.setMaxTimeLimit( createLdapServer.maxTimeLimit() );
+ // Set the searchBaseDN
+ ldapServer.setSearchBaseDn( createLdapServer.searchBaseDn() );
+
return ldapServer;
}
else
