directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r995726 [2/2] - 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/dial...
Date Fri, 10 Sep 2010 09:54:29 GMT
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=995726&r1=995725&r2=995726&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 09:54:28 2010
@@ -98,6 +98,7 @@ public class ServerXmlIOV156 extends Abs
     private static final String ELEMENT_JDBM_INDEX = "jdbmIndex"; //$NON-NLS-1$
     private static final String ELEMENT_JDBM_PARTITION = "jdbmPartition"; //$NON-NLS-1$
     private static final String ELEMENT_KDC_SERVER = "kdcServer"; //$NON-NLS-1$
+    private static final String ELEMENT_KEY_DERIVATION_INTERCEPTOR = "keyDerivationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_LAUNCH_DIAGNOSTIC_UI_HANDLER = "launchDiagnosticUiHandler";
//$NON-NLS-1$
     private static final String ELEMENT_LDAP_SERVER = "ldapServer"; //$NON-NLS-1$
     private static final String ELEMENT_NORMALIZATION_INTERCEPTOR = "normalizationInterceptor";
//$NON-NLS-1$
@@ -105,6 +106,7 @@ 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$
@@ -584,6 +586,16 @@ 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 ) )
+                {
+                    serverConfiguration.addInterceptor( InterceptorEnum.KEY_DERIVATION );
+                }
                 else if ( ServerXmlIOV156.ELEMENT_SCHEMA_INTERCEPTOR.equalsIgnoreCase( interceptorElementName
) )
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.SCHEMA );
@@ -1398,58 +1410,57 @@ public class ServerXmlIOV156 extends Abs
     {
         List<InterceptorEnum> interceptors = serverConfiguration.getInterceptors();
 
-        if ( interceptors.contains( InterceptorEnum.NORMALIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_NORMALIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.AUTHENTICATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_AUTHENTICATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.REFERRAL ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_REFERRAL_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.ACI_AUTHORIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_ACI_AUTHORIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.DEFAULT_AUTHORIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_DEFAULT_AUTHORIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.EXCEPTION ) )
+        for ( InterceptorEnum interceptor : interceptors )
         {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_EXCEPTION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.OPERATIONAL_ATTRIBUTE ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.SCHEMA ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_SCHEMA_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.SUBENTRY ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_SUBENTRY_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.COLLECTIVE_ATTRIBUTE ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_COLLECTIVE_ATTRIBUTE_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.EVENT ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_EVENT_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.TRIGGER ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_TRIGGER_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.REPLICATION ) )
-        {
-            // TODO support replication interceptor
-            //            interceptorsElement.addElement( "replicationInterceptor" );
+            switch ( interceptor )
+            {
+                case NORMALIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_NORMALIZATION_INTERCEPTOR
);
+                    break;
+                case AUTHENTICATION:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_AUTHENTICATION_INTERCEPTOR
);
+                    break;
+                case REFERRAL:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_REFERRAL_INTERCEPTOR
);
+                    break;
+                case ACI_AUTHORIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_ACI_AUTHORIZATION_INTERCEPTOR
);
+                    break;
+                case DEFAULT_AUTHORIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_DEFAULT_AUTHORIZATION_INTERCEPTOR
);
+                    break;
+                case EXCEPTION:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_EXCEPTION_INTERCEPTOR
);
+                    break;
+                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;
+                case SCHEMA:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_SCHEMA_INTERCEPTOR
);
+                    break;
+                case SUBENTRY:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_SUBENTRY_INTERCEPTOR
);
+                    break;
+                case COLLECTIVE_ATTRIBUTE:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_COLLECTIVE_ATTRIBUTE_INTERCEPTOR
);
+                    break;
+                case EVENT:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_EVENT_INTERCEPTOR
);
+                    break;
+                case TRIGGER:
+                    interceptorsElement.addElement( ServerXmlIOV156.ELEMENT_TRIGGER_INTERCEPTOR
);
+                    break;
+                case REPLICATION:
+                    // TODO support replication interceptor
+                    //            interceptorsElement.addElement( "replicationInterceptor"
);
+                    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=995726&r1=995725&r2=995726&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 09:54:28 2010
@@ -21,6 +21,7 @@ ExtendedOperationEnum.Shutdown=Graceful 
 ExtendedOperationEnum.ShutdownDescription=The Graceful Shutdown TLS extended operation allows
an application to gracefully manage server's that must go offline or shutdown with proper
notification to bound clients.
 ExtendedOperationEnum.StartTLS=Start TLS
 ExtendedOperationEnum.StartTLSDescription=The Start TLS extended operation allows an application
