Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52737 invoked from network); 7 Dec 2010 13:55:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Dec 2010 13:55:39 -0000 Received: (qmail 40651 invoked by uid 500); 7 Dec 2010 13:55:38 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40409 invoked by uid 500); 7 Dec 2010 13:55:38 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39915 invoked by uid 99); 7 Dec 2010 13:55:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Dec 2010 13:55:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Dec 2010 13:55:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 78CB52388A36; Tue, 7 Dec 2010 13:55:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1043047 [2/2] - in /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config: ./ beans/ Date: Tue, 07 Dec 2010 13:55:01 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101207135507.78CB52388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java Tue Dec 7 13:55:00 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/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Tue Dec 7 13:55:00 2010 @@ -19,13 +19,14 @@ */ package org.apache.directory.server.config.beans; + import java.util.ArrayList; import java.util.List; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; +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 * @@ -34,25 +35,26 @@ import org.apache.directory.shared.ldap. public abstract class PartitionBean extends AdsBaseBean { /** The Partition identifier */ - @AttributeType("ads-partitionId") - @RDN + @ConfigurationElement(attributeType = "ads-partitionId", isRDN = true) private String partitionId; - + /** The Partition suffix */ - @AttributeType("ads-partitionSuffix") + @ConfigurationElement(attributeType = "ads-partitionSuffix") private DN partitionSuffix; - + /** Tells if the data should be flushed to disk immediately */ - @AttributeType("ads-partitionSyncOnWrite") + @ConfigurationElement(attributeType = "ads-partitionSyncOnWrite") private boolean partitionSyncOnWrite; - + /** The partition's ContextEntry */ - @AttributeType("ads-contextEntry") + @ConfigurationElement(attributeType = "ads-contextEntry") private String contextEntry; - + /** The list of declared indexes */ + @ConfigurationElement(container="ou=indexes") private List indexes = new ArrayList(); + /** * Create a new PartitionBean instance */ @@ -60,7 +62,7 @@ public abstract class PartitionBean exte { } - + /** * @return the partitionId */ @@ -69,7 +71,7 @@ public abstract class PartitionBean exte return partitionId; } - + /** * @param partitionId the partitionId to set */ @@ -78,7 +80,7 @@ public abstract class PartitionBean exte this.partitionId = partitionId; } - + /** * @return the partitionSuffix */ @@ -87,7 +89,7 @@ public abstract class PartitionBean exte return partitionSuffix; } - + /** * @param partitionSuffix the partitionSuffix to set */ @@ -96,7 +98,7 @@ public abstract class PartitionBean exte this.partitionSuffix = partitionSuffix; } - + /** * @return the partitionSyncOnWrite */ @@ -105,7 +107,7 @@ public abstract class PartitionBean exte return partitionSyncOnWrite; } - + /** * @param partitionSyncOnWrite the partitionSyncOnWrite to set */ @@ -113,8 +115,8 @@ public abstract class PartitionBean exte { this.partitionSyncOnWrite = partitionSyncOnWrite; } - - + + /** * @return the indexes */ @@ -149,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 ) @@ -173,11 +175,11 @@ public abstract class PartitionBean exte sb.append( index.toString( tabs + " " ) ); } } - + return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java Tue Dec 7 13:55:00 2010 @@ -21,8 +21,7 @@ package org.apache.directory.server.config.beans; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; +import org.apache.directory.server.config.ConfigurationElement; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -37,21 +36,20 @@ public class PasswordPolicyBean extends /** * The PasswordPolicy unique identifier */ - @AttributeType("ads-pwdId") - @RDN + @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 */ - @AttributeType("ads-pwdAttribute") + @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 */ - @AttributeType("ads-pwdMinAge") + @ConfigurationElement(attributeType = "ads-pwdMinAge") private int pwdMinAge = 0; /** @@ -59,33 +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. */ - @AttributeType("ads-pwdMaxAge") + @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 */ - @AttributeType("ads-pwdInHistory") + @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 */ - @AttributeType("ads-pwdCheckQuality") + @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 */ - @AttributeType("ads-pwdMinLength") + @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 */ - @AttributeType("ads-pwdMaxLength") + @ConfigurationElement(attributeType = "ads-pwdMaxLength") private int pwdMaxLength = 0; /** @@ -93,21 +91,21 @@ public class PasswordPolicyBean extends * messages will be returned to an authenticating user. * Default value is 0, never send a warning message. */ - @AttributeType("ads-pwdExpireWarning") + @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. */ - @AttributeType("ads-pwdGraceAuthNLimit") + @ConfigurationElement(attributeType = "ads-pwdGraceAuthNLimit") private int pwdGraceAuthNLimit = 0; /** * specifies the number of seconds the grace authentications are valid * Default value is 0, no limit. */ - @AttributeType("ads-pwdGraceExpire") + @ConfigurationElement(attributeType = "ads-pwdGraceExpire") private int pwdGraceExpire = 0; /** @@ -115,7 +113,7 @@ public class PasswordPolicyBean extends * consecutive failed bind attempts. The maximum number of consecutive * failed bind attempts is specified in {@link #pwdMaxFailure} */ - @AttributeType("ads-pwdLockout") + @ConfigurationElement(attributeType = "ads-pwdLockout") private boolean pwdLockout; /** @@ -123,7 +121,7 @@ public class PasswordPolicyBean extends * too many failed bind attempts. * Default value is 300 seconds. */ - @AttributeType("ads-pwdLockoutDuration") + @ConfigurationElement(attributeType = "ads-pwdLockoutDuration") private int pwdLockoutDuration = 300; /** @@ -131,14 +129,14 @@ public class PasswordPolicyBean extends * be used to authenticate. * Default value is 0, no limit on the number of authentication failures */ - @AttributeType("ads-pwdMaxFailure") + @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. */ - @AttributeType("ads-pwdFailureCountInterval") + @ConfigurationElement(attributeType = "ads-pwdFailureCountInterval") private int pwdFailureCountInterval; /** @@ -146,11 +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. */ - @AttributeType("ads-pwdMustChange") + @ConfigurationElement(attributeType = "ads-pwdMustChange") private boolean pwdMustChange = false; /** indicates whether users can change their own passwords. Default value is true, allow change */ - @AttributeType("ads-pwdAllowUserChange") + @ConfigurationElement(attributeType = "ads-pwdAllowUserChange") private boolean pwdAllowUserChange = true; /** @@ -158,27 +156,28 @@ public class PasswordPolicyBean extends * new password when being changed. * Default value is false. */ - @AttributeType("ads-pwdSafeModify") + @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. */ - @AttributeType("ads-pwdMinDelay") + @ConfigurationElement(attributeType = "ads-pwdMinDelay") private int pwdMinDelay = 0; /** the maximum number of seconds to delay when responding to a failed authentication attempt.*/ - @AttributeType("ads-pwdMaxDelay") + @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. */ - @AttributeType("ads-pwdMaxIdle") + @ConfigurationElement(attributeType = "ads-pwdMaxIdle") private int pwdMaxIdle; + public String getPwdAttribute() { return pwdAttribute; @@ -443,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' ); @@ -462,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 ) ); @@ -470,8 +470,8 @@ public class PasswordPolicyBean extends return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java Tue Dec 7 13:55:00 2010 @@ -19,8 +19,8 @@ */ package org.apache.directory.server.config.beans; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; + +import org.apache.directory.server.config.ConfigurationElement; import org.apache.directory.shared.ldap.name.DN; @@ -32,62 +32,62 @@ import org.apache.directory.shared.ldap. public class ReplConsumerBean extends AdsBaseBean { /** The consumer id */ - @AttributeType("ads-replConsumerId") - @RDN + @ConfigurationElement(attributeType = "ads-replConsumerId", isRDN = true) private String replConsumerId; - + /** The replication unique ID */ - @AttributeType("ads-dsReplicaId") + @ConfigurationElement(attributeType = "ads-dsReplicaId") private String dsReplicaId; - + /** The Alias Dereferencing mode */ - @AttributeType("ads-replAliasDerefMode") + @ConfigurationElement(attributeType = "ads-replAliasDerefMode") private String replAliasDerefMode; - + /** The Search Base DN */ - @AttributeType("ads-searchBaseDN") + @ConfigurationElement(attributeType = "ads-searchBaseDN") private DN searchBaseDN; - + /** The last CSN sent */ - @AttributeType("ads-replLastSentCsn") + @ConfigurationElement(attributeType = "ads-replLastSentCsn") private String replLastSentCsn; - + /** The search scope */ - @AttributeType("ads-replSearchScope") + @ConfigurationElement(attributeType = "ads-replSearchScope") private String replSearchScope; - + /** The replication search filter */ - @AttributeType("ads-replSearchFilter") + @ConfigurationElement(attributeType = "ads-replSearchFilter") private String replSearchFilter; - + /** Tells if we should persist */ - @AttributeType("ads-replRefreshNPersist") + @ConfigurationElement(attributeType = "ads-replRefreshNPersist") private boolean replRefreshNPersist; - + /** Tells if TLS should be used during replication */ - @AttributeType("ads-replUseTls") + @ConfigurationElement(attributeType = "ads-replUseTls") private boolean replUseTls; - + /** Tells if the certificate validation should be strict or not */ - @AttributeType("ads-replStrictCertValidation") + @ConfigurationElement(attributeType = "ads-replStrictCertValidation") private boolean replStrictCertValidation; - + /** The peer certificate */ - @AttributeType("ads-replPeerCertificate") + @ConfigurationElement(attributeType = "ads-replPeerCertificate") private String replPeerCertificate; + /** * Create a new Replication Consumer instance */ public ReplConsumerBean() { super(); - + // Enabled by default setEnabled( true ); } - + /** * @return the replConsumerId */ @@ -105,7 +105,7 @@ public class ReplConsumerBean extends Ad this.replConsumerId = replConsumerId; } - + /** * @return the dsreplicaid */ @@ -114,7 +114,7 @@ public class ReplConsumerBean extends Ad return dsReplicaId; } - + /** * @param dsreplicaid the dsreplicaid to set */ @@ -123,7 +123,7 @@ public class ReplConsumerBean extends Ad this.dsReplicaId = dsreplicaid; } - + /** * @return the replAliasDerefMode */ @@ -132,7 +132,7 @@ public class ReplConsumerBean extends Ad return replAliasDerefMode; } - + /** * @param replAliasDerefMode the replAliasDerefMode to set */ @@ -141,7 +141,7 @@ public class ReplConsumerBean extends Ad this.replAliasDerefMode = replAliasDerefMode; } - + /** * @return the searchBaseDN */ @@ -150,7 +150,7 @@ public class ReplConsumerBean extends Ad return searchBaseDN; } - + /** * @param searchBaseDN the searchBaseDN to set */ @@ -159,7 +159,7 @@ public class ReplConsumerBean extends Ad this.searchBaseDN = searchBaseDN; } - + /** * @return the replLastSentCsn */ @@ -168,7 +168,7 @@ public class ReplConsumerBean extends Ad return replLastSentCsn; } - + /** * @param replLastSentCsn the replLastSentCsn to set */ @@ -177,7 +177,7 @@ public class ReplConsumerBean extends Ad this.replLastSentCsn = replLastSentCsn; } - + /** * @return the replSearchScope */ @@ -186,7 +186,7 @@ public class ReplConsumerBean extends Ad return replSearchScope; } - + /** * @param replSearchScope the replSearchScope to set */ @@ -195,7 +195,7 @@ public class ReplConsumerBean extends Ad this.replSearchScope = replSearchScope; } - + /** * @return the replSearchFilter */ @@ -204,7 +204,7 @@ public class ReplConsumerBean extends Ad return replSearchFilter; } - + /** * @param replSearchFilter the replSearchFilter to set */ @@ -213,7 +213,7 @@ public class ReplConsumerBean extends Ad this.replSearchFilter = replSearchFilter; } - + /** * @return the replRefreshNPersist */ @@ -222,7 +222,7 @@ public class ReplConsumerBean extends Ad return replRefreshNPersist; } - + /** * @param replRefreshNPersist the replRefreshNPersist to set */ @@ -231,7 +231,7 @@ public class ReplConsumerBean extends Ad this.replRefreshNPersist = replRefreshNPersist; } - + /** * @return the replUseTls */ @@ -240,7 +240,7 @@ public class ReplConsumerBean extends Ad return replUseTls; } - + /** * @param replUseTls the replUseTls to set */ @@ -249,7 +249,7 @@ public class ReplConsumerBean extends Ad this.replUseTls = replUseTls; } - + /** * @return the replStrictCertValidation */ @@ -258,7 +258,7 @@ public class ReplConsumerBean extends Ad return replStrictCertValidation; } - + /** * @param replStrictCertValidation the replStrictCertValidation to set */ @@ -267,7 +267,7 @@ public class ReplConsumerBean extends Ad this.replStrictCertValidation = replStrictCertValidation; } - + /** * @return the replPeerCertificate */ @@ -276,7 +276,7 @@ public class ReplConsumerBean extends Ad return replPeerCertificate; } - + /** * @param replPeerCertificate the replPeerCertificate to set */ @@ -285,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 + " " ) ); @@ -311,8 +311,8 @@ public class ReplConsumerBean extends Ad return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java Tue Dec 7 13:55:00 2010 @@ -19,8 +19,8 @@ */ package org.apache.directory.server.config.beans; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; + +import org.apache.directory.server.config.ConfigurationElement; import org.apache.directory.shared.ldap.name.DN; @@ -32,77 +32,77 @@ import org.apache.directory.shared.ldap. public class ReplProviderBean extends AdsBaseBean { /** The provider id */ - @AttributeType("ads-replProviderId") - @RDN + @ConfigurationElement(attributeType = "ads-replProviderId", isRDN = true) private String replProviderId; - + /** The replication unique ID */ - @AttributeType("ads-dsReplicaId") + @ConfigurationElement(attributeType = "ads-dsReplicaId") private String dsReplicaId; - + /** The Search Base DN */ - @AttributeType("ads-searchBaseDN") + @ConfigurationElement(attributeType = "ads-searchBaseDN") private DN searchBaseDN; - + /** The replication provider host name */ - @AttributeType("ads-replProvHostName") + @ConfigurationElement(attributeType = "ads-replProvHostName") private String replProvHostName; - + /** The replication provider port */ - @AttributeType("ads-replProvPort") + @ConfigurationElement(attributeType = "ads-replProvPort") private String replProvPort; - + /** The Alias Dereferencing mode */ - @AttributeType("ads-replAliasDerefMode") + @ConfigurationElement(attributeType = "ads-replAliasDerefMode") private String replAliasDerefMode; - + /** The replication provider attribute */ - @AttributeType("ads-replAttribute") + @ConfigurationElement(attributeType = "ads-replAttribute") private String replAttribute; - + /** The refresh interval */ - @AttributeType("ads-replRefreshInterval") + @ConfigurationElement(attributeType = "ads-replRefreshInterval") private String replRefreshInterval; - + /** Tells if we should persist */ - @AttributeType("ads-replRefreshNPersist") + @ConfigurationElement(attributeType = "ads-replRefreshNPersist") private boolean replRefreshNPersist; - + /** The search scope */ - @AttributeType("ads-replSearchScope") + @ConfigurationElement(attributeType = "ads-replSearchScope") private String replSearchScope; - + /** The replication search filter */ - @AttributeType("ads-replSearchFilter") + @ConfigurationElement(attributeType = "ads-replSearchFilter") private String replSearchFilter; /** The search size limit */ - @AttributeType("ads-replSearchSizeLimit") + @ConfigurationElement(attributeType = "ads-replSearchSizeLimit") private int replSearchSizeLimit; - + /** The search time limit */ - @AttributeType("ads-replSearchTimeout") + @ConfigurationElement(attributeType = "ads-replSearchTimeout") private int replSearchTimeout; - + /** The replication user DN */ - @AttributeType("ads-replUserDN") + @ConfigurationElement(attributeType = "ads-replUserDN") private DN replUserDN; - + /** The replication user password */ - @AttributeType("ads-replUserPassword") + @ConfigurationElement(attributeType = "ads-replUserPassword") private String replUserPassword; - + /** The replication cookie */ - @AttributeType("ads-replCookie") + @ConfigurationElement(attributeType = "ads-replCookie") private String replCookie; + /** * Create a new Replication Consumer instance */ public ReplProviderBean() { super(); - + // Enabled by default setEnabled( true ); } @@ -125,7 +125,7 @@ public class ReplProviderBean extends Ad this.replProviderId = replProviderId; } - + /** * @return the dsreplicaid */ @@ -395,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 + " " ) ); @@ -425,8 +425,8 @@ public class ReplProviderBean extends Ad return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java Tue Dec 7 13:55:00 2010 @@ -19,8 +19,8 @@ */ package org.apache.directory.server.config.beans; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; + +import org.apache.directory.server.config.ConfigurationElement; /** @@ -31,18 +31,18 @@ import org.apache.directory.server.confi public class SaslMechHandlerBean extends AdsBaseBean { /** The SASL mechanism handler */ - @AttributeType("ads-saslMechName") - @RDN + @ConfigurationElement(attributeType = "ads-saslMechName", isRDN = true) private String saslMechName; - + /** The SASL mechanism handler FQCN */ - @AttributeType("ads-saslMechClassName") + @ConfigurationElement(attributeType = "ads-saslMechClassName") private String saslMechClassName; - + /** The NTLM provider */ - @AttributeType("ads-ntlmMechProvider") + @ConfigurationElement(attributeType = "ads-ntlmMechProvider") private String ntlmMechProvider; + /** * Create a new LdapServerSaslMechanisHandlerBean instance */ @@ -51,6 +51,7 @@ public class SaslMechHandlerBean extends super(); } + /** * @return the ldapServerSaslMechName */ @@ -58,7 +59,7 @@ public class SaslMechHandlerBean extends { return saslMechName; } - + /** * @param saslMechName the SaslMechName to set @@ -68,7 +69,7 @@ public class SaslMechHandlerBean extends this.saslMechName = saslMechName; } - + /** * @return the SaslMechClassName */ @@ -77,7 +78,7 @@ public class SaslMechHandlerBean extends return saslMechClassName; } - + /** * @param SaslMechClassName the SaslMechClassName to set */ @@ -86,7 +87,7 @@ public class SaslMechHandlerBean extends this.saslMechClassName = saslMechClassName; } - + /** * @return the NtlmMechProvider */ @@ -95,7 +96,7 @@ public class SaslMechHandlerBean extends return ntlmMechProvider; } - + /** * @param NtlmMechProvider the NtlmMechProvider to set */ @@ -103,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/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java Tue Dec 7 13:55:00 2010 @@ -19,11 +19,12 @@ */ package org.apache.directory.server.config.beans; + import java.util.ArrayList; import java.util.List; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; +import org.apache.directory.server.config.ConfigurationElement; + /** * A class used to store the Server configuration. It can't be instanciated @@ -33,27 +34,29 @@ import org.apache.directory.server.confi public abstract class ServerBean extends AdsBaseBean { /** The server unique identifier */ - @AttributeType("ads-serverId") - @RDN + @ConfigurationElement(attributeType = "ads-serverId", isRDN = true) private String serverId; - + /** The set of transports to use for this server */ + @ConfigurationElement(container="ou=transports") private List transports = new ArrayList(); + /** * Create a new ServerBean instance */ protected ServerBean() { } - - + + /** * @return the transport */ public TransportBean[] getTransports() { - return transports.toArray( new TransportBean[]{} ); + return transports.toArray( new TransportBean[] + {} ); } @@ -63,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 @@ -99,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 ) @@ -119,11 +122,11 @@ public abstract class ServerBean extends sb.append( transport.toString( tabs + " " ) ); } } - + return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java Tue Dec 7 13:55:00 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/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Tue Dec 7 13:55:00 2010 @@ -19,8 +19,9 @@ */ package org.apache.directory.server.config.beans; -import org.apache.directory.server.config.AttributeType; -import org.apache.directory.server.config.RDN; + +import org.apache.directory.server.config.ConfigurationElement; + /** * A class used to store the Transport configuration. @@ -31,35 +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 */ - @AttributeType("ads-transportId") - @RDN + @ConfigurationElement(attributeType = "ads-transportId", isRDN = true) private String transportId; - + /** The transport address */ - @AttributeType("ads-transportAddress") + @ConfigurationElement(attributeType = "ads-transportAddress") private String transportAddress; - + /** The port number */ - @AttributeType("ads-systemPort") + @ConfigurationElement(attributeType = "ads-systemPort") private int systemPort = -1; - + /** A flag set if SSL is enabled */ - @AttributeType("ads-transportEnableSsl") + @ConfigurationElement(attributeType = "ads-transportEnableSsl") private boolean transportEnableSsl = false; - + /** The number of threads to use for the IoAcceptor executor */ - @AttributeType("ads-transportNbThreads") + @ConfigurationElement(attributeType = "ads-transportNbThreads") private int transportNbThreads = DEFAULT_NB_THREADS; - + /** The backlog for the transport services */ - @AttributeType("ads-transportBackLog") + @ConfigurationElement(attributeType = "ads-transportBackLog") private int transportBackLog = DEFAULT_BACKLOG_NB; - + + /** * Create a new TransportBean instance */ @@ -67,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 true id SSL is enabled for this transport */ @@ -109,8 +112,8 @@ public class TransportBean extends AdsBa { return transportEnableSsl; } - - + + /** * Enable or disable SSL * @@ -120,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 * @@ -140,8 +143,8 @@ public class TransportBean extends AdsBa { this.transportNbThreads = transportNbThreads; } - - + + /** * @return the size of the incoming request waiting queue */ @@ -149,8 +152,8 @@ public class TransportBean extends AdsBa { return transportBackLog; } - - + + /** * Sets the size of the incoming requests waiting queue * @@ -178,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' ); @@ -206,8 +209,8 @@ public class TransportBean extends AdsBa return sb.toString(); } - - + + /** * {@inheritDoc} */ Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java?rev=1043047&r1=1043046&r2=1043047&view=diff ============================================================================== --- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java (original) +++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java Tue Dec 7 13:55:00 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} */