directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r992859 - in /directory: apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ apacheds/trunk/server-integ/src/test/java/org/apache/director...
Date Sun, 05 Sep 2010 19:06:19 GMT
Author: kayyagari
Date: Sun Sep  5 19:06:18 2010
New Revision: 992859

URL: http://svn.apache.org/viewvc?rev=992859&view=rev
Log:
o removed the ineffective allowAnonymousAccess flag from the LdapServer and associated configuration
o updated tests

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
    directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif
    directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
Sun Sep  5 19:06:18 2010
@@ -159,9 +159,6 @@ public class LdapServer extends Director
     /** If LDAPS is activated : the certificate password */
     private String certificatePassword;
 
-    /** Whether to allow anonymous access: enabled by default. */
-    private boolean allowAnonymousAccess = true;
-
     /** The extended operation handlers. */
     private final Collection<ExtendedOperationHandler> extendedOperationHandlers =
new ArrayList<ExtendedOperationHandler>();
 
@@ -803,28 +800,6 @@ public class LdapServer extends Director
 
 
     /**
-     * Returns <code>true</code> if anonymous access is allowed.
-     *
-     * @return True if anonymous access is allowed.
-     */
-    public boolean isAllowAnonymousAccess()
-    {
-        return allowAnonymousAccess;
-    }
-
-
-    /**
-     * Sets whether to allow anonymous access or not.
-     *
-     * @param enableAnonymousAccess Set <code>true</code> to allow anonymous
access.
-     */
-    public void setAllowAnonymousAccess( boolean enableAnonymousAccess )
-    {
-        this.allowAnonymousAccess = enableAnonymousAccess;
-    }
-
-
-    /**
      * Sets the maximum size limit in number of entries to return for search.
      *
      * @param maxSizeLimit the maximum number of entries to return for search

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver.ldif?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
(original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
Sun Sep  5 19:06:18 2010
@@ -5,7 +5,6 @@ objectclass: ads-ldapServer
 objectclass: ads-catalogBasedServer
 objectclass: top
 ads-serverid: ldapServer
-ads-ldapserverallowanonymousaccess: false
 ads-ldapServerConfidentialityRequired: false
 ads-ldapservermaxsizelimit: 1000
 ads-ldapservermaxtimelimit: 15000

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
Sun Sep  5 19:06:18 2010
@@ -140,7 +140,6 @@ public class MiscBindIT extends Abstract
     public void revertAnonnymous()
     {
         ldapServer.getDirectoryService().setAllowAnonymousAccess( oldAnnonymousAccess );
-        ldapServer.setAllowAnonymousAccess( oldAnnonymousAccess );
     }
 
     
@@ -154,7 +153,6 @@ public class MiscBindIT extends Abstract
     public void testDisableAnonymousBinds() throws Exception
     {
         ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
-        ldapServer.setAllowAnonymousAccess( false );
         
         // Use the SUN JNDI provider to hit server port and bind as anonymous
         final Hashtable<String, Object> env = new Hashtable<String, Object>();

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
Sun Sep  5 19:06:18 2010
@@ -110,7 +110,6 @@ public class SaslBindIT extends Abstract
         {
             // We have to tell the server that it should accept anonymous
             // auth, because we are reading the rootDSE
-            ldapServer.setAllowAnonymousAccess( true );
             ldapServer.getDirectoryService().setAllowAnonymousAccess( true );
 
             // Point on rootDSE

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
Sun Sep  5 19:06:18 2010
@@ -249,7 +249,6 @@ public class SimpleBindIT extends Abstra
     {
         boolean oldValue = ldapServer.getDirectoryService().isAllowAnonymousAccess();
         ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
-        ldapServer.setAllowAnonymousAccess( false );
 
         Hashtable<String, String> env = new Hashtable<String, String>();
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
@@ -324,7 +323,6 @@ public class SimpleBindIT extends Abstra
         }
 
         ldapServer.getDirectoryService().setAllowAnonymousAccess( oldValue );
-        ldapServer.setAllowAnonymousAccess( oldValue );
     }
 
 

Modified: directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif (original)
+++ directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif Sun Sep 
5 19:06:18 2010
@@ -1636,7 +1636,6 @@ objectclass: top
 m-name: ads-ldapServer
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 m-may: ads-ldapServerConfidentialityRequired
-m-may: ads-ldapServerAllowAnonymousAccess
 m-may: ads-ldapServerMaxSizeLimit
 m-may: ads-ldapServerMaxTimeLimit
 m-may: ads-ldapServerSaslHost

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.300.ldif?rev=992859&r1=992858&r2=992859&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
Sun Sep  5 19:06:18 2010
@@ -12,7 +12,6 @@ objectclass: top
 m-name: ads-ldapServer
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 m-may: ads-ldapServerConfidentialityRequired
-m-may: ads-ldapServerAllowAnonymousAccess
 m-may: ads-ldapServerMaxSizeLimit
 m-may: ads-ldapServerMaxTimeLimit
 m-may: ads-ldapServerSaslHost



Mime
View raw message