to serialize secure and plain requests against an LDAP server on a single connection.
+
 InterceptorEnum.ACIAuthorization=ACI Authorization
 InterceptorEnum.ACIAuthorizationDescription=An ACI based authorization interceptor.
 InterceptorEnum.Authentication=Authentication
@@ -33,10 +34,14 @@ InterceptorEnum.Event=Event
 InterceptorEnum.EventDescription=An interceptor based serivice for notifying NamingListeners
of EventContext and EventDirContext changes.
 InterceptorEnum.Exception=Exception
 InterceptorEnum.ExceptionDescription=An interceptor that detects any operations that breaks
integrity of Partition and terminates the current invocation chain by throwing a NamingException.
Those operations include when an entry already exists at a DN and is added once again to the
same DN.
+InterceptorEnum.KeyDerivation=Key Derivation
+InterceptorEnum.KeyDerivationDescription=An interceptor that creates symmetric Kerberos keys
for users.  When a 'userPassword' is added or modified, the 'userPassword' and 'krb5PrincipalName'
are used to derive Kerberos keys.  If the 'userPassword' is the special keyword 'randomKey',
a random key is generated and used as the Kerberos key.
 InterceptorEnum.Normalization=Normalization
 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
@@ -47,9 +52,11 @@ InterceptorEnum.SubEntry=Sub-Entry
 InterceptorEnum.SubEntryDescription=The sub-entry interceptor service which is responsible
for filtering out sub-entries on search operations and injecting operational attributes.
 InterceptorEnum.Trigger=Trigger
 InterceptorEnum.TriggerDescription=The trigger interceptor based on the Trigger Specification.
+
 SaslQualityOfProtectionEnum.AuthenticationOnly=auth (Authentication only)
 SaslQualityOfProtectionEnum.AuthenticationWithIntegrityAndPrivacyProtection=auth-conf (Authentication
with integrity and privacy protection)
 SaslQualityOfProtectionEnum.AuthenticationWithIntegrityProtection=auth-int (Authentication
with integrity protection)
+
 ServerXmlIOV156.ErrorAccessControlEnabled=Unable to find the 'accessControlEnabled' attribute
for the default directory service bean.
 ServerXmlIOV156.ErrorAllowAnonymousAccess=Unable to find the 'allowAnonymousAccess' attribute
for the 'ldapService' bean.
 ServerXmlIOV156.ErrorCacheSize=Unable to find the 'cacheSize' attribute for a partition.

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=995726&r1=995725&r2=995726&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 09:54:28 2010
@@ -35,7 +35,7 @@ public enum InterceptorEnum
     AUTHENTICATION(
         Messages.getString( "InterceptorEnum.Authentication" ), Messages.getString( "InterceptorEnum.AuthenticationDescription"
)), //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** The Authentication Interceptor */
+    /** The Referral Interceptor */
     REFERRAL(
         Messages.getString( "InterceptorEnum.Referral" ), Messages.getString( "InterceptorEnum.ReferralDescription"
)), //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -55,6 +55,14 @@ 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" )),
+
     /** The Schema Interceptor */
     SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription"
)), //$NON-NLS-1$ //$NON-NLS-2$
 

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/Messages.java?rev=995726&r1=995725&r2=995726&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/Messages.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/Messages.java
Fri Sep 10 09:54:28 2010
@@ -26,7 +26,7 @@ import java.util.ResourceBundle;
 
 public class Messages
 {
-    private static final String BUNDLE_NAME = "org.apache.directory.studio.apacheds.configuration.model.v156.messages";
//$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.apache.directory.studio.apacheds.configuration.model.v157.messages";
//$NON-NLS-1$
 
     private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME
);
 

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=995726&r1=995725&r2=995726&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 09:54:28 2010
@@ -98,6 +98,7 @@ public class ServerXmlIOV157 extends Abs
     private static final String ELEMENT_JDBM_INDEX = "jdbmIndex"; //$NON-NLS-1$
     private static final String ELEMENT_JDBM_PARTITION = "jdbmPartition"; //$NON-NLS-1$
     private static final String ELEMENT_KDC_SERVER = "kdcServer"; //$NON-NLS-1$
+    private static final String ELEMENT_KEY_DERIVATION_INTERCEPTOR = "keyDerivationInterceptor";
//$NON-NLS-1$
     private static final String ELEMENT_LAUNCH_DIAGNOSTIC_UI_HANDLER = "launchDiagnosticUiHandler";
