directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r995748 - in /directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration: editor/v152/dialogs/ editor/v153/dialogs/ editor/v154/dialogs/ editor/v155/dialogs/ editor/v156/dialogs/ e...
Date Fri, 10 Sep 2010 10:57:56 GMT
Author: pamarcelot
Date: Fri Sep 10 10:57:55 2010
New Revision: 995748

URL: http://svn.apache.org/viewvc?rev=995748&view=rev
Log:
Fix for DIRSTUDIO-698 (PasswordPolicy and KeyDerivation interceptors missing in the ApacheDS
Configuration Editor) - Removed the PasswordPolicy interceptor from the UI.

Modified:
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/dialogs/InterceptorDialog.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerXmlIOV155.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerXmlIOV156.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -210,10 +210,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -210,10 +210,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -206,10 +206,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -206,10 +206,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -206,10 +206,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/dialogs/InterceptorDialog.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/dialogs/InterceptorDialog.java
Fri Sep 10 10:57:55 2010
@@ -206,10 +206,6 @@ public class InterceptorDialog extends D
         {
             availableInterceptors.add( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.PASSWORD_POLICY ) )
-        {
-            availableInterceptors.add( InterceptorEnum.PASSWORD_POLICY );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.KEY_DERIVATION ) )
         {
             availableInterceptors.add( InterceptorEnum.KEY_DERIVATION );

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -58,10 +58,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-            .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
             .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
Fri Sep 10 10:57:55 2010
@@ -115,7 +115,6 @@ public class ServerXmlIOV152 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
     private static final String ELEMENT_REF = "ref"; //$NON-NLS-1$
     private static final String ELEMENT_REFERRAL_INTERCEPTOR = "referralInterceptor"; //$NON-NLS-1$
@@ -747,11 +746,6 @@ public class ServerXmlIOV152 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV152.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV152.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1734,9 +1728,6 @@ public class ServerXmlIOV152 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV152.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV152.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV152.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -55,10 +55,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-        .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
         .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
Fri Sep 10 10:57:55 2010
@@ -121,7 +121,6 @@ public class ServerXmlIOV153 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
     private static final String ELEMENT_REF = "ref"; //$NON-NLS-1$
     private static final String ELEMENT_REFERRAL_INTERCEPTOR = "referralInterceptor"; //$NON-NLS-1$
@@ -761,11 +760,6 @@ public class ServerXmlIOV153 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV153.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV153.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1791,9 +1785,6 @@ public class ServerXmlIOV153 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV153.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV153.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV153.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -51,10 +51,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-        .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
         .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
Fri Sep 10 10:57:55 2010
@@ -112,7 +112,6 @@ public class ServerXmlIOV154 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
     private static final String ELEMENT_REPLICATION_INTERCEPTOR = "replicationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_SASL_MECHANISM_HANDLERS = "saslMechanismHandlers";
//$NON-NLS-1$
@@ -623,11 +622,6 @@ public class ServerXmlIOV154 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV154.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV154.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1561,9 +1555,6 @@ public class ServerXmlIOV154 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV154.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV154.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV154.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -55,10 +55,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-        .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
         .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerXmlIOV155.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerXmlIOV155.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerXmlIOV155.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerXmlIOV155.java
Fri Sep 10 10:57:55 2010
@@ -106,7 +106,6 @@ public class ServerXmlIOV155 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_REFERRAL_INTERCEPTOR = "referralInterceptor"; //$NON-NLS-1$
     private static final String ELEMENT_REPLICATION_INTERCEPTOR = "replicationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_SASL_MECHANISM_HANDLERS = "saslMechanismHandlers";
//$NON-NLS-1$
@@ -586,11 +585,6 @@ public class ServerXmlIOV155 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV155.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV155.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1435,9 +1429,6 @@ public class ServerXmlIOV155 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV155.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV155.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV155.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -55,10 +55,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-        .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
         .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerXmlIOV156.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerXmlIOV156.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerXmlIOV156.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerXmlIOV156.java
Fri Sep 10 10:57:55 2010
@@ -106,7 +106,6 @@ public class ServerXmlIOV156 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_REFERRAL_INTERCEPTOR = "referralInterceptor"; //$NON-NLS-1$
     private static final String ELEMENT_REPLICATION_INTERCEPTOR = "replicationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_SASL_MECHANISM_HANDLERS = "saslMechanismHandlers";
//$NON-NLS-1$
@@ -586,11 +585,6 @@ public class ServerXmlIOV156 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV156.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV156.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1435,9 +1429,6 @@ public class ServerXmlIOV156 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
Fri Sep 10 10:57:55 2010
@@ -55,10 +55,6 @@ public enum InterceptorEnum
     OPERATIONAL_ATTRIBUTE(
         Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString(
"InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Password Policy Interceptor */
-    PASSWORD_POLICY(Messages.getString( "InterceptorEnum.PasswordPolicy" ), Messages
-        .getString( "InterceptorEnum.PasswordPolicyDescription" )),
-
     /** The KeyDerivation Interceptor */
     KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
         .getString( "InterceptorEnum.KeyDerivationDescription" )),

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java
Fri Sep 10 10:57:55 2010
@@ -106,7 +106,6 @@ public class ServerXmlIOV157 extends Abs
     private static final String ELEMENT_NTP_SERVER = "ntpServer"; //$NON-NLS-1$
     private static final String ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR = "operationalAttributeInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_PARTITIONS = "partitions"; //$NON-NLS-1$
-    private static final String ELEMENT_PASSWORD_POLICY_INTERCEPTOR = "passwordPolicyInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_REFERRAL_INTERCEPTOR = "referralInterceptor"; //$NON-NLS-1$
     private static final String ELEMENT_REPLICATION_INTERCEPTOR = "replicationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_SASL_MECHANISM_HANDLERS = "saslMechanismHandlers";
//$NON-NLS-1$
@@ -586,11 +585,6 @@ public class ServerXmlIOV157 extends Abs
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE
);
                 }
-                else if ( ServerXmlIOV157.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
-                    .equalsIgnoreCase( interceptorElementName ) )
-                {
-                    serverConfiguration.addInterceptor( InterceptorEnum.PASSWORD_POLICY );
-                }
                 else if ( ServerXmlIOV157.ELEMENT_KEY_DERIVATION_INTERCEPTOR
                     .equalsIgnoreCase( interceptorElementName ) )
                 {
@@ -1435,9 +1429,6 @@ public class ServerXmlIOV157 extends Abs
                 case OPERATIONAL_ATTRIBUTE:
                     interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
                     break;
-                case PASSWORD_POLICY:
-                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_PASSWORD_POLICY_INTERCEPTOR
);
-                    break;
                 case KEY_DERIVATION:
                     interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_KEY_DERIVATION_INTERCEPTOR
);
                     break;

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties?rev=995748&r1=995747&r2=995748&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
Fri Sep 10 10:57:55 2010
@@ -40,8 +40,6 @@ InterceptorEnum.Normalization=Normalizat
 InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor
makes sure all relative and distinguished names are normalized before calls are made against
the respective interface methods on PartitionNexus.
 InterceptorEnum.OperationalAttribute=Operational Attribute
 InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the
default attributes of entries. There are four default attributes for now; 'creatorsName',
'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.PasswordPolicy=Password Policy
-InterceptorEnum.PasswordPolicyDescription=An interceptor that enforces password policy for
users
 InterceptorEnum.Referral=Referral
 InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling
behaviors.  It manages  referral handling behavior when the Context\#REFERRAL is implicitly
or explicitly set to "ignore", when set to "throw" and when set to "follow".
 InterceptorEnum.Replication=Replication



Mime
View raw message