Refactored embedded LDAP server tests to make use of new namespace configuration. Use Junit 4 annotations in preference to AbstractDependencyInjectionSpringContextTests so that it is possible to clear up the context after each class is run rather than at JVM shutdown (causes problems with running embedded apache DS).

2026-08-06 02:08:01 +00:00 · 2007-10-02 10:52:06 +00:00
parent 77b6503e2e
commit acb02246e0
24 changed files with 272 additions and 572 deletions
@@ -48,7 +48,7 @@ import javax.naming.directory.InitialDirContext;
 * <tt>DirContext</tt> references.
 * <p>
 * The directory location is configured using by setting the constructor argument
- * <tt>providerUrl</tt>. This should be in the form <tt>ldap://monkeymachine.co.uk:389/dc=acegisecurity,dc=org</tt>.
+ * <tt>providerUrl</tt>. This should be in the form <tt>ldap://monkeymachine.co.uk:389/dc=springframework,dc=org</tt>.
 * The Sun JNDI provider also supports lists of space-separated URLs, each of which will be tried in turn until a
 * connection is obtained.
 * </p>
@@ -226,8 +226,8 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory

    /**
     * Returns the root DN of the configured provider URL. For example, if the URL is
-     * <tt>ldap://monkeymachine.co.uk:389/dc=acegisecurity,dc=org</tt> the value will be
-     * <tt>dc=acegisecurity,dc=org</tt>.
+     * <tt>ldap://monkeymachine.co.uk:389/dc=springframework,dc=org</tt> the value will be
+     * <tt>dc=springframework,dc=org</tt>.
     *
     * @return the root DN calculated from the path of the LDAP url.
     */
@@ -62,8 +62,8 @@ public final class LdapUtils {

    /**
     * Obtains the part of a DN relative to a supplied base context.
-     * <p>If the DN is "cn=bob,ou=people,dc=acegisecurity,dc=org" and the base context name is
-     * "ou=people,dc=acegisecurity,dc=org" it would return "cn=bob".
+     * <p>If the DN is "cn=bob,ou=people,dc=springframework,dc=org" and the base context name is
+     * "ou=people,dc=springframework,dc=org" it would return "cn=bob".
     * </p>
     *
     * @param fullDn the DN
@@ -144,7 +144,7 @@ public final class LdapUtils {

    /**
     * Works out the root DN for an LDAP URL.<p>For example, the URL
-     * <tt>ldap://monkeymachine:11389/dc=acegisecurity,dc=org</tt> has the root DN "dc=acegisecurity,dc=org".</p>
+     * <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt> has the root DN "dc=springframework,dc=org".</p>
     *
     * @param url the LDAP URL
     *
@@ -185,7 +185,7 @@ public final class LdapUtils {
    // removed for 1.3 compatibility
    /**
     * Parses the supplied LDAP URL.
-     * @param url the URL (e.g. <tt>ldap://monkeymachine:11389/dc=acegisecurity,dc=org</tt>).
+     * @param url the URL (e.g. <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt>).
     * @return the URI object created from the URL
     * @throws IllegalArgumentException if the URL is null, empty or the URI syntax is invalid.
     */
@@ -73,8 +73,8 @@ import org.springframework.ldap.core.DirContextOperations;
 * A simple configuration might be as follows:
 * <pre>
 *    &lt;bean id="initialDirContextFactory" class="org.springframework.security.providers.ldap.DefaultInitialDirContextFactory">
- *      &lt;constructor-arg value="ldap://monkeymachine:389/dc=acegisecurity,dc=org"/>
- *      &lt;property name="managerDn">&lt;value>cn=manager,dc=acegisecurity,dc=org&lt;/value>&lt;/property>
+ *      &lt;constructor-arg value="ldap://monkeymachine:389/dc=springframework,dc=org"/>
+ *      &lt;property name="managerDn">&lt;value>cn=manager,dc=springframework,dc=org&lt;/value>&lt;/property>
 *      &lt;property name="managerPassword">&lt;value>password&lt;/value>&lt;/property>
 *    &lt;/bean>
 *
@@ -95,10 +95,10 @@ import org.springframework.ldap.core.DirContextOperations;
 *    &lt;/bean></pre>
 *
 * <p>This would set up the provider to access an LDAP server with URL
- * <tt>ldap://monkeymachine:389/dc=acegisecurity,dc=org</tt>. Authentication will be performed by attempting to bind
- * with the DN <tt>uid=&lt;user-login-name&gt;,ou=people,dc=acegisecurity,dc=org</tt>. After successful
+ * <tt>ldap://monkeymachine:389/dc=springframework,dc=org</tt>. Authentication will be performed by attempting to bind
+ * with the DN <tt>uid=&lt;user-login-name&gt;,ou=people,dc=springframework,dc=org</tt>. After successful
 * authentication, roles will be assigned to the user by searching under the DN
- * <tt>ou=groups,dc=acegisecurity,dc=org</tt> with the default filter <tt>(member=&lt;user's-DN&gt;)</tt>. The role
+ * <tt>ou=groups,dc=springframework,dc=org</tt> with the default filter <tt>(member=&lt;user's-DN&gt;)</tt>. The role
 * name will be taken from the "ou" attribute of each match.</p>
 * <p>
 * The authenticate method will reject empty passwords outright. LDAP servers may allow an anonymous
@@ -45,13 +45,13 @@ import javax.naming.directory.SearchControls;
 * A typical group search scenario would be where each group/role is specified using the <tt>groupOfNames</tt>
 * (or <tt>groupOfUniqueNames</tt>) LDAP objectClass and the user's DN is listed in the <tt>member</tt> (or
 * <tt>uniqueMember</tt>) attribute to indicate that they should be assigned that role. The following LDIF sample has
- * the groups stored under the DN <tt>ou=groups,dc=acegisecurity,dc=org</tt> and a group called "developers" with
+ * the groups stored under the DN <tt>ou=groups,dc=springframework,dc=org</tt> and a group called "developers" with
 * "ben" and "marissa" as members:
 * <pre>
- * dn: ou=groups,dc=acegisecurity,dc=orgobjectClass: top
- * objectClass: organizationalUnitou: groupsdn: cn=developers,ou=groups,dc=acegisecurity,dc=org
+ * dn: ou=groups,dc=springframework,dc=orgobjectClass: top
+ * objectClass: organizationalUnitou: groupsdn: cn=developers,ou=groups,dc=springframework,dc=org
 * objectClass: groupOfNamesobjectClass: topcn: developersdescription: Acegi Security Developers
- * member: uid=ben,ou=people,dc=acegisecurity,dc=orgmember: uid=marissa,ou=people,dc=acegisecurity,dc=orgou: developer
+ * member: uid=ben,ou=people,dc=springframework,dc=orgmember: uid=marissa,ou=people,dc=springframework,dc=orgou: developer
 * </pre>
 * </p>
 * <p/>
@@ -75,7 +75,7 @@ import javax.naming.directory.SearchControls;
 *   &lt;property name="convertToUpperCase">&lt;value>true&lt;/value>&lt;/property>
 * &lt;/bean>
 * </pre>
- * A search for roles for user "uid=ben,ou=people,dc=acegisecurity,dc=org" would return the single granted authority
+ * A search for roles for user "uid=ben,ou=people,dc=springframework,dc=org" would return the single granted authority
 * "ROLE_DEVELOPER".
 * </p>
 * <p/>