Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B003F7E8 for ; Mon, 6 May 2013 13:32:10 +0000 (UTC) Received: (qmail 59568 invoked by uid 500); 6 May 2013 13:32:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 59464 invoked by uid 500); 6 May 2013 13:32:08 -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 59452 invoked by uid 99); 6 May 2013 13:32:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 May 2013 13:32:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 06 May 2013 13:32:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CF4123889F1; Mon, 6 May 2013 13:31:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479565 - /directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Date: Mon, 06 May 2013 13:31:44 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130506133144.7CF4123889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon May 6 13:31:44 2013 New Revision: 1479565 URL: http://svn.apache.org/r1479565 Log: Added utility methods related to the "cipher suites" field. Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java 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=1479565&r1=1479564&r2=1479565&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 Mon May 6 13:31:44 2013 @@ -98,6 +98,7 @@ public class LdapServerBean extends DSBa @ConfigurationElement(attributeType = "ads-enabledCipherSuites", isOptional = true) private List enabledCipherSuites = new ArrayList(); + /** * Create a new LdapServerBean instance */ @@ -411,12 +412,12 @@ public class LdapServerBean extends DSBa sb.append( toString( tabs, " confidentiality required", confidentialityRequired ) ); sb.append( toString( tabs, " enable replication provider", replReqHandler ) ); sb.append( toString( tabs, " Pinger thread sleep time(in sec.)", replPingerSleep ) ); - - if( ( enabledCipherSuites != null ) && !enabledCipherSuites.isEmpty() ) + + if ( ( enabledCipherSuites != null ) && !enabledCipherSuites.isEmpty() ) { sb.append( toString( tabs, " enabled cipher suites", enabledCipherSuites.toString() ) ); } - + if ( ( extendedOpHandlers != null ) && ( extendedOpHandlers.size() > 0 ) ) { sb.append( tabs ).append( " extended operation handlers :\n" ); @@ -503,7 +504,13 @@ public class LdapServerBean extends DSBa this.enabledCipherSuites = enabledCipherSuites; } - + + public void clearEnabledCipherSuites() + { + this.enabledCipherSuites.clear(); + } + + /** * @param enabledCipherSuites the cipher suites to add */ @@ -515,7 +522,16 @@ public class LdapServerBean extends DSBa } } - + + public void removeEnabledCipherSuites( String... enabledCipherSuites ) + { + for ( String cs : enabledCipherSuites ) + { + this.enabledCipherSuites.remove( cs ); + } + } + + /** * {@inheritDoc} */