You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/03/27 01:42:44 UTC
svn commit: r1085843 [2/2] - in
/directory/studio/branches/1.5.x/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/di...
Modified: directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java?rev=1085843&r1=1085842&r2=1085843&view=diff
==============================================================================
--- directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java (original)
+++ directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerXmlIOV157.java Sun Mar 27 00:42:43 2011
@@ -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$
@@ -584,6 +585,11 @@ public class ServerXmlIOV157 extends Abs
{
serverConfiguration.addInterceptor( InterceptorEnum.OPERATIONAL_ATTRIBUTE );
}
+ 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 +1403,55 @@ 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 ) )
- {
- 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 ) )
+
+ for ( InterceptorEnum interceptor : interceptors )
{
- 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 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/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties?rev=1085843&r1=1085842&r2=1085843&view=diff
==============================================================================
--- directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties (original)
+++ directory/studio/branches/1.5.x/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties Sun Mar 27 00:42:43 2011
@@ -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,6 +34,8 @@ 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
@@ -47,32 +50,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.