//$NON-NLS-1$
     private static final String ELEMENT_LDAP_SERVER = "ldapServer"; //$NON-NLS-1$
     private static final String ELEMENT_NORMALIZATION_INTERCEPTOR = "normalizationInterceptor";
//$NON-NLS-1$
@@ -105,6 +106,7 @@ 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$
@@ -584,6 +586,16 @@ 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 ) )
+                {
+                    serverConfiguration.addInterceptor( InterceptorEnum.KEY_DERIVATION );
+                }
                 else if ( ServerXmlIOV157.ELEMENT_SCHEMA_INTERCEPTOR.equalsIgnoreCase( interceptorElementName
) )
                 {
                     serverConfiguration.addInterceptor( InterceptorEnum.SCHEMA );
@@ -1397,59 +1409,58 @@ public class ServerXmlIOV157 extends Abs
     private void createInterceptors( Element interceptorsElement, ServerConfigurationV157
serverConfiguration )
     {
         List<InterceptorEnum> interceptors = serverConfiguration.getInterceptors();
-
-        if ( interceptors.contains( InterceptorEnum.NORMALIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_NORMALIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.AUTHENTICATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_AUTHENTICATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.REFERRAL ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_REFERRAL_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.ACI_AUTHORIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_ACI_AUTHORIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.DEFAULT_AUTHORIZATION ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_DEFAULT_AUTHORIZATION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.EXCEPTION ) )
+        
+        for ( InterceptorEnum interceptor : interceptors )
         {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_EXCEPTION_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.OPERATIONAL_ATTRIBUTE ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_OPERATIONAL_ATTRIBUTE_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.SCHEMA ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_SCHEMA_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.SUBENTRY ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_SUBENTRY_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.COLLECTIVE_ATTRIBUTE ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_COLLECTIVE_ATTRIBUTE_INTERCEPTOR
);
-        }
-        if ( interceptors.contains( InterceptorEnum.EVENT ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_EVENT_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.TRIGGER ) )
-        {
-            interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_TRIGGER_INTERCEPTOR );
-        }
-        if ( interceptors.contains( InterceptorEnum.REPLICATION ) )
-        {
-            // TODO support replication interceptor
-            //            interceptorsElement.addElement( "replicationInterceptor" );
+            switch ( interceptor )
+            {
+                case NORMALIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_NORMALIZATION_INTERCEPTOR
);
+                    break;
+                case AUTHENTICATION:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_AUTHENTICATION_INTERCEPTOR
);
+                    break;
+                case REFERRAL:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_REFERRAL_INTERCEPTOR
);
+                    break;
+                case ACI_AUTHORIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_ACI_AUTHORIZATION_INTERCEPTOR
);
+                    break;
+                case DEFAULT_AUTHORIZATION:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_DEFAULT_AUTHORIZATION_INTERCEPTOR
);
+                    break;
+                case EXCEPTION:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_EXCEPTION_INTERCEPTOR
);
+                    break;
+                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;
+                case SCHEMA:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_SCHEMA_INTERCEPTOR
);
+                    break;
+                case SUBENTRY:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_SUBENTRY_INTERCEPTOR
);
+                    break;
+                case COLLECTIVE_ATTRIBUTE:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_COLLECTIVE_ATTRIBUTE_INTERCEPTOR
);
+                    break;
+                case EVENT:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_EVENT_INTERCEPTOR
);
+                    break;
+                case TRIGGER:
+                    interceptorsElement.addElement( ServerXmlIOV157.ELEMENT_TRIGGER_INTERCEPTOR
);
+                    break;
+                case REPLICATION:
+                    // TODO support replication interceptor
+                    //            interceptorsElement.addElement( "replicationInterceptor"
);
+                    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=995726&r1=995725&r2=995726&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 09:54:28 2010
@@ -21,6 +21,7 @@ ExtendedOperationEnum.Shutdown=Graceful 
 ExtendedOperationEnum.ShutdownDescription=The Graceful Shutdown TLS extended operation allows
an application to gracefully manage server's that must go offline or shutdown with proper
notification to bound clients.
 ExtendedOperationEnum.StartTLS=Start TLS
 ExtendedOperationEnum.StartTLSDescription=The Start TLS extended operation allows an application
