You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/04/24 00:59:26 UTC
svn commit: r1675731 -
/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
Author: elecharny
Date: Thu Apr 23 22:59:26 2015
New Revision: 1675731
URL: http://svn.apache.org/r1675731
Log:
Removed the addEnabledCipherSuites/removeEnabledCipherSuites methods from the LdapServerBean : the field is now associated with TransportBean
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=1675731&r1=1675730&r2=1675731&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 Apr 23 22:59:26 2015
@@ -94,10 +94,6 @@ public class LdapServerBean extends DSBa
@ConfigurationElement(attributeType = "ads-replPingerSleep")
private int replPingerSleep;
- /** the list of cipher suites to be used in LDAPS and StartTLS */
- @ConfigurationElement(attributeType = "ads-enabledCipherSuites", isOptional = true)
- private List<String> enabledCipherSuites = new ArrayList<String>();
-
/**
* Create a new LdapServerBean instance
@@ -413,11 +409,6 @@ public class LdapServerBean extends DSBa
sb.append( toString( tabs, " enable replication provider", replReqHandler ) );
sb.append( toString( tabs, " Pinger thread sleep time(in sec.)", replPingerSleep ) );
- 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" );
@@ -493,45 +484,6 @@ public class LdapServerBean extends DSBa
}
- public List<String> getEnabledCipherSuites()
- {
- return enabledCipherSuites;
- }
-
-
- public void setEnabledCipherSuites( List<String> enabledCipherSuites )
- {
- this.enabledCipherSuites = enabledCipherSuites;
- }
-
-
- public void clearEnabledCipherSuites()
- {
- this.enabledCipherSuites.clear();
- }
-
-
- /**
- * @param enabledCipherSuites the cipher suites to add
- */
- public void addEnabledCipherSuites( String... enabledCipherSuites )
- {
- for ( String cs : enabledCipherSuites )
- {
- this.enabledCipherSuites.add( cs );
- }
- }
-
-
- public void removeEnabledCipherSuites( String... enabledCipherSuites )
- {
- for ( String cs : enabledCipherSuites )
- {
- this.enabledCipherSuites.remove( cs );
- }
- }
-
-
/**
* {@inheritDoc}
*/