You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/26 14:31:13 UTC
svn commit: r1027506 - in /directory:
apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/
apacheds/branches/apacheds-config/server-config/src/test/resources/
shared/branches/shared-config/ldap-schema/...
Author: elecharny
Date: Tue Oct 26 12:31:13 2010
New Revision: 1027506
URL: http://svn.apache.org/viewvc?rev=1027506&view=rev
Log:
Removed the PasswordPolicy AT from LdapServer OC and also removed the field in the LdapServer Bean
Modified:
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif
directory/shared/branches/shared-config/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/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1027506&r1=1027505&r2=1027506&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Tue Oct 26 12:31:13 2010
@@ -20,9 +20,7 @@
package org.apache.directory.server.config.beans;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
/**
@@ -48,7 +46,7 @@ public class LdapServerBean extends DSBa
private String saslPrincipal;
/** The SASL realms */
- private Set<String> saslRealms = new HashSet<String>();
+ private List<String> saslRealms = new ArrayList<String>();
/** The keystore file */
private String keystoreFile;
@@ -59,9 +57,6 @@ public class LdapServerBean extends DSBa
/** tells if the replication is enabled */
private boolean enableReplProvider;
- /** The PasswordPolicy component */
- private PasswordPolicyBean passwordPolicy;
-
/** The replication consumer Bean */
private ReplConsumerBean replConsumer;
@@ -179,7 +174,7 @@ public class LdapServerBean extends DSBa
/**
* @return the ldapServerSaslRealms
*/
- public Set<String> getLdapServerSaslRealms()
+ public List<String> getLdapServerSaslRealms()
{
return saslRealms;
}
@@ -188,7 +183,7 @@ public class LdapServerBean extends DSBa
/**
* @param ldapServerSaslRealms the ldapServerSaslRealms to set
*/
- public void setLdapServerSaslRealms( Set<String> ldapServerSaslRealms )
+ public void setLdapServerSaslRealms( List<String> ldapServerSaslRealms )
{
this.saslRealms = ldapServerSaslRealms;
}
@@ -339,24 +334,6 @@ public class LdapServerBean extends DSBa
/**
- * @return the pwdPolicy
- */
- public PasswordPolicyBean getPwdPolicy()
- {
- return passwordPolicy;
- }
-
-
- /**
- * @param pwdPolicy the pwdPolicy to set
- */
- public void setPwdPolicy( PasswordPolicyBean pwdPolicy )
- {
- this.passwordPolicy = pwdPolicy;
- }
-
-
- /**
* @return the Replication Consumer Bean
*/
public ReplConsumerBean getReplConsumer()
@@ -440,11 +417,6 @@ public class LdapServerBean extends DSBa
}
}
- if ( passwordPolicy != null )
- {
- sb.append( tabs ).append( passwordPolicy.toString( tabs + " " ) );
- }
-
if ( replConsumer != null )
{
sb.append( tabs ).append( replConsumer.toString( tabs + " " ) );
Modified: directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif?rev=1027506&r1=1027505&r2=1027506&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif Tue Oct 26 12:31:13 2010
@@ -165,32 +165,6 @@ objectclass: top
ads-saslMechName: SIMPLE
ads-enabled: true
-dn: ads-pwdId=test,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-objectclass: top
-objectclass: ads-base
-objectclass: ads-passwordPolicy
-ads-pwdId: test
-ads-pwdAttribute: userPassword
-ads-pwdMinAge: 100
-ads-pwdMaxAge: 200
-ads-pwdInHistory: 5
-ads-pwdCheckQuality: 2
-ads-pwdMinLength: 5
-ads-pwdMaxLength: 32
-ads-pwdExpireWarning: 100
-ads-pwdGraceAuthNLimit: 50
-ads-pwdGraceExpire: 20
-ads-pwdLockout: TRUE
-ads-pwdLockoutDuration: 20
-ads-pwdMaxFailure: 3
-ads-pwdFailureCountInterval: 5
-ads-pwdMustChange: TRUE
-ads-pwdAllowUserChange: TRUE
-ads-pwdSafeModify: FALSE
-ads-pwdMinDelay: 20
-ads-pwdMaxDelay: 200
-ads-pwdMaxIdle: 100
-
dn: ads-replConsumerId=test,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
@@ -227,4 +201,3 @@ ads-replSearchTimeOut: 100
ads-replUserDn: ou=config
ads-replUserPassword: secret
ads-replCookie: abcdef
-
Modified: directory/shared/branches/shared-config/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/branches/shared-config/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=1027506&r1=1027505&r2=1027506&view=diff
==============================================================================
--- directory/shared/branches/shared-config/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/branches/shared-config/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 Tue Oct 26 12:31:13 2010
@@ -24,4 +24,3 @@ m-may: ads-replConsumer
m-may: ads-saslMechHandlers
m-may: ads-extendedOpHandlers
m-may: ads-enableReplProvider
-m-may: ads-passwordPolicy