You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/12/09 10:55:56 UTC
svn commit: r1043878 [2/3] - in /directory/apacheds/trunk/server-config: ./
src/main/java/org/apache/directory/server/config/
src/main/java/org/apache/directory/server/config/beans/ src/main/resources/
src/test/java/org/apache/directory/server/config/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java Thu Dec 9 09:55:55 2010
@@ -19,11 +19,15 @@
*/
package org.apache.directory.server.config.beans;
+
import java.util.ArrayList;
import java.util.List;
import javax.security.auth.kerberos.KerberosPrincipal;
+import org.apache.directory.server.config.ConfigurationElement;
+
+
/**
* A class used to store the KdcServer configuration.
*
@@ -37,9 +41,6 @@ public class KdcServerBean extends DSBas
/** The default for allowing empty addresses */
private static final boolean DEFAULT_EMPTY_ADDRESSES_ALLOWED = true;
- /** The allowable clock skew. */
- private long krbAllowableClockSkew = DEFAULT_ALLOWABLE_CLOCKSKEW;
-
/** The default for allowing forwardable tickets */
private static final boolean DEFAULT_TGS_FORWARDABLE_ALLOWED = true;
@@ -70,54 +71,71 @@ public class KdcServerBean extends DSBas
/** The default kdc service principal */
private static final String DEFAULT_PRINCIPAL = "krbtgt/EXAMPLE.COM@EXAMPLE.COM";
+ /** The allowable clock skew. */
+ @ConfigurationElement(attributeType = "ads-krbAllowableClockSkew")
+ private long krbAllowableClockSkew = DEFAULT_ALLOWABLE_CLOCKSKEW;
+
/** Whether empty addresses are allowed. */
+ @ConfigurationElement(attributeType = "ads-krbEmptyAddressesAllowed")
private boolean krbEmptyAddressesAllowed = DEFAULT_EMPTY_ADDRESSES_ALLOWED;
/** Whether forwardable addresses are allowed. */
+ @ConfigurationElement(attributeType = "ads-krbForwardableAllowed")
private boolean krbForwardableAllowed = DEFAULT_TGS_FORWARDABLE_ALLOWED;
/** Whether pre-authentication by encrypted timestamp is required. */
+ @ConfigurationElement(attributeType = "ads-krbPAEncTimestampRequired")
private boolean krbPAEncTimestampRequired = DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
/** Whether postdated tickets are allowed. */
+ @ConfigurationElement(attributeType = "ads-krbPostdatedAllowed")
private boolean krbPostdatedAllowed = DEFAULT_TGS_POSTDATED_ALLOWED;
/** Whether proxiable addresses are allowed. */
+ @ConfigurationElement(attributeType = "ads-krbProxiableAllowed")
private boolean krbProxiableAllowed = DEFAULT_TGS_PROXIABLE_ALLOWED;
/** Whether renewable tickets are allowed. */
+ @ConfigurationElement(attributeType = "ads-krbRenewableAllowed")
private boolean krbRenewableAllowed = DEFAULT_TGS_RENEWABLE_ALLOWED;
/** The maximum renewable lifetime. */
+ @ConfigurationElement(attributeType = "ads-krbMaximumRenewableLifetime")
private long krbMaximumRenewableLifetime = DEFAULT_TGS_MAXIMUM_RENEWABLE_LIFETIME;
/** The maximum ticket lifetime. */
+ @ConfigurationElement(attributeType = "ads-krbMaximumTicketLifetime")
private long krbMaximumTicketLifetime = DEFAULT_TGS_MAXIMUM_TICKET_LIFETIME;
/** The primary realm */
+ @ConfigurationElement(attributeType = "ads-krbPrimaryRealm")
private String krbPrimaryRealm = DEFAULT_REALM;
/** Whether to verify the body checksum. */
+ @ConfigurationElement(attributeType = "ads-krbBodyChecksumVerified")
private boolean krbBodyChecksumVerified = DEFAULT_VERIFY_BODY_CHECKSUM;
/** The encryption types. */
+ @ConfigurationElement(attributeType = "ads-krbEncryptionTypes")
private List<String> krbEncryptionTypes = new ArrayList<String>();
/** The service principal name. */
+ @ConfigurationElement(attributeType = "ads-krbKdcPrincipal")
private String krbKdcPrincipal = DEFAULT_PRINCIPAL;
+
/**
* Create a new KdcServerBean instance
*/
public KdcServerBean()
{
super();
-
+
// Enabled by default
setEnabled( true );
}
-
-
+
+
/**
* Returns the allowable clock skew.
*
@@ -156,7 +174,7 @@ public class KdcServerBean extends DSBas
*/
public void addKrbEncryptionTypes( String... krbEncryptionTypes )
{
- for ( String encryptionType:krbEncryptionTypes )
+ for ( String encryptionType : krbEncryptionTypes )
{
this.krbEncryptionTypes.add( encryptionType );
}
@@ -366,14 +384,14 @@ public class KdcServerBean extends DSBas
this.krbKdcPrincipal = krbKdcPrincipal;
}
-
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "KDCServer :\n" );
sb.append( super.toString( tabs + " " ) );
sb.append( toString( tabs, " body checksum verified", krbBodyChecksumVerified ) );
@@ -392,17 +410,17 @@ public class KdcServerBean extends DSBas
if ( ( krbEncryptionTypes != null ) && ( krbEncryptionTypes.size() > 0 ) )
{
sb.append( tabs ).append( " encryption types :\n" );
-
+
for ( String encryptionType : krbEncryptionTypes )
{
sb.append( toString( tabs, " encryption type", encryptionType ) );
}
}
-
+
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Thu Dec 9 09:55:55 2010
@@ -19,9 +19,12 @@
*/
package org.apache.directory.server.config.beans;
+
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.server.config.ConfigurationElement;
+
/**
* A class used to store the LdapServer configuration.
@@ -31,56 +34,70 @@ import java.util.List;
public class LdapServerBean extends DSBasedServerBean
{
/** */
+ @ConfigurationElement(attributeType = "ads-confidentialityRequired")
private boolean confidentialityRequired;
-
+
/** The maximum number of entries returned by the server */
+ @ConfigurationElement(attributeType = "ads-maxSizeLimit")
private int maxSizeLimit;
-
+
/** The maximum time to execute a request on the server */
+ @ConfigurationElement(attributeType = "ads-maxTimeLimit")
private int maxTimeLimit;
-
+
/** The SASL host */
+ @ConfigurationElement(attributeType = "ads-saslHost")
private String saslHost;
-
+
/** The SASL principal */
+ @ConfigurationElement(attributeType = "ads-saslPrincipal")
private String saslPrincipal;
-
+
/** The SASL realms */
+ @ConfigurationElement(attributeType = "ads-saslRealms")
private List<String> saslRealms = new ArrayList<String>();
-
+
/** The keystore file */
+ @ConfigurationElement(attributeType = "ads-keystoreFile")
private String keystoreFile;
-
+
/** The certificate password */
+ @ConfigurationElement(attributeType = "ads-certificatePassword")
private String certificatePassword;
-
+
/** tells if the replication is enabled */
- private boolean enableReplProvider;
-
+ @ConfigurationElement(attributeType = "ads-enableReplProvider")
+ private boolean enableReplProvider;
+
/** The replication consumer Bean */
+ @ConfigurationElement
private ReplConsumerBean replConsumer;
-
+
/** The replication producer Bean */
+ @ConfigurationElement
private ReplProviderBean replProvider;
-
+
/** The list of supported mechanisms */
+ @ConfigurationElement(attributeType = "ads-saslMechHandlers", container = "saslMechHandlers")
private List<SaslMechHandlerBean> saslMechHandlers = new ArrayList<SaslMechHandlerBean>();
-
+
/** The list of supported extended operation handlers */
+ @ConfigurationElement(attributeType = "ads-extendedOpHandlers", container = "extendedOpHandlers")
private List<ExtendedOpHandlerBean> extendedOpHandlers = new ArrayList<ExtendedOpHandlerBean>();
+
/**
* Create a new LdapServerBean instance
*/
public LdapServerBean()
{
super();
-
+
// Enabled by default
setEnabled( true );
}
-
+
/**
* @return the ldapServerConfidentialityRequired
*/
@@ -89,7 +106,7 @@ public class LdapServerBean extends DSBa
return confidentialityRequired;
}
-
+
/**
* @param ldapServerConfidentialityRequired the ldapServerConfidentialityRequired to set
*/
@@ -98,7 +115,7 @@ public class LdapServerBean extends DSBa
this.confidentialityRequired = ldapServerConfidentialityRequired;
}
-
+
/**
* @return the ldapServerMaxSizeLimit
*/
@@ -107,7 +124,7 @@ public class LdapServerBean extends DSBa
return maxSizeLimit;
}
-
+
/**
* @param ldapServerMaxSizeLimit the ldapServerMaxSizeLimit to set
*/
@@ -116,7 +133,7 @@ public class LdapServerBean extends DSBa
this.maxSizeLimit = ldapServerMaxSizeLimit;
}
-
+
/**
* @return the ldapServerMaxTimeLimit
*/
@@ -125,7 +142,7 @@ public class LdapServerBean extends DSBa
return maxTimeLimit;
}
-
+
/**
* @param ldapServerMaxTimeLimit the ldapServerMaxTimeLimit to set
*/
@@ -134,7 +151,7 @@ public class LdapServerBean extends DSBa
this.maxTimeLimit = ldapServerMaxTimeLimit;
}
-
+
/**
* @return the ldapServerSaslHost
*/
@@ -143,7 +160,7 @@ public class LdapServerBean extends DSBa
return saslHost;
}
-
+
/**
* @param ldapServerSaslHost the ldapServerSaslHost to set
*/
@@ -152,7 +169,7 @@ public class LdapServerBean extends DSBa
this.saslHost = ldapServerSaslHost;
}
-
+
/**
* @return the ldapServerSaslPrincipal
*/
@@ -161,7 +178,7 @@ public class LdapServerBean extends DSBa
return saslPrincipal;
}
-
+
/**
* @param ldapServerSaslPrincipal the ldapServerSaslPrincipal to set
*/
@@ -170,7 +187,7 @@ public class LdapServerBean extends DSBa
this.saslPrincipal = ldapServerSaslPrincipal;
}
-
+
/**
* @return the ldapServerSaslRealms
*/
@@ -179,7 +196,7 @@ public class LdapServerBean extends DSBa
return saslRealms;
}
-
+
/**
* @param ldapServerSaslRealms the ldapServerSaslRealms to set
*/
@@ -188,7 +205,7 @@ public class LdapServerBean extends DSBa
this.saslRealms = ldapServerSaslRealms;
}
-
+
/**
* @param ldapServerSaslRealms the ldapServerSaslRealms to add
*/
@@ -200,7 +217,7 @@ public class LdapServerBean extends DSBa
}
}
-
+
/**
* @return the ldapServerKeystoreFile
*/
@@ -209,7 +226,7 @@ public class LdapServerBean extends DSBa
return keystoreFile;
}
-
+
/**
* @param ldapServerKeystoreFile the ldapServerKeystoreFile to set
*/
@@ -218,7 +235,7 @@ public class LdapServerBean extends DSBa
this.keystoreFile = ldapServerKeystoreFile;
}
-
+
/**
* @return the ldapServerCertificatePassword
*/
@@ -227,7 +244,7 @@ public class LdapServerBean extends DSBa
return certificatePassword;
}
-
+
/**
* @param ldapServerCertificatePassword the ldapServerCertificatePassword to set
*/
@@ -236,7 +253,7 @@ public class LdapServerBean extends DSBa
this.certificatePassword = ldapServerCertificatePassword;
}
-
+
/**
* @return the replProviderImpl
*
@@ -263,7 +280,7 @@ public class LdapServerBean extends DSBa
return enableReplProvider;
}
-
+
/**
* @param enableReplProvider the enableReplProvider to set
*/
@@ -272,7 +289,7 @@ public class LdapServerBean extends DSBa
this.enableReplProvider = enableReplProvider;
}
-
+
/**
* @return the saslMechHandlers
*/
@@ -281,7 +298,7 @@ public class LdapServerBean extends DSBa
return saslMechHandlers;
}
-
+
/**
* @param saslMechHandlers the saslMechHandlers to set
*/
@@ -290,7 +307,7 @@ public class LdapServerBean extends DSBa
this.saslMechHandlers = saslMechHandlers;
}
-
+
/**
* @param saslMechHandlers the saslMechHandlers to add
*/
@@ -302,7 +319,7 @@ public class LdapServerBean extends DSBa
}
}
-
+
/**
* @return the extendedOps
*/
@@ -311,7 +328,7 @@ public class LdapServerBean extends DSBa
return extendedOpHandlers;
}
-
+
/**
* @param extendedOps the extendedOps to set
*/
@@ -320,14 +337,14 @@ public class LdapServerBean extends DSBa
this.extendedOpHandlers = extendedOps;
}
-
+
/**
* @param extendedOps the extendedOps to add
*/
public void addExtendedOps( ExtendedOpHandlerBean... extendedOps )
{
for ( ExtendedOpHandlerBean extendedOp : extendedOps )
- {
+ {
this.extendedOpHandlers.add( extendedOp );
}
}
@@ -368,14 +385,14 @@ public class LdapServerBean extends DSBa
this.replProvider = replProvider;
}
-
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "LdapServer :\n" );
sb.append( super.toString( tabs + " " ) );
sb.append( tabs ).append( " max size limit : " ).append( maxSizeLimit ).append( '\n' );
@@ -386,51 +403,51 @@ public class LdapServerBean extends DSBa
sb.append( tabs ).append( " sasl host : " ).append( saslHost ).append( '\n' );
sb.append( toString( tabs, " confidentiality required", confidentialityRequired ) );
sb.append( toString( tabs, " enable replication provider", enableReplProvider ) );
-
+
if ( ( extendedOpHandlers != null ) && ( extendedOpHandlers.size() > 0 ) )
{
sb.append( tabs ).append( " extended operation handlers :\n" );
-
+
for ( ExtendedOpHandlerBean extendedOpHandler : extendedOpHandlers )
{
sb.append( extendedOpHandler.toString( tabs + " " ) );
}
}
-
+
if ( saslMechHandlers != null )
{
sb.append( tabs ).append( " SASL mechanism handlers :\n" );
-
+
for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
{
sb.append( saslMechHandler.toString( tabs + " " ) );
}
}
-
+
if ( ( saslRealms != null ) && ( saslRealms.size() > 0 ) )
{
sb.append( tabs ).append( " SASL realms :\n" );
-
+
for ( String saslRealm : saslRealms )
{
sb.append( tabs ).append( " " ).append( saslRealm ).append( "\n" );
}
}
-
+
if ( replConsumer != null )
{
sb.append( tabs ).append( replConsumer.toString( tabs + " " ) );
}
-
+
if ( replProvider != null )
{
sb.append( tabs ).append( replProvider.toString( tabs + " " ) );
}
-
+
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java Thu Dec 9 09:55:55 2010
@@ -33,26 +33,26 @@ public class NtpServerBean extends Serve
public NtpServerBean()
{
super();
-
+
// Enabled by default
setEnabled( true );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "NtpServer :\n" );
sb.append( super.toString( tabs + " " ) );
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Thu Dec 9 09:55:55 2010
@@ -19,11 +19,14 @@
*/
package org.apache.directory.server.config.beans;
+
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.server.config.ConfigurationElement;
import org.apache.directory.shared.ldap.name.DN;
+
/**
* A class used to store the Partition configuration. It can't be instanciated
*
@@ -32,20 +35,26 @@ import org.apache.directory.shared.ldap.
public abstract class PartitionBean extends AdsBaseBean
{
/** The Partition identifier */
+ @ConfigurationElement(attributeType = "ads-partitionId", isRdn = true)
private String partitionId;
-
+
/** The Partition suffix */
+ @ConfigurationElement(attributeType = "ads-partitionSuffix")
private DN partitionSuffix;
-
+
/** Tells if the data should be flushed to disk immediately */
+ @ConfigurationElement(attributeType = "ads-partitionSyncOnWrite")
private boolean partitionSyncOnWrite;
- /** The list of declared indexes */
- private List<IndexBean> indexes = new ArrayList<IndexBean>();
-
/** The partition's ContextEntry */
+ @ConfigurationElement(attributeType = "ads-contextEntry")
private String contextEntry;
+ /** The list of declared indexes */
+ @ConfigurationElement(attributeType = "ads-indexes", container = "indexes")
+ private List<IndexBean> indexes = new ArrayList<IndexBean>();
+
+
/**
* Create a new PartitionBean instance
*/
@@ -53,7 +62,7 @@ public abstract class PartitionBean exte
{
}
-
+
/**
* @return the partitionId
*/
@@ -62,7 +71,7 @@ public abstract class PartitionBean exte
return partitionId;
}
-
+
/**
* @param partitionId the partitionId to set
*/
@@ -71,7 +80,7 @@ public abstract class PartitionBean exte
this.partitionId = partitionId;
}
-
+
/**
* @return the partitionSuffix
*/
@@ -80,7 +89,7 @@ public abstract class PartitionBean exte
return partitionSuffix;
}
-
+
/**
* @param partitionSuffix the partitionSuffix to set
*/
@@ -89,7 +98,7 @@ public abstract class PartitionBean exte
this.partitionSuffix = partitionSuffix;
}
-
+
/**
* @return the partitionSyncOnWrite
*/
@@ -98,7 +107,7 @@ public abstract class PartitionBean exte
return partitionSyncOnWrite;
}
-
+
/**
* @param partitionSyncOnWrite the partitionSyncOnWrite to set
*/
@@ -106,8 +115,8 @@ public abstract class PartitionBean exte
{
this.partitionSyncOnWrite = partitionSyncOnWrite;
}
-
-
+
+
/**
* @return the indexes
*/
@@ -142,23 +151,23 @@ public abstract class PartitionBean exte
{
return contextEntry;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( super.toString( tabs + " " ) );
sb.append( tabs ).append( " partition ID : " ).append( partitionId ).append( '\n' );
sb.append( tabs ).append( " suffix : " ).append( partitionSuffix.getName() ).append( '\n' );
sb.append( toString( tabs, " sync on write", partitionSyncOnWrite ) );
sb.append( toString( tabs, " contextEntry", contextEntry ) );
-
+
sb.append( tabs ).append( " indexes : \n" );
-
+
if ( indexes != null )
{
for ( IndexBean index : indexes )
@@ -166,11 +175,11 @@ public abstract class PartitionBean exte
sb.append( index.toString( tabs + " " ) );
}
}
-
+
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java Thu Dec 9 09:55:55 2010
@@ -21,6 +21,7 @@
package org.apache.directory.server.config.beans;
+import org.apache.directory.server.config.ConfigurationElement;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -35,17 +36,20 @@ public class PasswordPolicyBean extends
/**
* The PasswordPolicy unique identifier
*/
+ @ConfigurationElement(attributeType = "ads-pwdId", isRdn = true)
private String pwdId;
-
+
/** the name of the attribute to which the password policy is applied.
* Currently only "userPassword" attribute is supported
*/
+ @ConfigurationElement(attributeType = "ads-pwdAttribute")
private String pwdAttribute = SchemaConstants.USER_PASSWORD_AT;
/**
* holds the number of seconds that must elapse between modifications to the password.
* Default value is 0
*/
+ @ConfigurationElement(attributeType = "ads-pwdMinAge")
private int pwdMinAge = 0;
/**
@@ -53,28 +57,33 @@ public class PasswordPolicyBean extends
* Default value is 0, does not expire. If not 0, the value must be greater than or equal
* to the value of the pwdMinAge.
*/
+ @ConfigurationElement(attributeType = "ads-pwdMaxAge")
private int pwdMaxAge;
/**
* specifies the maximum number of used passwords stored in the pwdHistory attribute.
* Default value is 0, no password history maintained
*/
+ @ConfigurationElement(attributeType = "ads-pwdInHistory")
private int pwdInHistory = 0;
/** indicates how the password quality will be verified while being modified or added.
* Default value 0, do not check
*/
+ @ConfigurationElement(attributeType = "ads-pwdCheckQuality")
private int pwdCheckQuality = 0;
/** this attribute holds the minimum number of characters that must be used in a password.
* Default value 0, no minimum length enforced
*/
+ @ConfigurationElement(attributeType = "ads-pwdMinLength")
private int pwdMinLength = 0;
/**
* this attribute holds the maximum number of characters that may be used in a password.
* Default value 0, no maximum length enforced
*/
+ @ConfigurationElement(attributeType = "ads-pwdMaxLength")
private int pwdMaxLength = 0;
/**
@@ -82,18 +91,21 @@ public class PasswordPolicyBean extends
* messages will be returned to an authenticating user.
* Default value is 0, never send a warning message.
*/
+ @ConfigurationElement(attributeType = "ads-pwdExpireWarning")
private int pwdExpireWarning = 0;
/**
* the number of times an expired password can be used to authenticate.
* Default value is 0, do not allow a expired password for authentication.
*/
+ @ConfigurationElement(attributeType = "ads-pwdGraceAuthNLimit")
private int pwdGraceAuthNLimit = 0;
/**
* specifies the number of seconds the grace authentications are valid
* Default value is 0, no limit.
*/
+ @ConfigurationElement(attributeType = "ads-pwdGraceExpire")
private int pwdGraceExpire = 0;
/**
@@ -101,6 +113,7 @@ public class PasswordPolicyBean extends
* consecutive failed bind attempts. The maximum number of consecutive
* failed bind attempts is specified in {@link #pwdMaxFailure}
*/
+ @ConfigurationElement(attributeType = "ads-pwdLockout")
private boolean pwdLockout;
/**
@@ -108,6 +121,7 @@ public class PasswordPolicyBean extends
* too many failed bind attempts.
* Default value is 300 seconds.
*/
+ @ConfigurationElement(attributeType = "ads-pwdLockoutDuration")
private int pwdLockoutDuration = 300;
/**
@@ -115,12 +129,14 @@ public class PasswordPolicyBean extends
* be used to authenticate.
* Default value is 0, no limit on the number of authentication failures
*/
+ @ConfigurationElement(attributeType = "ads-pwdMaxFailure")
private int pwdMaxFailure;
/**
* the number of seconds after which the password failures are purged from the failure counter.
* Default value is 0, reset all pwdFailureTimes after a successful authentication.
*/
+ @ConfigurationElement(attributeType = "ads-pwdFailureCountInterval")
private int pwdFailureCountInterval;
/**
@@ -128,9 +144,11 @@ public class PasswordPolicyBean extends
* directory after a password is set or reset by a password administrator.
* Default value is false, no need to change the password by user.
*/
+ @ConfigurationElement(attributeType = "ads-pwdMustChange")
private boolean pwdMustChange = false;
/** indicates whether users can change their own passwords. Default value is true, allow change */
+ @ConfigurationElement(attributeType = "ads-pwdAllowUserChange")
private boolean pwdAllowUserChange = true;
/**
@@ -138,23 +156,28 @@ public class PasswordPolicyBean extends
* new password when being changed.
* Default value is false.
*/
+ @ConfigurationElement(attributeType = "ads-pwdSafeModify")
private boolean pwdSafeModify = false;
/**
* the number of seconds to delay responding to the first failed authentication attempt
* Default value 0, no delay.
*/
+ @ConfigurationElement(attributeType = "ads-pwdMinDelay")
private int pwdMinDelay = 0;
/** the maximum number of seconds to delay when responding to a failed authentication attempt.*/
+ @ConfigurationElement(attributeType = "ads-pwdMaxDelay")
private int pwdMaxDelay;
/**
* the number of seconds an account may remain unused before it becomes locked
* Default value is 0, no check for idle time.
*/
+ @ConfigurationElement(attributeType = "ads-pwdMaxIdle")
private int pwdMaxIdle;
+
public String getPwdAttribute()
{
return pwdAttribute;
@@ -419,7 +442,7 @@ public class PasswordPolicyBean extends
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "PasswordPolicy :\n" );
sb.append( super.toString( tabs + " " ) );
sb.append( tabs ).append( " identifier : " ).append( pwdId ).append( '\n' );
@@ -438,7 +461,8 @@ public class PasswordPolicyBean extends
sb.append( tabs ).append( " password grace Auth N limit : " ).append( pwdGraceAuthNLimit ).append( '\n' );
sb.append( tabs ).append( " password in history : " ).append( pwdInHistory ).append( '\n' );
sb.append( tabs ).append( " password check quality : " ).append( pwdCheckQuality ).append( '\n' );
- sb.append( tabs ).append( " password failure count interval : " ).append( pwdFailureCountInterval ).append( '\n' );
+ sb.append( tabs ).append( " password failure count interval : " ).append( pwdFailureCountInterval )
+ .append( '\n' );
sb.append( toString( tabs, " password lockout", pwdLockout ) );
sb.append( toString( tabs, " password must change", pwdMustChange ) );
sb.append( toString( tabs, " password allow user change", pwdAllowUserChange ) );
@@ -446,8 +470,8 @@ public class PasswordPolicyBean extends
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java Thu Dec 9 09:55:55 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.config.beans;
+
+import org.apache.directory.server.config.ConfigurationElement;
import org.apache.directory.shared.ldap.name.DN;
@@ -30,50 +32,62 @@ import org.apache.directory.shared.ldap.
public class ReplConsumerBean extends AdsBaseBean
{
/** The consumer id */
+ @ConfigurationElement(attributeType = "ads-replConsumerId", isRdn = true)
private String replConsumerId;
-
+
/** The replication unique ID */
+ @ConfigurationElement(attributeType = "ads-dsReplicaId")
private String dsReplicaId;
-
+
/** The Alias Dereferencing mode */
+ @ConfigurationElement(attributeType = "ads-replAliasDerefMode")
private String replAliasDerefMode;
-
+
/** The Search Base DN */
+ @ConfigurationElement(attributeType = "ads-searchBaseDN")
private DN searchBaseDN;
-
+
/** The last CSN sent */
+ @ConfigurationElement(attributeType = "ads-replLastSentCsn")
private String replLastSentCsn;
-
+
/** The search scope */
+ @ConfigurationElement(attributeType = "ads-replSearchScope")
private String replSearchScope;
-
+
/** The replication search filter */
+ @ConfigurationElement(attributeType = "ads-replSearchFilter")
private String replSearchFilter;
-
+
/** Tells if we should persist */
+ @ConfigurationElement(attributeType = "ads-replRefreshNPersist")
private boolean replRefreshNPersist;
-
+
/** Tells if TLS should be used during replication */
+ @ConfigurationElement(attributeType = "ads-replUseTls")
private boolean replUseTls;
-
+
/** Tells if the certificate validation should be strict or not */
+ @ConfigurationElement(attributeType = "ads-replStrictCertValidation")
private boolean replStrictCertValidation;
-
+
/** The peer certificate */
+ @ConfigurationElement(attributeType = "ads-replPeerCertificate")
private String replPeerCertificate;
+
/**
* Create a new Replication Consumer instance
*/
public ReplConsumerBean()
{
super();
-
+
// Enabled by default
setEnabled( true );
}
-
+
/**
* @return the replConsumerId
*/
@@ -91,7 +105,7 @@ public class ReplConsumerBean extends Ad
this.replConsumerId = replConsumerId;
}
-
+
/**
* @return the dsreplicaid
*/
@@ -100,7 +114,7 @@ public class ReplConsumerBean extends Ad
return dsReplicaId;
}
-
+
/**
* @param dsreplicaid the dsreplicaid to set
*/
@@ -109,7 +123,7 @@ public class ReplConsumerBean extends Ad
this.dsReplicaId = dsreplicaid;
}
-
+
/**
* @return the replAliasDerefMode
*/
@@ -118,7 +132,7 @@ public class ReplConsumerBean extends Ad
return replAliasDerefMode;
}
-
+
/**
* @param replAliasDerefMode the replAliasDerefMode to set
*/
@@ -127,7 +141,7 @@ public class ReplConsumerBean extends Ad
this.replAliasDerefMode = replAliasDerefMode;
}
-
+
/**
* @return the searchBaseDN
*/
@@ -136,7 +150,7 @@ public class ReplConsumerBean extends Ad
return searchBaseDN;
}
-
+
/**
* @param searchBaseDN the searchBaseDN to set
*/
@@ -145,7 +159,7 @@ public class ReplConsumerBean extends Ad
this.searchBaseDN = searchBaseDN;
}
-
+
/**
* @return the replLastSentCsn
*/
@@ -154,7 +168,7 @@ public class ReplConsumerBean extends Ad
return replLastSentCsn;
}
-
+
/**
* @param replLastSentCsn the replLastSentCsn to set
*/
@@ -163,7 +177,7 @@ public class ReplConsumerBean extends Ad
this.replLastSentCsn = replLastSentCsn;
}
-
+
/**
* @return the replSearchScope
*/
@@ -172,7 +186,7 @@ public class ReplConsumerBean extends Ad
return replSearchScope;
}
-
+
/**
* @param replSearchScope the replSearchScope to set
*/
@@ -181,7 +195,7 @@ public class ReplConsumerBean extends Ad
this.replSearchScope = replSearchScope;
}
-
+
/**
* @return the replSearchFilter
*/
@@ -190,7 +204,7 @@ public class ReplConsumerBean extends Ad
return replSearchFilter;
}
-
+
/**
* @param replSearchFilter the replSearchFilter to set
*/
@@ -199,7 +213,7 @@ public class ReplConsumerBean extends Ad
this.replSearchFilter = replSearchFilter;
}
-
+
/**
* @return the replRefreshNPersist
*/
@@ -208,7 +222,7 @@ public class ReplConsumerBean extends Ad
return replRefreshNPersist;
}
-
+
/**
* @param replRefreshNPersist the replRefreshNPersist to set
*/
@@ -217,7 +231,7 @@ public class ReplConsumerBean extends Ad
this.replRefreshNPersist = replRefreshNPersist;
}
-
+
/**
* @return the replUseTls
*/
@@ -226,7 +240,7 @@ public class ReplConsumerBean extends Ad
return replUseTls;
}
-
+
/**
* @param replUseTls the replUseTls to set
*/
@@ -235,7 +249,7 @@ public class ReplConsumerBean extends Ad
this.replUseTls = replUseTls;
}
-
+
/**
* @return the replStrictCertValidation
*/
@@ -244,7 +258,7 @@ public class ReplConsumerBean extends Ad
return replStrictCertValidation;
}
-
+
/**
* @param replStrictCertValidation the replStrictCertValidation to set
*/
@@ -253,7 +267,7 @@ public class ReplConsumerBean extends Ad
this.replStrictCertValidation = replStrictCertValidation;
}
-
+
/**
* @return the replPeerCertificate
*/
@@ -262,7 +276,7 @@ public class ReplConsumerBean extends Ad
return replPeerCertificate;
}
-
+
/**
* @param replPeerCertificate the replPeerCertificate to set
*/
@@ -271,14 +285,14 @@ public class ReplConsumerBean extends Ad
this.replPeerCertificate = replPeerCertificate;
}
-
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "Replication consumer :\n" );
sb.append( super.toString( tabs + " " ) );
@@ -297,8 +311,8 @@ public class ReplConsumerBean extends Ad
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java Thu Dec 9 09:55:55 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.config.beans;
+
+import org.apache.directory.server.config.ConfigurationElement;
import org.apache.directory.shared.ldap.name.DN;
@@ -30,60 +32,77 @@ import org.apache.directory.shared.ldap.
public class ReplProviderBean extends AdsBaseBean
{
/** The provider id */
+ @ConfigurationElement(attributeType = "ads-replProviderId", isRdn = true)
private String replProviderId;
-
+
/** The replication unique ID */
+ @ConfigurationElement(attributeType = "ads-dsReplicaId")
private String dsReplicaId;
-
+
/** The Search Base DN */
+ @ConfigurationElement(attributeType = "ads-searchBaseDN")
private DN searchBaseDN;
-
+
/** The replication provider host name */
+ @ConfigurationElement(attributeType = "ads-replProvHostName")
private String replProvHostName;
-
+
/** The replication provider port */
+ @ConfigurationElement(attributeType = "ads-replProvPort")
private String replProvPort;
-
+
/** The Alias Dereferencing mode */
+ @ConfigurationElement(attributeType = "ads-replAliasDerefMode")
private String replAliasDerefMode;
-
+
/** The replication provider attribute */
+ @ConfigurationElement(attributeType = "ads-replAttribute")
private String replAttribute;
-
+
/** The refresh interval */
+ @ConfigurationElement(attributeType = "ads-replRefreshInterval")
private String replRefreshInterval;
-
+
/** Tells if we should persist */
+ @ConfigurationElement(attributeType = "ads-replRefreshNPersist")
private boolean replRefreshNPersist;
-
+
/** The search scope */
+ @ConfigurationElement(attributeType = "ads-replSearchScope")
private String replSearchScope;
-
+
/** The replication search filter */
+ @ConfigurationElement(attributeType = "ads-replSearchFilter")
private String replSearchFilter;
/** The search size limit */
+ @ConfigurationElement(attributeType = "ads-replSearchSizeLimit")
private int replSearchSizeLimit;
-
+
/** The search time limit */
+ @ConfigurationElement(attributeType = "ads-replSearchTimeout")
private int replSearchTimeout;
-
+
/** The replication user DN */
+ @ConfigurationElement(attributeType = "ads-replUserDN")
private DN replUserDN;
-
+
/** The replication user password */
+ @ConfigurationElement(attributeType = "ads-replUserPassword")
private String replUserPassword;
-
+
/** The replication cookie */
+ @ConfigurationElement(attributeType = "ads-replCookie")
private String replCookie;
+
/**
* Create a new Replication Consumer instance
*/
public ReplProviderBean()
{
super();
-
+
// Enabled by default
setEnabled( true );
}
@@ -106,7 +125,7 @@ public class ReplProviderBean extends Ad
this.replProviderId = replProviderId;
}
-
+
/**
* @return the dsreplicaid
*/
@@ -376,14 +395,14 @@ public class ReplProviderBean extends Ad
this.replCookie = replCookie;
}
-
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "Replication provider :\n" );
sb.append( super.toString( tabs + " " ) );
@@ -406,8 +425,8 @@ public class ReplProviderBean extends Ad
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java Thu Dec 9 09:55:55 2010
@@ -20,6 +20,9 @@
package org.apache.directory.server.config.beans;
+import org.apache.directory.server.config.ConfigurationElement;
+
+
/**
* A class used to store the SASL mechanism handler configuration.
*
@@ -28,14 +31,18 @@ package org.apache.directory.server.conf
public class SaslMechHandlerBean extends AdsBaseBean
{
/** The SASL mechanism handler */
+ @ConfigurationElement(attributeType = "ads-saslMechName", isRdn = true)
private String saslMechName;
-
+
/** The SASL mechanism handler FQCN */
+ @ConfigurationElement(attributeType = "ads-saslMechClassName")
private String saslMechClassName;
-
+
/** The NTLM provider */
+ @ConfigurationElement(attributeType = "ads-ntlmMechProvider")
private String ntlmMechProvider;
+
/**
* Create a new LdapServerSaslMechanisHandlerBean instance
*/
@@ -44,6 +51,7 @@ public class SaslMechHandlerBean extends
super();
}
+
/**
* @return the ldapServerSaslMechName
*/
@@ -51,7 +59,7 @@ public class SaslMechHandlerBean extends
{
return saslMechName;
}
-
+
/**
* @param saslMechName the SaslMechName to set
@@ -61,7 +69,7 @@ public class SaslMechHandlerBean extends
this.saslMechName = saslMechName;
}
-
+
/**
* @return the SaslMechClassName
*/
@@ -70,7 +78,7 @@ public class SaslMechHandlerBean extends
return saslMechClassName;
}
-
+
/**
* @param SaslMechClassName the SaslMechClassName to set
*/
@@ -79,7 +87,7 @@ public class SaslMechHandlerBean extends
this.saslMechClassName = saslMechClassName;
}
-
+
/**
* @return the NtlmMechProvider
*/
@@ -88,7 +96,7 @@ public class SaslMechHandlerBean extends
return ntlmMechProvider;
}
-
+
/**
* @param NtlmMechProvider the NtlmMechProvider to set
*/
@@ -96,24 +104,24 @@ public class SaslMechHandlerBean extends
{
this.ntlmMechProvider = ntlmMechProvider;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "SASL mechanism handler :\n" );
sb.append( tabs ).append( " SASL mechanism name :" ).append( saslMechName ).append( '\n' );
sb.append( tabs ).append( " SASL mechanism class name :" ).append( saslMechClassName ).append( '\n' );
sb.append( toString( tabs, " NTLM mechanism provider", ntlmMechProvider ) );
-
+
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java Thu Dec 9 09:55:55 2010
@@ -19,9 +19,13 @@
*/
package org.apache.directory.server.config.beans;
+
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.server.config.ConfigurationElement;
+
+
/**
* A class used to store the Server configuration. It can't be instanciated
*
@@ -30,25 +34,29 @@ import java.util.List;
public abstract class ServerBean extends AdsBaseBean
{
/** The server unique identifier */
+ @ConfigurationElement(attributeType = "ads-serverId", isRdn = true)
private String serverId;
-
+
/** The set of transports to use for this server */
+ @ConfigurationElement(attributeType = "ads-transports", container = "transports")
private List<TransportBean> transports = new ArrayList<TransportBean>();
+
/**
* Create a new ServerBean instance
*/
protected ServerBean()
{
}
-
-
+
+
/**
* @return the transport
*/
public TransportBean[] getTransports()
{
- return transports.toArray( new TransportBean[]{} );
+ return transports.toArray( new TransportBean[]
+ {} );
}
@@ -58,13 +66,13 @@ public abstract class ServerBean extends
*/
public void setTransports( TransportBean... transports )
{
- for ( TransportBean transport : transports )
+ for ( TransportBean transport : transports )
{
this.transports.add( transport );
}
}
-
-
+
+
/**
* Add underlying transports
* @param transports The transports
@@ -94,19 +102,19 @@ public abstract class ServerBean extends
{
this.serverId = serverId;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( super.toString( tabs ) );
sb.append( tabs ).append( "server id : " ).append( serverId ).append( '\n' );
sb.append( tabs ).append( "transports : \n" );
-
+
if ( transports != null )
{
for ( TransportBean transport : transports )
@@ -114,11 +122,11 @@ public abstract class ServerBean extends
sb.append( transport.toString( tabs + " " ) );
}
}
-
+
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java Thu Dec 9 09:55:55 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.config.beans;
+
/**
* A class used to store the TCP Transport configuration.
*
@@ -33,17 +34,17 @@ public class TcpTransportBean extends Tr
{
super();
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
- return tabs + "TCP transport : \n" + super.toString( " " + tabs);
+ return tabs + "TCP transport : \n" + super.toString( " " + tabs );
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Thu Dec 9 09:55:55 2010
@@ -19,6 +19,10 @@
*/
package org.apache.directory.server.config.beans;
+
+import org.apache.directory.server.config.ConfigurationElement;
+
+
/**
* A class used to store the Transport configuration.
*
@@ -28,28 +32,35 @@ public class TransportBean extends AdsBa
{
/** The default backlog queue size */
private static final int DEFAULT_BACKLOG_NB = 50;
-
+
/** The default number of threads */
private static final int DEFAULT_NB_THREADS = 3;
/** The unique identifier for this transport */
+ @ConfigurationElement(attributeType = "ads-transportId", isRdn = true)
private String transportId;
-
+
/** The transport address */
+ @ConfigurationElement(attributeType = "ads-transportAddress")
private String transportAddress;
-
+
/** The port number */
+ @ConfigurationElement(attributeType = "ads-systemPort")
private int systemPort = -1;
-
+
/** A flag set if SSL is enabled */
+ @ConfigurationElement(attributeType = "ads-transportEnableSsl")
private boolean transportEnableSsl = false;
-
+
/** The number of threads to use for the IoAcceptor executor */
+ @ConfigurationElement(attributeType = "ads-transportNbThreads")
private int transportNbThreads = DEFAULT_NB_THREADS;
-
+
/** The backlog for the transport services */
+ @ConfigurationElement(attributeType = "ads-transportBackLog")
private int transportBackLog = DEFAULT_BACKLOG_NB;
-
+
+
/**
* Create a new TransportBean instance
*/
@@ -57,41 +68,43 @@ public class TransportBean extends AdsBa
{
}
-
+
/**
* @param systemPort the port to set
*/
- public void setSystemPort( int systemPort )
+ public void setSystemPort( int systemPort )
{
this.systemPort = systemPort;
}
-
+
/**
* @return the port
*/
- public int getSystemPort()
+ public int getSystemPort()
{
return systemPort;
}
-
+
/**
* @param transportAddress the address to set
*/
- public void setTransportAddress( String transportAddress ) {
+ public void setTransportAddress( String transportAddress )
+ {
this.transportAddress = transportAddress;
}
-
+
/**
* @return the address
*/
- public String getTransportAddress() {
+ public String getTransportAddress()
+ {
return transportAddress;
}
-
-
+
+
/**
* @return <code>true</code> id SSL is enabled for this transport
*/
@@ -99,8 +112,8 @@ public class TransportBean extends AdsBa
{
return transportEnableSsl;
}
-
-
+
+
/**
* Enable or disable SSL
*
@@ -110,17 +123,17 @@ public class TransportBean extends AdsBa
{
this.transportEnableSsl = transportEnableSSL;
}
-
-
+
+
/**
* @return The number of threads used to handle the incoming requests
*/
- public int getTransportNbThreads()
+ public int getTransportNbThreads()
{
return transportNbThreads;
}
-
-
+
+
/**
* Sets the number of thread to use to process incoming requests
*
@@ -130,8 +143,8 @@ public class TransportBean extends AdsBa
{
this.transportNbThreads = transportNbThreads;
}
-
-
+
+
/**
* @return the size of the incoming request waiting queue
*/
@@ -139,8 +152,8 @@ public class TransportBean extends AdsBa
{
return transportBackLog;
}
-
-
+
+
/**
* Sets the size of the incoming requests waiting queue
*
@@ -168,18 +181,18 @@ public class TransportBean extends AdsBa
{
this.transportId = transportId;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( toString( tabs, "transport id", transportId ) );
sb.append( tabs ).append( "transport address : " );
-
+
if ( transportAddress == null )
{
sb.append( "localhost" ).append( '\n' );
@@ -196,8 +209,8 @@ public class TransportBean extends AdsBa
return sb.toString();
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java Thu Dec 9 09:55:55 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.config.beans;
+
/**
* A class used to store the UDP Transport configuration.
*
@@ -33,17 +34,17 @@ public class UdpTransportBean extends Tr
{
super();
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString( String tabs )
{
- return tabs + "UDP transport : \n" + super.toString( " " + tabs);
+ return tabs + "UDP transport : \n" + super.toString( " " + tabs );
}
-
-
+
+
/**
* {@inheritDoc}
*/
Propchange: directory/apacheds/trunk/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 09:55:55 2010
@@ -8,4 +8,5 @@
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441
/directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
/directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
+/directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
Modified: directory/apacheds/trunk/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config.ldif?rev=1043878&r1=1043877&r2=1043878&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config.ldif Thu Dec 9 09:55:55 2010
@@ -4,11 +4,6 @@ ou: config
objectclass: top
objectclass: organizationalUnit
-dn: ou=replProviders,ou=config
-ou: replProviders
-objectclass: organizationalUnit
-objectclass: top
-
dn: ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
@@ -17,15 +12,15 @@ ads-directoryserviceid: default
ads-dsreplicaid: 1
ads-dssyncperiodmillis: 15000
ads-dsmaxpdusize: 2000000
-ads-dsallowanonymousaccess: true
-ads-dsaccesscontrolenabled: false
-ads-dsdenormalizeopattrsenabled: false
-ads-servers: changepasswordserver
-ads-servers: dns
-ads-servers: httpserver
-ads-servers: kerberos
-ads-servers: ldapserver
-ads-servers: ntp
+ads-dsallowanonymousaccess: TRUE
+ads-dsaccesscontrolenabled: FALSE
+ads-dsdenormalizeopattrsenabled: FALSE
+ads-servers: changePasswordServer
+ads-servers: dnsServer
+ads-servers: httpServer
+ads-servers: kerberosServer
+ads-servers: ldapServer
+ads-servers: ntpServer
ads-partitions: example
ads-partitions: system
ads-interceptors: aciAuthorizationInterceptor
@@ -42,7 +37,7 @@ ads-interceptors: referralInterceptor
ads-interceptors: schemaInterceptor
ads-interceptors: subentryInterceptor
ads-interceptors: triggerInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-changeLogId=defaultChangeLog,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -51,7 +46,6 @@ objectclass: ads-changeLog
ads-changeLogId: defaultChangeLog
ads-changeLogExposed: FALSE
-
dn: ads-journalId=defaultJournal,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
@@ -61,7 +55,6 @@ ads-journalFileName: Journal.txt
ads-journalWorkingDir: /
ads-journalRotation: 2
-
dn: ou=interceptors,ads-directoryServiceId=default,ou=config
ou: interceptors
objectclass: organizationalUnit
@@ -74,7 +67,7 @@ objectclass: ads-interceptor
ads-interceptororder: 4
ads-interceptorclassname: org.apache.directory.server.core.authz.AciAuthorizationInterceptor
ads-interceptorid: aciAuthorizationInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -83,7 +76,7 @@ objectclass: ads-interceptor
ads-interceptororder: 2
ads-interceptorclassname: org.apache.directory.server.core.authn.AuthenticationInterceptor
ads-interceptorid: authenticationInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=collectiveAttributeInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -92,7 +85,7 @@ objectclass: ads-interceptor
ads-interceptororder: 12
ads-interceptorclassname: org.apache.directory.server.core.collective.CollectiveAttributeInterceptor
ads-interceptorid: collectiveAttributeInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=defaultAuthorizationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -101,7 +94,7 @@ objectclass: ads-interceptor
ads-interceptororder: 5
ads-interceptorclassname: org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor
ads-interceptorid: defaultAuthorizationInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=eventInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -110,7 +103,7 @@ objectclass: ads-interceptor
ads-interceptororder: 13
ads-interceptorclassname: org.apache.directory.server.core.event.EventInterceptor
ads-interceptorid: eventInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=exceptionInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -119,13 +112,13 @@ objectclass: ads-interceptor
ads-interceptororder: 6
ads-interceptorclassname: org.apache.directory.server.core.exception.ExceptionInterceptor
ads-interceptorid: exceptionInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=keyDerivationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-enabled: false
+ads-enabled: FALSE
ads-interceptororder: 8
ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
ads-interceptorid: keyDerivationInterceptor
@@ -137,7 +130,7 @@ objectclass: ads-interceptor
ads-interceptororder: 1
ads-interceptorclassname: org.apache.directory.server.core.normalization.NormalizationInterceptor
ads-interceptorid: normalizationInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=operationalAttributeInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -146,13 +139,13 @@ objectclass: ads-interceptor
ads-interceptororder: 7
ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
ads-interceptorid: operationalAttributeInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=passwordHashingInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-enabled: true
+ads-enabled: TRUE
ads-interceptororder: 9
ads-interceptorclassname: org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor
ads-interceptorid: passwordHashingInterceptor
@@ -164,7 +157,7 @@ objectclass: ads-interceptor
ads-interceptororder: 3
ads-interceptorclassname: org.apache.directory.server.core.referral.ReferralInterceptor
ads-interceptorid: referralInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=schemaInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -173,7 +166,7 @@ objectclass: ads-interceptor
ads-interceptororder: 10
ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
ads-interceptorid: schemaInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=subentryInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -182,7 +175,7 @@ objectclass: ads-interceptor
ads-interceptororder: 11
ads-interceptorclassname: org.apache.directory.server.core.subtree.SubentryInterceptor
ads-interceptorid: subentryInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-interceptorId=triggerInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
@@ -191,7 +184,7 @@ objectclass: ads-interceptor
ads-interceptororder: 14
ads-interceptorclassname: org.apache.directory.server.core.trigger.TriggerInterceptor
ads-interceptorid: triggerInterceptor
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-pwdId=pwdPolicy,ads-directoryServiceId=default,ou=config
objectClass: top
@@ -213,7 +206,7 @@ ads-pwdMinAge: 0
ads-pwdAllowUserChange: TRUE
ads-pwdGraceAuthNLimit: 5
ads-pwdCheckQuality: 2
-ads-enabled: true
+ads-enabled: TRUE
dn: ou=partitions,ads-directoryServiceId=default,ou=config
ou: partitions
@@ -225,12 +218,22 @@ objectclass: top
objectClass: ads-base
objectclass: ads-partition
objectclass: ads-jdbmPartition
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.1
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.2
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.3
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.4
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.5
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.6
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.7
+ads-indexes: objectClass
+ads-indexes: ou
+ads-indexes: uid
ads-partitionSuffix: ou=system
-ads-jdbmpartitionoptimizerenabled: true
+ads-jdbmpartitionoptimizerenabled: TRUE
ads-partitioncachesize: 100
-ads-partitionsynconwrite: true
+ads-partitionsynconwrite: TRUE
ads-partitionid: system
-ads-enabled: true
+ads-enabled: TRUE
ads-contextEntry: dn: ou=system\n
objectClass: top\n
objectClass: organizationalUnit\n
@@ -247,92 +250,114 @@ ads-indexattributeid: 1.3.6.1.4.1.18060.
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: objectClass
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: ou
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: uid
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
objectclass: top
objectClass: ads-base
objectclass: ads-partition
objectclass: ads-jdbmPartition
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.1
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.2
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.3
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.4
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.5
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.6
+ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.7
+ads-indexes: dc
+ads-indexes: krb5PrincipalName
+ads-indexes: objectClass
+ads-indexes: ou
+ads-indexes: uid
ads-partitionSuffix: dc=example,dc=com
-ads-jdbmpartitionoptimizerenabled: true
+ads-jdbmpartitionoptimizerenabled: TRUE
ads-partitioncachesize: 100
-ads-partitionsynconwrite: true
+ads-partitionsynconwrite: TRUE
ads-partitionid: example
-ads-enabled: true
+ads-enabled: TRUE
dn: ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ou: indexes
@@ -344,182 +369,208 @@ ads-indexattributeid: 1.3.6.1.4.1.18060.
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=dc,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: dc
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=krb5PrincipalName,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: krb5PrincipalName
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: objectClass
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: ou
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: uid
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ou=servers,ads-directoryServiceId=default,ou=config
ou: servers
objectclass: organizationalUnit
objectclass: top
-dn: ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: ads-server
objectclass: ads-changePasswordServer
objectclass: ads-dsBasedServer
-ads-serverid: changepasswordserver
+objectclass: ads-base
+objectclass: top
+ads-serverid: changePasswordServer
ads-chgPwdServicePrincipal: kadmin/changepw@EXAMPLE.COM
-ads-enabled: false
+ads-enabled: FALSE
ads-krballowableclockskew: 300000
-ads-krbEmptyAddressesAllowed: true
+ads-krbEmptyAddressesAllowed: TRUE
ads-krbEncryptionTypes: des-cbc-md5
ads-krbPrimaryRealm: EXAMPLE.COM
ads-searchBaseDN: ou=users,dc=example,dc=com
+ads-transports: tcp
+ads-transports: udp
-dn: ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportId=tcp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60464
ads-transportbacklog: 50
ads-transportnbthreads: 2
ads-transportid: tcp
objectclass: ads-transport
objectclass: ads-tcpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-transportId=udp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60464
ads-transportbacklog: 50
ads-transportnbthreads: 2
ads-transportid: udp
objectclass: ads-transport
-objectclass: top
objectclass: ads-udpTransport
-ads-enabled: true
+objectClass: ads-base
+objectclass: top
+ads-enabled: TRUE
-dn: ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
-ads-serverid: dns
-ads-enabled: false
+dn: ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-serverid: dnsServer
+ads-enabled: FALSE
objectclass: ads-server
objectclass: ads-dnsServer
objectclass: ads-dsBasedServer
+objectclass: ads-base
objectclass: top
+ads-transports: tcp
+ads-transports: udp
-dn: ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportId=tcp,ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 8053
ads-transportid: tcp
objectclass: ads-transport
objectclass: ads-tcpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-transportId=udp,ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 8053
ads-transportid: udp
objectclass: ads-transport
objectclass: ads-udpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
-ads-serverid: httpserver
-ads-enabled: false
+dn: ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-serverid: httpServer
+ads-enabled: FALSE
objectclass: ads-server
-objectclass: ads-httpserver
+objectclass: ads-httpServer
+objectclass: ads-base
objectclass: top
+ads-transports: http
+ads-transports: https
-dn: ou=transports,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportid=http,ou=transports,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportid=http,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
objectclass: ads-transport
@@ -527,9 +578,9 @@ objectclass: ads-tcpTransport
ads-transportid: http
ads-systemport: 8080
ads-transportaddress: 0.0.0.0
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-transportid=https,ou=transports,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportid=https,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
objectclass: ads-transport
@@ -537,60 +588,65 @@ objectclass: ads-tcpTransport
ads-transportid: https
ads-transportaddress: 0.0.0.0
ads-systemport: 8443
-ads-enabled: true
+ads-enabled: TRUE
-dn: ou=httpWebapps,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=httpWebApps,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: organizationalUnit
objectclass: top
-ou: httpWebapps
+ou: httpWebApps
-dn: ads-Id=testapp,ou=httpWebapps,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-id=testapp,ou=httpWebApps,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-httpwarfile: /path/to/foo/war
ads-httpappctxpath: /foo
ads-id: testapp
objectclass: ads-httpWebApp
+objectclass: ads-base
objectclass: top
-ads-enabled: false
+ads-enabled: FALSE
-dn: ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: ads-server
objectclass: ads-kdcServer
objectclass: ads-dsBasedServer
+objectclass: ads-base
objectclass: top
-ads-serverid: kerberos
-ads-enabled: false
+ads-serverid: kerberosServer
+ads-enabled: FALSE
ads-krbAllowableClockSkew: 300000
-ads-krbBodyChecksumVerified: true
-ads-krbEmptyAddressesAllowed: true
+ads-krbBodyChecksumVerified: TRUE
+ads-krbEmptyAddressesAllowed: TRUE
ads-krbEncryptionTypes: des-cbc-md5
-ads-krbForwardableAllowed: true
+ads-krbForwardableAllowed: TRUE
ads-krbKdcPrincipal: krbtgt/EXAMPLE.COM@EXAMPLE.COM
ads-krbmaximumrenewablelifetime: 604800000
ads-krbMaximumTicketLifetime: 86400000
-ads-krbPaEncTimestampRequired: true
-ads-krbPostdatedAllowed: true
+ads-krbPaEncTimestampRequired: TRUE
+ads-krbPostdatedAllowed: TRUE
ads-krbPrimaryRealm: EXAMPLE.COM
-ads-krbProxiableAllowed: true
-ads-krbRenewableAllowed: true
+ads-krbProxiableAllowed: TRUE
+ads-krbRenewableAllowed: TRUE
ads-searchBaseDN: ou=users,dc=example,dc=com
+ads-transports: tcp
+ads-transports: udp
-dn: ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60088
ads-transportbacklog: 50
ads-transportnbthreads: 4
ads-transportaddress: 0.0.0.0
ads-transportid: tcp
objectclass: ads-transport
+objectClass: ads-base
objectclass: ads-tcpTransport
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-transportid=udp,ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportid=udp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60088
ads-transportbacklog: 50
ads-transportnbthreads: 4
@@ -598,16 +654,18 @@ ads-transportaddress: 0.0.0.0
ads-transportid: udp
objectclass: ads-transport
objectclass: ads-udpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
objectclass: ads-server
objectclass: ads-ldapServer
objectclass: ads-dsBasedServer
+objectclass: ads-base
objectclass: top
ads-serverId: ldapServer
-ads-confidentialityRequired: false
+ads-confidentialityRequired: FALSE
ads-maxSizeLimit: 1000
ads-maxTimeLimit: 15000
ads-saslHost: ldap.example.com
@@ -615,8 +673,19 @@ ads-saslPrincipal: ldap/ldap.example.com
ads-saslRealms: example.com
ads-saslRealms: apache.org
ads-searchBaseDN: ou=users,ou=system
-ads-enabled: true
-ads-enableReplProvider: false
+ads-enabled: TRUE
+ads-enableReplProvider: FALSE
+ads-transports: ldap
+ads-transports: ldaps
+ads-saslmechhandlers: CRAM-MD5
+ads-saslmechhandlers: DIGEST-MD5
+ads-saslmechhandlers: GSS-SPNEGO
+ads-saslmechhandlers: GSSAPI
+ads-saslmechhandlers: NTLM
+ads-saslmechhandlers: SIMPLE
+ads-extendedophandlers: gracefulShutdownHandler
+ads-extendedophandlers: starttlshandler
+ads-extendedophandlers: storedprochandler
dn: ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
@@ -625,126 +694,142 @@ objectclass: top
dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 10389
-ads-transportenablessl: false
+ads-transportenablessl: FALSE
ads-transportbacklog: 50
ads-transportnbthreads: 8
ads-transportaddress: 0.0.0.0
ads-transportid: ldap
objectclass: ads-transport
objectclass: ads-tcpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
dn: ads-transportid=ldaps,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 10636
-ads-transportenablessl: true
+ads-transportenablessl: TRUE
ads-transportaddress: 0.0.0.0
ads-transportid: ldaps
objectclass: ads-transport
objectclass: ads-tcpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-ou: extendedophandlers
+dn: ou=extendedOpHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: extendedOpHandlers
objectclass: organizationalUnit
objectclass: top
-dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedOpHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-extendedOpId: gracefulShutdownHandler
ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler
objectclass: ads-extendedOpHandler
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-extendedOpId=starttlshandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-extendedOpId=starttlshandler,ou=extendedOpHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-extendedOpId: starttlshandler
ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StartTlsHandler
objectclass: ads-extendedOpHandler
+objectclass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-extendedOpId=storedprochandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-ads-enabled: false
+dn: ads-extendedOpId=storedprochandler,ou=extendedOpHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-enabled: FALSE
ads-extendedOpId: storedprochandler
ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler
objectclass: ads-extendedOpHandler
+objectclass: ads-base
objectclass: top
-dn: ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-ou: saslmechhandlers
+dn: ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: saslMechHandlers
objectclass: organizationalUnit
objectclass: top
-dn: ads-saslMechName=cram-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=CRAM-MD5,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: CRAM-MD5
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-saslMechName=digest-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=DIGEST-MD5,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: DIGEST-MD5
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-saslMechName=gss-spnego,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=GSS-SPNEGO,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: GSS-SPNEGO
ads-ntlmMechProvider: com.foo.Bar
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-saslMechName=gssapi,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=GSSAPI,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: GSSAPI
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-saslMechName=ntlm,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=NTLM,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: NTLM
ads-ntlmMechProvider: com.foo.Bar
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-saslMechName=simple,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-saslMechName=SIMPLE,ou=saslMechHandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler
objectclass: ads-saslMechHandler
+objectclass: ads-base
objectclass: top
ads-saslMechName: SIMPLE
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
-ads-serverid: ntp
-ads-enabled: false
+dn: ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-serverid: ntpServer
+ads-enabled: FALSE
objectclass: ads-server
objectclass: ads-ntpServer
+objectclass: ads-base
objectclass: top
+ads-transports: tcp
+ads-transports: udp
-dn: ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportId=tcp,ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60123
ads-transportid: tcp
objectclass: ads-transport
objectclass: ads-tcpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE
-dn: ads-transportId=udp,ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60123
ads-transportnbthreads: 1
ads-transportid: udp
objectclass: ads-transport
objectclass: ads-udpTransport
+objectClass: ads-base
objectclass: top
-ads-enabled: true
+ads-enabled: TRUE