to serialize secure and plain requests against an LDAP server on a single connection.
+
 InterceptorEnum.ACIAuthorization=ACI Authorization
 InterceptorEnum.ACIAuthorizationDescription=An ACI based authorization interceptor.
 InterceptorEnum.Authentication=Authentication
@@ -33,10 +34,14 @@ InterceptorEnum.Event=Event
 InterceptorEnum.EventDescription=An interceptor based serivice for notifying NamingListeners
of EventContext and EventDirContext changes.
 InterceptorEnum.Exception=Exception
 InterceptorEnum.ExceptionDescription=An interceptor that detects any operations that breaks
integrity of Partition and terminates the current invocation chain by throwing a NamingException.
Those operations include when an entry already exists at a DN and is added once again to the
same DN.
+InterceptorEnum.KeyDerivation=Key Derivation
+InterceptorEnum.KeyDerivationDescription=An interceptor that creates symmetric Kerberos keys
for users.  When a 'userPassword' is added or modified, the 'userPassword' and 'krb5PrincipalName'
are used to derive Kerberos keys.  If the 'userPassword' is the special keyword 'randomKey',
a random key is generated and used as the Kerberos key.
 InterceptorEnum.Normalization=Normalization
 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
@@ -47,32 +52,34 @@ InterceptorEnum.SubEntry=Sub-Entry
 InterceptorEnum.SubEntryDescription=The sub-entry interceptor service which is responsible
for filtering out sub-entries on search operations and injecting operational attributes.
 InterceptorEnum.Trigger=Trigger
 InterceptorEnum.TriggerDescription=The trigger interceptor based on the Trigger Specification.
