directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1028977 - in /directory/apacheds/branches/apacheds-config/server-config/src/main/java: ./ org/apache/directory/server/config/ org/apache/directory/server/config/beans/
Date Sat, 30 Oct 2010 02:34:20 GMT
Author: elecharny
Date: Sat Oct 30 02:34:20 2010
New Revision: 1028977

URL: http://svn.apache.org/viewvc?rev=1028977&view=rev
Log:
Merged the trunk modifications into the branch

Modified:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/   (props changed)
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
  (props changed)
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java

Propchange: directory/apacheds/branches/apacheds-config/server-config/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 30 02:34:20 2010
@@ -0,0 +1,3 @@
+/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java:982369-987590
+/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/main/java:980138-980938
+/directory/apacheds/trunk/server-config/src/main/java:1023440-1028958

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java?rev=1028977&r1=1028976&r2=1028977&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
Sat Oct 30 02:34:20 2010
@@ -56,8 +56,7 @@ import org.apache.directory.server.confi
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.InstanceLayout;
-import org.apache.directory.server.core.authn.AuthenticationInterceptor;
-import org.apache.directory.server.core.authn.PasswordPolicyConfiguration;
+import org.apache.directory.server.core.PasswordPolicyConfiguration;
 import org.apache.directory.server.core.changelog.ChangeLog;
 import org.apache.directory.server.core.changelog.DefaultChangeLog;
 import org.apache.directory.server.core.interceptor.Interceptor;
@@ -180,7 +179,6 @@ public class ConfigBuilder
         passwordPolicy.setPwdAllowUserChange( passwordPolicyBean.isPwdAllowUserChange() );
         passwordPolicy.setPwdAttribute( passwordPolicyBean.getPwdAttribute() );
         passwordPolicy.setPwdCheckQuality( passwordPolicyBean.getPwdCheckQuality() );
-        passwordPolicy.setPwdEnabled( passwordPolicyBean.isEnabled() );
         passwordPolicy.setPwdExpireWarning( passwordPolicyBean.getPwdExpireWarning() );
         passwordPolicy.setPwdFailureCountInterval( passwordPolicyBean.getPwdFailureCountInterval()
);
         passwordPolicy.setPwdGraceAuthNLimit( passwordPolicyBean.getPwdGraceAuthNLimit()
);
@@ -1041,15 +1039,6 @@ public class ConfigBuilder
         List<Interceptor> interceptors = createInterceptors( directoryServiceBean.getInterceptors()
);
         directoryService.setInterceptors( interceptors );
         
-        // PasswordPolicy
-        PasswordPolicyConfiguration passwordPolicy = createPwdPolicyConfig( directoryServiceBean.getPasswordPolicy()
);
-        
-        if ( passwordPolicy != null )
-        {
-            AuthenticationInterceptor authnInterceptor = ( AuthenticationInterceptor ) directoryService.getInterceptor(
AuthenticationInterceptor.class.getName() );
-            authnInterceptor.setPwdPolicyConfig( passwordPolicy );
-        }
-
         // Partitions
         Map<String, Partition> partitions = createPartitions( directoryService, directoryServiceBean.getPartitions()
);
 

Propchange: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:34:20 2010
@@ -4,3 +4,4 @@
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1023440-1028958

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1028977&r1=1028976&r2=1028977&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
Sat Oct 30 02:34:20 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.conf
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * A class used to store the DirectoryService configuration.
  *



Mime
View raw message