+
 SaslQualityOfProtectionEnum.AuthenticationOnly=auth (Authentication only)
 SaslQualityOfProtectionEnum.AuthenticationWithIntegrityAndPrivacyProtection=auth-conf (Authentication
with integrity and privacy protection)
 SaslQualityOfProtectionEnum.AuthenticationWithIntegrityProtection=auth-int (Authentication
with integrity protection)
-ServerXmlIOV156.ErrorAccessControlEnabled=Unable to find the 'accessControlEnabled' attribute
for the default directory service bean.
-ServerXmlIOV156.ErrorAllowAnonymousAccess=Unable to find the 'allowAnonymousAccess' attribute
for the 'ldapService' bean.
-ServerXmlIOV156.ErrorCacheSize=Unable to find the 'cacheSize' attribute for a partition.
-ServerXmlIOV156.ErrorChangePasswordServerPort=Unable to find the 'ipPort' attribute for the
'changePasswordServer' bean.
-ServerXmlIOV156.ErrorDefaultDirectoryService=Unable to find the 'defaultDirectoryService'
tag.
-ServerXmlIOV156.ErrorDenormalizeOpAttrsEnabled=Unable to find the 'denormalizeOpAttrsEnabled'
attribute for the default directory service bean.
-ServerXmlIOV156.ErrorDnsServerPort=Unable to find the 'ipPort' attribute for the 'dnsServer'
bean.
-ServerXmlIOV156.ErrorId=Unable to find the 'id' attribute for a partition.
-ServerXmlIOV156.ErrorJDBMPartition=Unable to find the 'jdbmPartition' element for the system
partition.
-ServerXmlIOV156.ErrorKdcServerPort=Unable to find the 'ipPort' attribute for the 'kdcServer'
bean.
-ServerXmlIOV156.ErrorLdapServerId=Unable to find the 'id' attribute for the 'ldapService'
bean.
-ServerXmlIOV156.ErrorLdapServerPort=Unable to find the 'ipPort' attribute for the 'ldapService'
bean.
-ServerXmlIOV156.ErrorLdapsServerPort=Unable to find the 'ipPort' attribute for the 'ldapsServer'
bean.
-ServerXmlIOV156.ErrorMaxSizeLimit=Unable to find the 'maxSizeLimit' attribute for the 'ldapServer'
bean.
-ServerXmlIOV156.ErrorMaxThreads=Unable to find the 'maxThreads' attribute for the StandardThreadPool
bean.
-ServerXmlIOV156.ErrorMaxTimeLimit=Unable to find the 'maxTimeLimit' attribute for the 'ldapServer'
bean.
-ServerXmlIOV156.ErrorNtpServerPort=Unable to find the 'ipPort' attribute for the 'ntpServer'
bean.
-ServerXmlIOV156.ErrorOptimizerEnabled=Unable to find the 'OptimizerEnabled' attribute for
a partition.
-ServerXmlIOV156.ErrorSaslHost=Unable to find the 'saslHost' attribute for the 'ldapService'
bean.
-ServerXmlIOV156.ErrorSaslPrincipal=Unable to find the 'saslPrincipal' attribute for the 'ldapService'
bean.
-ServerXmlIOV156.ErrorSearchBaseDn=Unable to find the 'searchBaseDn' attribute for the 'ldapServer'
bean.
-ServerXmlIOV156.ErrorStandardThreadPool=Unable to find the 'standardThreadPool' tag.
-ServerXmlIOV156.ErrorSuffix=Unable to find the 'suffix' attribute for a partition.
-ServerXmlIOV156.ErrorSyncOnWrite=Unable to find the 'syncOnWrite' attribute for a partition.
-ServerXmlIOV156.ErrorSyncPeriodMillis=Unable to find the 'synchPeriodMillis' attribute for
a partition.
-ServerXmlIOV156.ErrorSystemPartition=Unable to find the 'systemPartition' element.
+
+ServerXmlIOV157.ErrorAccessControlEnabled=Unable to find the 'accessControlEnabled' attribute
for the default directory service bean.
+ServerXmlIOV157.ErrorAllowAnonymousAccess=Unable to find the 'allowAnonymousAccess' attribute
for the 'ldapService' bean.
+ServerXmlIOV157.ErrorCacheSize=Unable to find the 'cacheSize' attribute for a partition.
+ServerXmlIOV157.ErrorChangePasswordServerPort=Unable to find the 'ipPort' attribute for the
'changePasswordServer' bean.
+ServerXmlIOV157.ErrorDefaultDirectoryService=Unable to find the 'defaultDirectoryService'
tag.
+ServerXmlIOV157.ErrorDenormalizeOpAttrsEnabled=Unable to find the 'denormalizeOpAttrsEnabled'
attribute for the default directory service bean.
+ServerXmlIOV157.ErrorDnsServerPort=Unable to find the 'ipPort' attribute for the 'dnsServer'
bean.
+ServerXmlIOV157.ErrorId=Unable to find the 'id' attribute for a partition.
+ServerXmlIOV157.ErrorJDBMPartition=Unable to find the 'jdbmPartition' element for the system
partition.
+ServerXmlIOV157.ErrorKdcServerPort=Unable to find the 'ipPort' attribute for the 'kdcServer'
bean.
+ServerXmlIOV157.ErrorLdapServerId=Unable to find the 'id' attribute for the 'ldapService'
bean.
+ServerXmlIOV157.ErrorLdapServerPort=Unable to find the 'ipPort' attribute for the 'ldapService'
bean.
+ServerXmlIOV157.ErrorLdapsServerPort=Unable to find the 'ipPort' attribute for the 'ldapsServer'
bean.
+ServerXmlIOV157.ErrorMaxSizeLimit=Unable to find the 'maxSizeLimit' attribute for the 'ldapServer'
bean.
+ServerXmlIOV157.ErrorMaxThreads=Unable to find the 'maxThreads' attribute for the StandardThreadPool
bean.
+ServerXmlIOV157.ErrorMaxTimeLimit=Unable to find the 'maxTimeLimit' attribute for the 'ldapServer'
bean.
+ServerXmlIOV157.ErrorNtpServerPort=Unable to find the 'ipPort' attribute for the 'ntpServer'
bean.
+ServerXmlIOV157.ErrorOptimizerEnabled=Unable to find the 'OptimizerEnabled' attribute for
a partition.
+ServerXmlIOV157.ErrorSaslHost=Unable to find the 'saslHost' attribute for the 'ldapService'
bean.
+ServerXmlIOV157.ErrorSaslPrincipal=Unable to find the 'saslPrincipal' attribute for the 'ldapService'
bean.
+ServerXmlIOV157.ErrorSearchBaseDn=Unable to find the 'searchBaseDn' attribute for the 'ldapServer'
bean.
+ServerXmlIOV157.ErrorStandardThreadPool=Unable to find the 'standardThreadPool' tag.
+ServerXmlIOV157.ErrorSuffix=Unable to find the 'suffix' attribute for a partition.
+ServerXmlIOV157.ErrorSyncOnWrite=Unable to find the 'syncOnWrite' attribute for a partition.
+ServerXmlIOV157.ErrorSyncPeriodMillis=Unable to find the 'synchPeriodMillis' attribute for
a partition.
+ServerXmlIOV157.ErrorSystemPartition=Unable to find the 'systemPartition' element.



Mime
View raw message