directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1643152 - /directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/
Date Fri, 05 Dec 2014 04:58:35 GMT
Author: elecharny
Date: Fri Dec  5 04:58:35 2014
New Revision: 1643152

URL: http://svn.apache.org/viewvc?rev=1643152&view=rev
Log:
o Refactored  the LdapLdapsServers page to add the missing Transports parameters for both the LDPA and LDAPS service
o The Overview page does not anymore expose the LDAP/DLAPS addresses, to keep it light

Modified:
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages.properties
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_de.properties
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_fr.properties

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java Fri Dec  5 04:58:35 2014
@@ -65,11 +65,80 @@ import org.eclipse.ui.forms.widgets.Tabl
 
 
 /**
- * This class represents the General Page of the Server Configuration Editor. We manage the following
- * parameters :
+ * This class represents the General Page of the Server Configuration Editor.
+ *  
+ * <pre>
+ * +-------------------------------------------------------------------------------+
+ * | +------------------------------------+ +------------------------------------+ |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |V LDAP Transport                | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | | [X] Enabled                    | | | |                                | | |
+ * | | |  Address  : [////////////////] | | | |                                | | |
+ * | | |  Port     : [/////////]        | | | |                                | | |
+ * | | |  nbThreads: [/////////]        | | | |                                | | |
+ * | | |  backLog  : [/////////]        | | | |                                | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |V LDAPS Transport               | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | | [X] Enabled                    | | | |                                | | |
+ * | | |  Address  : [////////////////] | | | |                                | | |
+ * | | |  Port     : [/////////]        | | | |                                | | |
+ * | | |  nbThreads: [/////////]        | | | |                                | | |
+ * | | |  backLog  : [/////////]        | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |  Server limits                 | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | |    Max time limit : [////////] | | | |    Options                     | | |
+ * | | |    Max size limit : [////////] | | | |    Options                     | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |  SSL/TLS keystore              | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | |  keystore : [////////] (browse)| | | |    Options                     | | |
+ * | | |  password : [////////////////] | | | |    Options                     | | |
+ * | | |             [X] Show password  | | | |    Options                     | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |V Advanced SSL Settings         | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | |  [X] needClientAuth            | | | |                                | | |
+ * | | |  [X] wantClientAuth            | | | |                                | | |
+ * | | |  Cipher suite :                | | | |                                | | |
+ * | | |   +-----------------+          | | | |                                | | |
+ * | | |   |                 | (add)    | | | |                                | | |
+ * | | |   |                 | (edit)   | | | |                                | | |
+ * | | |   |                 | (delete) | | | |                                | | |
+ * | | |   +-----------------+          | | | |                                | | |
+ * | | |  Enabled protocols :           | | | |                                | | |
+ * | | |   +-----------------+          | | | |                                | | |
+ * | | |   |                 | (add)    | | | |                                | | |
+ * | | |   |                 | (edit)   | | | |                                | | |
+ * | | |   |                 | (delete) | | | |                                | | |
+ * | | |   +-----------------+          | | | |                                | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | |V Advanced                      | | | |                                | | |
+ * | | +--------------------------------| | | |    Kerberos Server             | | |
+ * | | | [X] Enable TLS                 | | | |                                | | |
+ * | | | [X] Enable ServerSide PWD hash | | | |                                | | |
+ * | | |      hashing method {========} | | | |                                | | |
+ * | | | Replication pinger sleep [XXX] | | | |                                | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | +------------------------------------+ +------------------------------------+ |
+ * +-------------------------------------------------------------------------------+
+ * </pre>
+ * 
+ * We manage the following parameters :
+ * LDAP server controls. We manage :
  * <ul>
- * <li></li>
- * </ul>
+ * <li>the address</li>
+ * <li>the port</li>
+ * <li>the number of dedicated threads</li>
+ * <li>the backlog size</li>
+ * </ul> 
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -78,6 +147,8 @@ public class LdapLdapsServersPage extend
     private static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
     private static final int DEFAULT_PORT_LDAPS = 10636;
     private static final int DEFAULT_PORT_LDAP = 10389;
+    private static final int DEFAULT_NB_THREADS = 4;
+    private static final int DEFAULT_BACKLOG_SIZE = 50;
     private static final String TRANSPORT_ID_LDAP = "ldap"; //$NON-NLS-1$
     private static final String TRANSPORT_ID_LDAPS = "ldaps"; //$NON-NLS-1$
     private static final String SASL_MECHANISMS_SIMPLE = "SIMPLE"; //$NON-NLS-1$
@@ -103,14 +174,47 @@ public class LdapLdapsServersPage extend
     private static final String TITLE = Messages.getString( "LdapLdapsServersPage.LdapLdapsServers" ); //$NON-NLS-1$
 
     // UI Controls
+    /** 
+     * LDAP server controls. We manage :
+     * <ul>
+     * <li>the address</li>
+     * <li>the port</li>
+     * <li>the number of dedicated threads</li>
+     * <li>the backlog size</li>
+     * </ul> 
+     **/
     private Button enableLdapCheckbox;
     private Text ldapPortText;
     private Text ldapAddressText;
+    private Text ldapNbThreadsText;
+    private Text ldapBackLogSizeText;
+    
+    /** LDAPS server controls */
     private Button enableLdapsCheckbox;
     private Text ldapsPortText;
     private Text ldapsAddressText;
+    private Text ldapsNbThreadsText;
+    private Text ldapsBackLogSizeText;
+    private Button enableNeedClientAuthCheckbox;
+    private Button enableWantClientAuthCheckbox;
+    
+    /** The CiphersSuite controls */
+    private TableViewer ciphersSuiteTableViewer;
+    private Button addCiphersSuiteButton;
+    private Button editCiphersSuiteButton;
+    private Button deleteCiphersSuiteButton;
+    
+    /** The EnabledProtocols controls */
+    private TableViewer enabledProtocolsTableViewer;
+    private Button addEnabledProtocolsButton;
+    private Button editEnabledProtocolsButton;
+    private Button deleteEnabledProtocolsButton;
+    
+    /** LDAP limit */
     private Text maxTimeLimitText;
     private Text maxSizeLimitText;
+    
+    
     private Button authMechSimpleCheckbox;
     private Button authMechCramMd5Checkbox;
     private Button authMechDigestMd5Checkbox;
@@ -129,45 +233,226 @@ public class LdapLdapsServersPage extend
     private Button keystoreFileBrowseButton;
     private Text keystorePasswordText;
     private Button showPasswordCheckbox;
-    private TableViewer cipherSuitesTableViewer;
-    private Button addCipherSuiteButton;
-    private Button editCipherSuiteButton;
-    private Button deleteCipherSuiteButton;
     private Text replicationPingerSleepText;
     private Text diskSynchronizationDelayText;
 
     // UI Controls Listeners
-    // The LdapServer.enabled flag
+    /**
+     * The LDAP transport checkbox listener. When checked, we enable the following 
+     * widgets :
+     * <ul>
+     * <li>Port</li>
+     * <li>Address</li>
+     * <li>NbThreads</li>
+     * <li>BackLog</li>
+     * </ul>
+     */
     private SelectionAdapter enableLdapCheckboxListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            getLdapServerTransportBean().setEnabled( enableLdapCheckbox.getSelection() );
-            setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
+            boolean enabled = enableLdapCheckbox.getSelection();
+            
+            getLdapServerTransportBean().setEnabled( enabled );
+            setEnabled( ldapPortText, enabled );
+            setEnabled( ldapAddressText, enabled );
+            setEnabled( ldapNbThreadsText, enabled );
+            setEnabled( ldapBackLogSizeText, enabled );
         }
     };
+    
+    
+    /**
+     * The LDAP port modify listener
+     */
     private ModifyListener ldapPortTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
         {
-            getLdapServerTransportBean().setSystemPort( Integer.parseInt( ldapPortText.getText() ) );
+            try
+            {
+                int port = Integer.parseInt( ldapPortText.getText() );
+                
+                getLdapServerTransportBean().setTransportBackLog( port );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAP TCP Port : it must be an integer" );
+            }
+        }
+    };
+
+    
+    /**
+     * The LDAP address modify listener
+     */
+    private ModifyListener ldapAddressTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            getLdapServerTransportBean().setTransportAddress( ldapAddressText.getText() );
+        }
+    };
+
+    
+    /**
+     * The LDAP nbThreads modify listener
+     */
+    private ModifyListener ldapNbThreadsTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            try
+            {
+                int nbThreads = Integer.parseInt( ldapNbThreadsText.getText() );
+                
+                getLdapServerTransportBean().setTransportNbThreads( nbThreads );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAP NbThreads : it must be an integer" );
+            }
+        }
+    };
+
+    
+    /**
+     * The LDAP BackLogSize modify listener
+     */
+    private ModifyListener ldapBackLogSizeTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            try
+            {
+                int backLogSize = Integer.parseInt( ldapBackLogSizeText.getText() );
+                
+                getLdapServerTransportBean().setTransportBackLog( backLogSize );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAP BackLog size : it must be an integer" );
+            }
         }
     };
+    
+    
+    /**
+     * The LDAPS transport checkbox listener. When checked, we enable the following 
+     * controls :
+     * <ul>
+     * <li>Port</li>
+     * <li>Address</li>
+     * <li>NbThreads</li>
+     * <li>BackLog</li>
+     * <li>needClientAuth</li>
+     * <li>wantClientAuth</li>
+     * <li>Cipher suite (and associated buttons)</li>
+     * <li>Enabled Protocols (and associated buttons)</li>
+     * </ul>
+     */
     private SelectionAdapter enableLdapsCheckboxListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            getLdapsServerTransportBean().setEnabled( enableLdapsCheckbox.getSelection() );
-            setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
+            boolean enabled = enableLdapsCheckbox.getSelection();
+            
+            getLdapsServerTransportBean().setEnabled( enabled );
+            setEnabled( ldapsPortText, enabled );
+            setEnabled( ldapsAddressText, enabled );
+            setEnabled( ldapsNbThreadsText, enabled );
+            setEnabled( ldapsBackLogSizeText, enabled );
+            setEnabled( enableNeedClientAuthCheckbox, enabled );
+            setEnabled( enableWantClientAuthCheckbox, enabled );
+            setEnabled( ciphersSuiteTableViewer.getTable(), enabled );
+            setEnabled( addCiphersSuiteButton, enabled );
+            setEnabled( deleteCiphersSuiteButton, enabled );
+            setEnabled( editCiphersSuiteButton, enabled );
+            setEnabled( enabledProtocolsTableViewer.getTable(), enabled );
+            setEnabled( addEnabledProtocolsButton, enabled );
+            setEnabled( deleteEnabledProtocolsButton, enabled );
+            setEnabled( editEnabledProtocolsButton, enabled );
         }
     };
+    
+    
+    /**
+     * The LDAPS port modify listener
+     */
     private ModifyListener ldapsPortTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
         {
-            getLdapsServerTransportBean().setSystemPort( Integer.parseInt( ldapsPortText.getText() ) );
+            try
+            {
+                int port = Integer.parseInt( ldapsPortText.getText() );
+                
+                getLdapsServerTransportBean().setSystemPort( port );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAPS Port : it must be an integer" );
+            }
+        }
+    };
+    
+    
+    /**
+     * The LDAPS address modify listener
+     */
+    private ModifyListener ldapsAddressTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            LdapLdapsServersPage.getLdapsServerTransportBean( getDirectoryServiceBean() ).setTransportAddress( 
+                ldapsAddressText.getText() );
+        }
+    };
+
+    
+    /**
+     * The LDAPS nbThreads modify listener
+     */
+    private ModifyListener ldapsNbThreadsTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            try
+            {
+                int nbThreads = Integer.parseInt( ldapsNbThreadsText.getText() );
+                
+                getLdapsServerTransportBean().setTransportNbThreads( nbThreads );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAPS NbThreads : it must be an integer" );
+            }
         }
     };
+
+    
+    /**
+     * The LDAPS BackLogSize modify listener
+     */
+    private ModifyListener ldapsBackLogSizeTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            try
+            {
+                int backLogSize = Integer.parseInt( ldapsBackLogSizeText.getText() );
+                
+                getLdapsServerTransportBean().setTransportBackLog( backLogSize );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                System.out.println( "Wrong LDAPS BackLog size : it must be an integer" );
+            }
+        }
+    };
+    
+    
+
     private ModifyListener saslHostTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
@@ -383,67 +668,180 @@ public class LdapLdapsServersPage extend
             }
         }
     };
-    private ISelectionChangedListener cipherSuitesTableViewerSelectionChangedListener = new ISelectionChangedListener()
+    
+    
+    /**
+     * Ciphers Suite Table change
+     */
+    private ISelectionChangedListener ciphersSuiteTableViewerSelectionChangedListener = new ISelectionChangedListener()
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            StructuredSelection selection = ( StructuredSelection ) cipherSuitesTableViewer.getSelection();
+            StructuredSelection selection = ( StructuredSelection ) ciphersSuiteTableViewer.getSelection();
 
-            editCipherSuiteButton.setEnabled( !selection.isEmpty() );
-            deleteCipherSuiteButton.setEnabled( !selection.isEmpty() );
+            editCiphersSuiteButton.setEnabled( !selection.isEmpty() );
+            deleteCiphersSuiteButton.setEnabled( !selection.isEmpty() );
         }
     };
-    private IDoubleClickListener cipherSuitesTableViewerDoubleClickListener = new IDoubleClickListener()
+    
+    
+    /**
+     * Ciphers Suite Table double-click
+     */
+    private IDoubleClickListener ciphersSuiteTableViewerDoubleClickListener = new IDoubleClickListener()
     {
         public void doubleClick( DoubleClickEvent event )
         {
-            editCipherSuiteAction();
+            editCiphersSuiteAction();
         }
     };
-    private SelectionListener addCipherSuiteButtonListener = new SelectionAdapter()
+    
+
+    /**
+     * Add Ciphers Suite button
+     */
+    private SelectionListener addCiphersSuiteButtonListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            InputDialog dialog = new InputDialog( editCipherSuiteButton.getShell(),
+            InputDialog dialog = new InputDialog( editCiphersSuiteButton.getShell(),
                 Messages.getString( "LdapLdapsServersPage.Add" ), //$NON-NLS-1$
-                Messages.getString( "LdapLdapsServersPage.CipherSuite" ), //$NON-NLS-1$
+                Messages.getString( "LdapLdapsServersPage.CiphersSuite" ), //$NON-NLS-1$
                 null, null );
 
             if ( dialog.open() == InputDialog.OK )
             {
-                String newCipherSuite = dialog.getValue();
+                String newCipher = dialog.getValue();
 
-                getLdapServerBean().addEnabledCipherSuites( newCipherSuite );
+                getLdapServerBean().addEnabledCipherSuites( newCipher );
 
-                cipherSuitesTableViewer.refresh();
-                cipherSuitesTableViewer.setSelection( new StructuredSelection( newCipherSuite ) );
+                ciphersSuiteTableViewer.refresh();
+                ciphersSuiteTableViewer.setSelection( new StructuredSelection( newCipher ) );
 
                 setEditorDirty();
             }
         }
     };
-    private SelectionListener editCipherSuiteButtonListener = new SelectionAdapter()
+    
+    
+    /**
+     * Edit Ciphers Suite button
+     */
+    private SelectionListener editCiphersSuiteButtonListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            editCipherSuiteAction();
+            editCiphersSuiteAction();
         }
     };
-    private SelectionListener deleteCipherSuiteButtonListener = new SelectionAdapter()
+    
+    
+    /**
+     * Delete Ciphers Suite button
+     */
+    private SelectionListener deleteCiphersSuiteButtonListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            String selectedCipherSuite = getSelectedSslStartTlsCipherSuite();
+            String selectedCiphersSuite = getSelectedCiphersSuite();
 
-            if ( selectedCipherSuite != null )
+            if ( selectedCiphersSuite != null )
             {
-                getLdapServerBean().getEnabledCipherSuites().remove( selectedCipherSuite );
-                cipherSuitesTableViewer.refresh();
+                getLdapServerBean().getEnabledCipherSuites().remove( selectedCiphersSuite );
+                ciphersSuiteTableViewer.refresh();
 
                 setEditorDirty();
             }
         }
     };
+    
+    
+    /**
+     * Enabled Protocols Table change
+     */
+    private ISelectionChangedListener enabledProtocolsTableViewerSelectionChangedListener = new ISelectionChangedListener()
+    {
+        public void selectionChanged( SelectionChangedEvent event )
+        {
+            StructuredSelection selection = ( StructuredSelection ) enabledProtocolsTableViewer.getSelection();
+
+            editEnabledProtocolsButton.setEnabled( !selection.isEmpty() );
+            deleteEnabledProtocolsButton.setEnabled( !selection.isEmpty() );
+        }
+    };
+    
+    
+    /**
+     * Enabled Protocols Table double-click
+     */
+    private IDoubleClickListener enabledProtocolsTableViewerDoubleClickListener = new IDoubleClickListener()
+    {
+        public void doubleClick( DoubleClickEvent event )
+        {
+            editEnabledProtocolsAction();
+        }
+    };
+    
+
+    /**
+     * Add Enabled Protocols button
+     */
+    private SelectionListener addEnabledProtocolsButtonListener = new SelectionAdapter()
+    {
+        public void widgetSelected( SelectionEvent e )
+        {
+            InputDialog dialog = new InputDialog( editEnabledProtocolsButton.getShell(),
+                Messages.getString( "LdapLdapsServersPage.Add" ), //$NON-NLS-1$
+                Messages.getString( "LdapLdapsServersPage.EnabledProtocols" ), //$NON-NLS-1$
+                null, null );
+
+            if ( dialog.open() == InputDialog.OK )
+            {
+                String newEnabledProtocol = dialog.getValue();
+
+                //getLdapServerTransportBean().addEnabledProtocols( newEnabledProtocol );
+
+                enabledProtocolsTableViewer.refresh();
+                enabledProtocolsTableViewer.setSelection( new StructuredSelection( newEnabledProtocol ) );
+
+                setEditorDirty();
+            }
+        }
+    };
+    
+    
+    /**
+     * Edit Enabled Protocols button
+     */
+    private SelectionListener editEnabledProtocolsButtonListener = new SelectionAdapter()
+    {
+        public void widgetSelected( SelectionEvent e )
+        {
+            editEnabledProtocolsAction();
+        }
+    };
+    
+    
+    /**
+     * Delete Enabled Protocols button
+     */
+    private SelectionListener deleteEnabledProtocolsButtonListener = new SelectionAdapter()
+    {
+        public void widgetSelected( SelectionEvent e )
+        {
+            String selectedEnabledProtocols = getSelectedEnabledProtocols();
+
+            if ( selectedEnabledProtocols != null )
+            {
+                //getLdapsServerTransportBean().getEnabledProtocols().remove( selectedEnabledProtocols );
+                enabledProtocolsTableViewer.refresh();
+
+                setEditorDirty();
+            }
+        }
+    };
+
+    
     private ModifyListener replicationPingerSleepTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
@@ -500,7 +898,7 @@ public class LdapLdapsServersPage extend
         createLdapServerSection( toolkit, leftComposite );
         createLimitsSection( toolkit, leftComposite );
         createSslStartTlsKeystoreSection( toolkit, leftComposite );
-        createSslStartTlsCipherSuitesSection( toolkit, leftComposite );
+        createSslAdvancedSettingsSection( toolkit, leftComposite );
         createAdvancedSection( toolkit, leftComposite );
         createSupportedAuthenticationMechanismsSection( toolkit, rightComposite );
         createSaslSettingsSection( toolkit, rightComposite );
@@ -518,8 +916,8 @@ public class LdapLdapsServersPage extend
      */
     private void createLdapServerSection( FormToolkit toolkit, Composite parent )
     {
-        // Creation of the section
-        Section section = toolkit.createSection( parent, Section.TITLE_BAR );
+        // Creation of the section, expanded
+        Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED);
         section.setText( Messages.getString( "LdapLdapsServersPage.LdapLdapsServers" ) ); //$NON-NLS-1$
         section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         Composite composite = toolkit.createComposite( section );
@@ -538,7 +936,25 @@ public class LdapLdapsServersPage extend
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Port" ) ); //$NON-NLS-1$
         ldapPortText = createPortText( toolkit, composite );
-        createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
+        createDefaultValueLabel( toolkit, composite, Integer.toString( DEFAULT_PORT_LDAP ) );
+
+        // LDAP Server Address Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Address" ) ); //$NON-NLS-1$
+        ldapAddressText = createAddressText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite, DEFAULT_ADDRESS );
+
+        // LDAP Server nbThreads Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.NbThreads" ) ); //$NON-NLS-1$
+        ldapNbThreadsText = createNbThreadsText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite,  Integer.toString( DEFAULT_NB_THREADS ) );
+
+        // LDAP Server backlog Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.BackLogSize" ) ); //$NON-NLS-1$
+        ldapBackLogSizeText = createBackLogSizeText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite,  Integer.toString( DEFAULT_BACKLOG_SIZE ) );
 
         // Enable LDAPS Server Checkbox
         enableLdapsCheckbox = toolkit.createButton( composite,
@@ -549,7 +965,25 @@ public class LdapLdapsServersPage extend
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Port" ) ); //$NON-NLS-1$
         ldapsPortText = createPortText( toolkit, composite );
-        createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
+        createDefaultValueLabel( toolkit, composite, Integer.toString( DEFAULT_PORT_LDAPS ) );
+
+        // LDAPS Server Address Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Address" ) ); //$NON-NLS-1$
+        ldapsAddressText = createAddressText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite, DEFAULT_ADDRESS );
+
+        // LDAPS Server nbThreads Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.NbThreads" ) ); //$NON-NLS-1$
+        ldapsNbThreadsText = createNbThreadsText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite, Integer.toString( DEFAULT_NB_THREADS ) );
+
+        // LDAPS Server backlog Text
+        toolkit.createLabel( composite, TABULATION );
+        toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.BackLogSize" ) ); //$NON-NLS-1$
+        ldapsBackLogSizeText = createBackLogSizeText( toolkit, composite );
+        createDefaultValueLabel( toolkit, composite, Integer.toString( DEFAULT_BACKLOG_SIZE ) );
     }
 
 
@@ -561,8 +995,8 @@ public class LdapLdapsServersPage extend
      */
     private void createLimitsSection( FormToolkit toolkit, Composite parent )
     {
-        // Creation of the section
-        Section section = toolkit.createSection( parent, Section.TITLE_BAR );
+        // Creation of the section, compacted
+        Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.COMPACT );
         section.setText( Messages.getString( "LdapLdapsServersPage.Limits" ) ); //$NON-NLS-1$
         section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         Composite composite = toolkit.createComposite( section );
@@ -584,15 +1018,15 @@ public class LdapLdapsServersPage extend
 
 
     /**
-     * Creates the SSL/Start TLS Keystore Section
+     * Creates the SSL/Start TLS Section
      *
      * @param toolkit the toolkit to use
      * @param parent the parent composite
      */
     private void createSslStartTlsKeystoreSection( FormToolkit toolkit, Composite parent )
     {
-        // Creation of the section
-        Section section = toolkit.createSection( parent, Section.TITLE_BAR );
+        // Creation of the section, compacted
+        Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.COMPACT );
         section.setText( Messages.getString( "LdapLdapsServersPage.SslStartTlsKeystore" ) ); //$NON-NLS-1$
         section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         Composite composite = toolkit.createComposite( section );
@@ -624,16 +1058,22 @@ public class LdapLdapsServersPage extend
 
 
     /**
-     * Creates the SSL/Start TLS Cipher Suites Section
+     * Creates the SSL/Start TLS Section. We will deal with the following parameters :
+     * <ul>
+     * <li>needClientAuth</li>
+     * <li>wantClientAuth</li>
+     * <li>enabledProtocols</li>
+     * <li>enabledCiphersSuite</li>
+     * </ul>
      *
      * @param toolkit the toolkit to use
      * @param parent the parent composite
      */
-    private void createSslStartTlsCipherSuitesSection( FormToolkit toolkit, Composite parent )
+    private void createSslAdvancedSettingsSection( FormToolkit toolkit, Composite parent )
     {
-        // Creation of the section
+        // Creation of the section, compacted
         Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.COMPACT );
-        section.setText( Messages.getString( "LdapLdapsServersPage.SslStartTlsCipherSuites" ) ); //$NON-NLS-1$
+        section.setText( Messages.getString( "LdapLdapsServersPage.SslAdvancedSettings" ) ); //$NON-NLS-1$
         section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         Composite composite = toolkit.createComposite( section );
         toolkit.paintBordersFor( composite );
@@ -641,29 +1081,73 @@ public class LdapLdapsServersPage extend
         composite.setLayout( glayout );
         section.setClient( composite );
 
-        // Cipher Suites Table Viewer
-        cipherSuitesTableViewer = new TableViewer( composite );
-        cipherSuitesTableViewer.setContentProvider( new ArrayContentProvider() );
+        // Enable LDAPS needClientAuth Checkbox
+        enableNeedClientAuthCheckbox = toolkit.createButton( composite,
+            Messages.getString( "LdapLdapsServersPage.NeedClientAuth" ), SWT.CHECK ); //$NON-NLS-1$
+        enableNeedClientAuthCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, glayout.numColumns, 1 ) );
+
+        // Enable LDAPS needClientAuth Checkbox
+        enableWantClientAuthCheckbox = toolkit.createButton( composite,
+            Messages.getString( "LdapLdapsServersPage.WantClientAuth" ), SWT.CHECK ); //$NON-NLS-1$
+        enableWantClientAuthCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, glayout.numColumns, 1 ) );
+
+        // Ciphers Suite label 
+        Label ciphersLabel = toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.CiphersSuite" ), SWT.WRAP  ); //$NON-NLS-1$
+        setBold( ciphersLabel );
+        ciphersLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, glayout.numColumns, 1 ) );
+
+        // Ciphers Suites Table Viewer
+        ciphersSuiteTableViewer = new TableViewer( composite );
+        ciphersSuiteTableViewer.setContentProvider( new ArrayContentProvider() );
         GridData cipherSuitesTableViewerGridData = new GridData( SWT.FILL, SWT.CENTER, true, false, 1, 3 );
         cipherSuitesTableViewerGridData.heightHint = 60;
-        cipherSuitesTableViewer.getControl().setLayoutData( cipherSuitesTableViewerGridData );
+        ciphersSuiteTableViewer.getControl().setLayoutData( cipherSuitesTableViewerGridData );
 
-        // Add Cipher Suite Button
-        addCipherSuiteButton = toolkit.createButton( composite,
+        // Add Ciphers Suite Button
+        addCiphersSuiteButton = toolkit.createButton( composite,
             Messages.getString( "LdapLdapsServersPage.Add" ), SWT.PUSH ); //$NON-NLS-1$
-        addCipherSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+        addCiphersSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
 
-        // Edit Cipher Suite Button
-        editCipherSuiteButton = toolkit.createButton( composite,
+        // Edit Ciphers Suite Button
+        editCiphersSuiteButton = toolkit.createButton( composite,
             Messages.getString( "LdapLdapsServersPage.Edit" ), SWT.PUSH ); //$NON-NLS-1$
-        editCipherSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
-        editCipherSuiteButton.setEnabled( false );
+        editCiphersSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+        editCiphersSuiteButton.setEnabled( false );
 
-        // Delete Cipher Suite Button
-        deleteCipherSuiteButton = toolkit.createButton( composite,
+        // Delete Ciphers Suite Button
+        deleteCiphersSuiteButton = toolkit.createButton( composite,
             Messages.getString( "LdapLdapsServersPage.Delete" ), SWT.PUSH ); //$NON-NLS-1$
-        deleteCipherSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
-        deleteCipherSuiteButton.setEnabled( false );
+        deleteCiphersSuiteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+        deleteCiphersSuiteButton.setEnabled( false );
+
+        // Enabled Protocols label 
+        Label protocolsLabel = toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.EnabledProtocols" ), SWT.WRAP  ); //$NON-NLS-1$
+        setBold( protocolsLabel );
+        protocolsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, glayout.numColumns, 1 ) );
+
+        // Enabled Protocols Table Viewer
+        enabledProtocolsTableViewer = new TableViewer( composite );
+        enabledProtocolsTableViewer.setContentProvider( new ArrayContentProvider() );
+        GridData enabledProtocolsTableViewerGridData = new GridData( SWT.FILL, SWT.CENTER, true, false, 1, 3 );
+        enabledProtocolsTableViewerGridData.heightHint = 60;
+        enabledProtocolsTableViewer.getControl().setLayoutData( enabledProtocolsTableViewerGridData );
+
+        // Add Enabled Protocols Button
+        addEnabledProtocolsButton = toolkit.createButton( composite,
+            Messages.getString( "LdapLdapsServersPage.Add" ), SWT.PUSH ); //$NON-NLS-1$
+        addEnabledProtocolsButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+
+        // Edit Enabled Protocols Button
+        editEnabledProtocolsButton = toolkit.createButton( composite,
+            Messages.getString( "LdapLdapsServersPage.Edit" ), SWT.PUSH ); //$NON-NLS-1$
+        editEnabledProtocolsButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+        editEnabledProtocolsButton.setEnabled( false );
+
+        // Delete Enabled Protocols Button
+        deleteEnabledProtocolsButton = toolkit.createButton( composite,
+            Messages.getString( "LdapLdapsServersPage.Delete" ), SWT.PUSH ); //$NON-NLS-1$
+        deleteEnabledProtocolsButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
+        deleteEnabledProtocolsButton.setEnabled( false );
     }
 
 
@@ -894,14 +1378,38 @@ public class LdapLdapsServersPage extend
         addDirtyListener( ldapPortText );
         addModifyListener( ldapPortText, ldapPortTextListener );
 
+        // LDAP Address Text
+        addDirtyListener( ldapAddressText );
+        addModifyListener( ldapAddressText, ldapAddressTextListener );
+
+        // LDAP nbThreads Text
+        addDirtyListener( ldapNbThreadsText );
+        addModifyListener( ldapNbThreadsText, ldapNbThreadsTextListener );
+
+        // LDAP BackLogSize Text
+        addDirtyListener( ldapBackLogSizeText );
+        addModifyListener( ldapBackLogSizeText, ldapBackLogSizeTextListener );
+
         // Enable LDAPS Checkbox
         addDirtyListener( enableLdapsCheckbox );
         addSelectionListener( enableLdapsCheckbox, enableLdapsCheckboxListener );
 
+        // LDAPS Address Text
+        addDirtyListener( ldapsAddressText );
+        addModifyListener( ldapsAddressText, ldapsAddressTextListener );
+
         // LDAPS Port Text
         addDirtyListener( ldapsPortText );
         addModifyListener( ldapsPortText, ldapsPortTextListener );
 
+        // LDAPS nbThreads Text
+        addDirtyListener( ldapsNbThreadsText );
+        addModifyListener( ldapsNbThreadsText, ldapsNbThreadsTextListener );
+
+        // LDAPS BackLogSize Text
+        addDirtyListener( ldapsBackLogSizeText );
+        addModifyListener( ldapsBackLogSizeText, ldapsBackLogSizeTextListener );
+
         // Auth Mechanisms Simple Checkbox
         addDirtyListener( authMechSimpleCheckbox );
         addSelectionListener( authMechSimpleCheckbox, authMechSimpleCheckboxListener );
@@ -981,18 +1489,31 @@ public class LdapLdapsServersPage extend
         addDirtyListener( hashingMethodComboViewer );
         addSelectionChangedListener( hashingMethodComboViewer, hashingMethodComboViewerListener );
 
-        // SSL/Start TLS Cipher Suites
-        addSelectionChangedListener( cipherSuitesTableViewer, cipherSuitesTableViewerSelectionChangedListener );
-        addDoubleClickListener( cipherSuitesTableViewer, cipherSuitesTableViewerDoubleClickListener );
+        // Advanced SSL Cipher Suites
+        addSelectionChangedListener( ciphersSuiteTableViewer, ciphersSuiteTableViewerSelectionChangedListener );
+        addDoubleClickListener( ciphersSuiteTableViewer, ciphersSuiteTableViewerDoubleClickListener );
+
+        // Advanced SSL Cipher Suite
+        addSelectionListener( addCiphersSuiteButton, addCiphersSuiteButtonListener );
+
+        // Advanced SSL Cipher Suite
+        addSelectionListener( editCiphersSuiteButton, editCiphersSuiteButtonListener );
+
+        // Advanced SSL Cipher Suite
+        addSelectionListener( deleteCiphersSuiteButton, deleteCiphersSuiteButtonListener );
+
+        // Advanced SSL Enabled Protocols
+        addSelectionChangedListener( enabledProtocolsTableViewer, enabledProtocolsTableViewerSelectionChangedListener );
+        addDoubleClickListener( enabledProtocolsTableViewer, enabledProtocolsTableViewerDoubleClickListener );
 
-        // Add SSL/Start TLS Cipher Suite
-        addSelectionListener( addCipherSuiteButton, addCipherSuiteButtonListener );
+        // Advanced SSL Enabled Protocols
+        addSelectionListener( addEnabledProtocolsButton, addEnabledProtocolsButtonListener );
 
-        // Edit SSL/Start TLS Cipher Suite
-        addSelectionListener( editCipherSuiteButton, editCipherSuiteButtonListener );
+        // Advanced SSL Enabled Protocols
+        addSelectionListener( editEnabledProtocolsButton, editEnabledProtocolsButtonListener );
 
         // Delete SSL/Start TLS Cipher Suite
-        addSelectionListener( deleteCipherSuiteButton, deleteCipherSuiteButtonListener );
+        addSelectionListener( deleteEnabledProtocolsButton, deleteEnabledProtocolsButtonListener );
 
         // Replication Pinger Sleep
         addDirtyListener( replicationPingerSleepText );
@@ -1017,6 +1538,18 @@ public class LdapLdapsServersPage extend
         removeDirtyListener( ldapPortText );
         removeModifyListener( ldapPortText, ldapPortTextListener );
 
+        // LDAP Address Text
+        removeDirtyListener( ldapAddressText );
+        removeModifyListener( ldapAddressText, ldapAddressTextListener );
+
+        // LDAP NbThreads Text
+        removeDirtyListener( ldapNbThreadsText );
+        removeModifyListener( ldapNbThreadsText, ldapNbThreadsTextListener );
+
+        // LDAP BackLogSize Text
+        removeDirtyListener( ldapBackLogSizeText );
+        removeModifyListener( ldapBackLogSizeText, ldapBackLogSizeTextListener );
+
         // Enable LDAPS Checkbox
         removeDirtyListener( enableLdapsCheckbox );
         removeSelectionListener( enableLdapsCheckbox, enableLdapsCheckboxListener );
@@ -1025,6 +1558,18 @@ public class LdapLdapsServersPage extend
         removeDirtyListener( ldapsPortText );
         removeModifyListener( ldapsPortText, ldapsPortTextListener );
 
+        // LDAPS Address Text
+        removeDirtyListener( ldapsAddressText );
+        removeModifyListener( ldapsAddressText, ldapsAddressTextListener );
+
+        // LDAPS NbThreads Text
+        removeDirtyListener( ldapsNbThreadsText );
+        removeModifyListener( ldapsNbThreadsText, ldapsNbThreadsTextListener );
+
+        // LDAPS BackLogSize Text
+        removeDirtyListener( ldapsBackLogSizeText );
+        removeModifyListener( ldapsBackLogSizeText, ldapsBackLogSizeTextListener );
+
         // Auth Mechanisms Simple Checkbox
         removeDirtyListener( authMechSimpleCheckbox );
         removeSelectionListener( authMechSimpleCheckbox, authMechSimpleCheckboxListener );
@@ -1102,18 +1647,31 @@ public class LdapLdapsServersPage extend
         removeDirtyListener( hashingMethodComboViewer );
         removeSelectionChangedListener( hashingMethodComboViewer, hashingMethodComboViewerListener );
 
-        // SSL/Start TLS Cipher Suites
-        removeSelectionChangedListener( cipherSuitesTableViewer, cipherSuitesTableViewerSelectionChangedListener );
-        removeDoubleClickListener( cipherSuitesTableViewer, cipherSuitesTableViewerDoubleClickListener );
+        // Advanced SSL Cipher Suites
+        removeSelectionChangedListener( ciphersSuiteTableViewer, ciphersSuiteTableViewerSelectionChangedListener );
+        removeDoubleClickListener( ciphersSuiteTableViewer, ciphersSuiteTableViewerDoubleClickListener );
 
-        // Add SSL/Start TLS Cipher Suite
-        removeSelectionListener( addCipherSuiteButton, addCipherSuiteButtonListener );
+        // Advanced SSL Cipher Suite
+        removeSelectionListener( addCiphersSuiteButton, addCiphersSuiteButtonListener );
 
-        // Edit SSL/Start TLS Cipher Suite
-        removeSelectionListener( editCipherSuiteButton, editCipherSuiteButtonListener );
+        // Advanced SSL Cipher Suite
+        removeSelectionListener( editCiphersSuiteButton, editCiphersSuiteButtonListener );
 
-        // Delete SSL/Start TLS Cipher Suite
-        removeSelectionListener( deleteCipherSuiteButton, deleteCipherSuiteButtonListener );
+        // Advanced SSL Cipher Suite
+        removeSelectionListener( deleteCiphersSuiteButton, deleteCiphersSuiteButtonListener );
+
+        // Advanced SSL Enabled Protocols
+        removeSelectionChangedListener( enabledProtocolsTableViewer, enabledProtocolsTableViewerSelectionChangedListener );
+        removeDoubleClickListener( enabledProtocolsTableViewer, enabledProtocolsTableViewerDoubleClickListener );
+
+        // Advanced SSL Enabled Protocols
+        removeSelectionListener( addEnabledProtocolsButton, addEnabledProtocolsButtonListener );
+
+        // Advanced SSL Enabled Protocols
+        removeSelectionListener( editEnabledProtocolsButton, editEnabledProtocolsButtonListener );
+
+        // Advanced SSL Enabled Protocols
+        removeSelectionListener( deleteEnabledProtocolsButton, deleteEnabledProtocolsButtonListener );
 
         // Replication Pinger Sleep
         removeDirtyListener( replicationPingerSleepText );
@@ -1134,19 +1692,43 @@ public class LdapLdapsServersPage extend
         {
             removeListeners();
 
-            // LDAP Server
+            // LDAP Server ------------------------------------------------------------------------
             TransportBean ldapServerTransportBean = getLdapServerTransportBean();
             setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
-            setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
-            setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
+            
+            boolean ldapEnabled = enableLdapCheckbox.getSelection();
 
-            // LDAPS Server
+            setEnabled( ldapPortText, ldapEnabled );
+            setText( ldapPortText, Integer.toString( ldapServerTransportBean.getSystemPort() ) );
+
+            setEnabled( ldapAddressText, ldapEnabled );
+            setText( ldapAddressText, ldapServerTransportBean.getTransportAddress() );
+
+            setEnabled( ldapNbThreadsText, ldapEnabled );
+            setText( ldapNbThreadsText, Integer.toString( ldapServerTransportBean.getTransportNbThreads() ) );
+            
+            setEnabled( ldapBackLogSizeText, ldapEnabled );
+            setText( ldapBackLogSizeText, Integer.toString( ldapServerTransportBean.getTransportBackLog() ) );
+
+            // LDAPS Server -----------------------------------------------------------------------
             TransportBean ldapsServerTransportBean = getLdapsServerTransportBean();
             setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
-            setEnabled( enableLdapsCheckbox, enableLdapsCheckbox.getSelection() );
-            setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
 
-            // SASL Properties
+            boolean ldapsEnabled = enableLdapsCheckbox.getSelection();
+
+            setEnabled( ldapsPortText, ldapsEnabled );
+            setText( ldapsPortText, Integer.toString( ldapsServerTransportBean.getSystemPort() ) );
+
+            setEnabled( ldapsAddressText, ldapsEnabled );
+            setText( ldapsAddressText, ldapsServerTransportBean.getTransportAddress() );
+
+            setEnabled( ldapsNbThreadsText, ldapsEnabled );
+            setText( ldapsNbThreadsText, Integer.toString( ldapsServerTransportBean.getTransportNbThreads() ) );
+            
+            setEnabled( ldapsBackLogSizeText, ldapsEnabled );
+            setText( ldapsBackLogSizeText, Integer.toString( ldapsServerTransportBean.getTransportBackLog() ) );
+
+            // SASL Properties --------------------------------------------------------------------
             LdapServerBean ldapServerBean = getLdapServerBean();
             setText( saslHostText, ldapServerBean.getLdapServerSaslHost() );
             setText( saslPrincipalText, ldapServerBean.getLdapServerSaslPrincipal() );
@@ -1229,8 +1811,8 @@ public class LdapLdapsServersPage extend
             }
 
             // SSL/Start TLS Cipher Suites
-            cipherSuitesTableViewer.setInput( ldapServerBean.getEnabledCipherSuites() );
-            cipherSuitesTableViewer.refresh();
+            ciphersSuiteTableViewer.setInput( ldapServerBean.getEnabledCipherSuites() );
+            ciphersSuiteTableViewer.refresh();
 
             // Replication Pinger Sleep
             setText( replicationPingerSleepText, "" + ldapServerBean.getReplPingerSleep() ); //$NON-NLS-1$
@@ -1747,13 +2329,13 @@ public class LdapLdapsServersPage extend
 
 
     /**
-     * Gets the selected hashing method.
+     * Gets the selected Ciphers Suite 
      *
-     * @return the selected hashing method
+     * @return the selected Ciphers Suite
      */
-    private String getSelectedSslStartTlsCipherSuite()
+    private String getSelectedCiphersSuite()
     {
-        StructuredSelection selection = ( StructuredSelection ) cipherSuitesTableViewer.getSelection();
+        StructuredSelection selection = ( StructuredSelection ) ciphersSuiteTableViewer.getSelection();
 
         if ( !selection.isEmpty() )
         {
@@ -1768,26 +2350,75 @@ public class LdapLdapsServersPage extend
      * This method is called when the edit cipher suite button is clicked,
      * or when the table viewer is double clicked.
      */
-    private void editCipherSuiteAction()
+    private void editCiphersSuiteAction()
+    {
+        String selectedCiphersSuite = getSelectedCiphersSuite();
+
+        if ( selectedCiphersSuite != null )
+        {
+            InputDialog dialog = new InputDialog( editCiphersSuiteButton.getShell(),
+                Messages.getString( "LdapLdapsServersPage.Edit" ), //$NON-NLS-1$
+                Messages.getString( "LdapLdapsServersPage.CiphersSuite" ), //$NON-NLS-1$
+                selectedCiphersSuite, null );
+
+            if ( dialog.open() == InputDialog.OK )
+            {
+                String newCiphersSuite = dialog.getValue();
+
+                getLdapServerBean().getEnabledCipherSuites().remove( selectedCiphersSuite );
+                getLdapServerBean().addEnabledCipherSuites( newCiphersSuite );
+
+                ciphersSuiteTableViewer.refresh();
+                ciphersSuiteTableViewer.setSelection( new StructuredSelection( newCiphersSuite ) );
+
+                setEditorDirty();
+            }
+        }
+    }
+
+
+    /**
+     * Gets the first Enabled Protocols Table 
+     *
+     * @return the first Enabled Protocols Table
+     */
+    private String getSelectedEnabledProtocols()
+    {
+        StructuredSelection selection = ( StructuredSelection ) enabledProtocolsTableViewer.getSelection();
+
+        if ( !selection.isEmpty() )
+        {
+            return ( String ) selection.getFirstElement();
+        }
+
+        return null;
+    }
+
+
+    /**
+     * This method is called when the edit enabled protocols button is clicked,
+     * or when the table viewer is double clicked.
+     */
+    private void editEnabledProtocolsAction()
     {
-        String selectedCipherSuite = getSelectedSslStartTlsCipherSuite();
+        String selectedEnabledProtocols = getSelectedEnabledProtocols();
 
-        if ( selectedCipherSuite != null )
+        if ( selectedEnabledProtocols != null )
         {
-            InputDialog dialog = new InputDialog( editCipherSuiteButton.getShell(),
+            InputDialog dialog = new InputDialog( editEnabledProtocolsButton.getShell(),
                 Messages.getString( "LdapLdapsServersPage.Edit" ), //$NON-NLS-1$
-                Messages.getString( "LdapLdapsServersPage.CipherSuite" ), //$NON-NLS-1$
-                selectedCipherSuite, null );
+                Messages.getString( "LdapLdapsServersPage.EnabledProtocols" ), //$NON-NLS-1$
+                selectedEnabledProtocols, null );
 
             if ( dialog.open() == InputDialog.OK )
             {
-                String newCipherSuite = dialog.getValue();
+                String newEnabledProtocols = dialog.getValue();
 
-                getLdapServerBean().getEnabledCipherSuites().remove( selectedCipherSuite );
-                getLdapServerBean().addEnabledCipherSuites( newCipherSuite );
+                //getLdapServerTransportBean().getEnabledProtocols().remove( selectedEnabledProtocols );
+                //getLdapServerTransportBean().addEnabledProtocols( newEnabledProtocols );
 
-                cipherSuitesTableViewer.refresh();
-                cipherSuitesTableViewer.setSelection( new StructuredSelection( newCipherSuite ) );
+                enabledProtocolsTableViewer.refresh();
+                enabledProtocolsTableViewer.setSelection( new StructuredSelection( newEnabledProtocols ) );
 
                 setEditorDirty();
             }

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java Fri Dec  5 04:58:35 2014
@@ -59,20 +59,30 @@ import org.eclipse.ui.forms.widgets.Tabl
  * <pre>
  * +-------------------------------------------------------------------------------+
  * | +------------------------------------+ +------------------------------------+ |
- * | | +--------------------------------+ | | +--------------------------------+ | |
- * | | |                                | | | |                                | | |
- * | | |    LDAP/LDAPS Servers          | | | |    Kerberos Server             | | |
- * | | |                                | | | |                                | | |
- * | | +--------------------------------+ | | +--------------------------------+ | |
- * | | +--------------------------------+ | | +--------------------------------+ | |
- * | | |                                | | | |                                | | |
- * | | |    Partitions                  | | | |    Options                     | | |
- * | | |                                | | | |                                | | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | | LDAP/LDAPS Transport           | | | | Kerberos Server                | | |
+ * | | +--------------------------------| | | +--------------------------------+ | |
+ * | | | [X] Enabled LDAP server        | | | | [X] Enable Kerberos Server     | | |
+ * | | |  Port     : [/////////]        | | | |   Port     : [/////]           | | |
+ * | | | [X] Enabled LDAPS server       | | | | [X] Enable Kerberos ChangePwd  | | |
+ * | | |  Port     : [/////////]        | | | |   Port     : [/////]           | | |
+ * | | | <advanced LDAP/LDAPS config>   | | | | <advanced Kerberos config>     | | |
+ * | | +--------------------------------| | | +--------------------------------+ | |
+ * | | .--------------------------------. | | +--------------------------------+ | |
+ * | | | Partitions                     | | | | Options                        | | |
+ * | | +--------------------------------| | | +--------------------------------+ | |
+ * | | | +----------------------------+ | | | | [X] Allow anonymous access     | | |
+ * | | | | Partition 1                | | | | | [X] Enable Access Control      | | |
+ * | | | | Partition 2                | | | | |                                | | |
+ * | | | | ...                        | | | | |                                | | |
+ * | | | +----------------------------+ | | | |                                | | |
+ * | | | <advanced partitionsS config>  | | | |                                | | |
  * | | +--------------------------------+ | | +--------------------------------+ | |
  * | +------------------------------------+ +------------------------------------+ |
- * +-------------------------------------------------------------------------------+
  * </pre>
  * 
+ * We just expose the more frequent parameters in this page.
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class OverviewPage extends ServerConfigurationEditorPage
@@ -87,11 +97,9 @@ public class OverviewPage extends Server
     /** LDAP Server controls */
     private Button enableLdapCheckbox;
     private Text ldapPortText;
-    private Text ldapAddressText;
     private Button enableLdapsCheckbox;
     private Text ldapsPortText;
-    private Text ldapsAddressText;
-    // This links open the extended LDAP/DLAPS configuration tab
+    // This link opens the advanced LDAP/LDAPS configuration tab 
     private Hyperlink openLdapConfigurationLink;
     
     /** Kerberos Server controls */
@@ -108,11 +116,14 @@ public class OverviewPage extends Server
     // This link open the advanced partitions configuration Tab */
     private Hyperlink openPartitionsConfigurationLink;
 
-    /** The Options controls */
+    /** The LDAP Options controls */
     private Button allowAnonymousAccessCheckbox;
     private Button enableAccessControlCheckbox;
 
     // UI Control Listeners
+    /**
+     * The LDAP transport checkbox listener.
+     */
     private SelectionAdapter enableLdapCheckboxListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
@@ -120,7 +131,6 @@ public class OverviewPage extends Server
             LdapLdapsServersPage.getLdapServerTransportBean( getDirectoryServiceBean() ).setEnabled(
                 enableLdapCheckbox.getSelection() );
             setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
-            setEnabled( ldapAddressText, enableLdapCheckbox.getSelection() );
         }
     };
 
@@ -136,19 +146,6 @@ public class OverviewPage extends Server
                 Integer.parseInt( ldapPortText.getText() ) );
         }
     };
-
-    
-    /**
-     * The Ldap address modify listener
-     */
-    private ModifyListener ldapAddressTextListener = new ModifyListener()
-    {
-        public void modifyText( ModifyEvent e )
-        {
-            LdapLdapsServersPage.getLdapServerTransportBean( getDirectoryServiceBean() ).setTransportAddress( 
-                ldapAddressText.getText() );
-        }
-    };
     
     
     private SelectionAdapter enableLdapsCheckboxListener = new SelectionAdapter()
@@ -158,7 +155,6 @@ public class OverviewPage extends Server
             LdapLdapsServersPage.getLdapsServerTransportBean( getDirectoryServiceBean() ).setEnabled(
                 enableLdapsCheckbox.getSelection() );
             setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
-            setEnabled( ldapsAddressText, enableLdapsCheckbox.getSelection() );
         }
     };
 
@@ -176,18 +172,6 @@ public class OverviewPage extends Server
     };
 
     
-    /**
-     * The Ldaps address modify listener
-     */
-    private ModifyListener ldapsAddressTextListener = new ModifyListener()
-    {
-        public void modifyText( ModifyEvent e )
-        {
-            LdapLdapsServersPage.getLdapsServerTransportBean( getDirectoryServiceBean() ).setTransportAddress( 
-                ldapsAddressText.getText() );
-        }
-    };
-    
     private HyperlinkAdapter openLdapConfigurationLinkListener = new HyperlinkAdapter()
     {
         public void linkActivated( HyperlinkEvent e )
@@ -339,12 +323,6 @@ public class OverviewPage extends Server
         ldapPortText = createPortText( toolkit, composite );
         createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
 
-        // LDAP Server Address Text
-        toolkit.createLabel( composite, TABULATION );
-        toolkit.createLabel( composite, Messages.getString( "OverviewPage.Address" ) ); //$NON-NLS-1$
-        ldapAddressText = createAddressText( toolkit, composite );
-        createDefaultValueLabel( toolkit, composite, "0.0.0.0" ); //$NON-NLS-1$
-
         // Enable LDAPS Server Checkbox
         enableLdapsCheckbox = toolkit.createButton( composite,
             Messages.getString( "OverviewPage.EnableLdapsServer" ), SWT.CHECK ); //$NON-NLS-1$
@@ -356,12 +334,6 @@ public class OverviewPage extends Server
         ldapsPortText = createPortText( toolkit, composite );
         createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
 
-        // LDAPS Server Address Text
-        toolkit.createLabel( composite, TABULATION );
-        toolkit.createLabel( composite, Messages.getString( "OverviewPage.Address" ) ); //$NON-NLS-1$
-        ldapsAddressText = createAddressText( toolkit, composite );
-        createDefaultValueLabel( toolkit, composite, "0.0.0.0" ); //$NON-NLS-1$
-
         // LDAP Configuration Link
         openLdapConfigurationLink = toolkit.createHyperlink( composite,
             Messages.getString( "OverviewPage.AdvancedLdapLdapsConfiguration" ), SWT.NONE ); //$NON-NLS-1$
@@ -510,10 +482,6 @@ public class OverviewPage extends Server
         addDirtyListener( ldapPortText );
         addModifyListener( ldapPortText, ldapPortTextListener );
 
-        // LDAP Address Text
-        addDirtyListener( ldapAddressText );
-        addModifyListener( ldapAddressText, ldapAddressTextListener );
-
         // Enable LDAPS Checkbox
         addDirtyListener( enableLdapsCheckbox );
         addSelectionListener( enableLdapsCheckbox, enableLdapsCheckboxListener );
@@ -522,10 +490,6 @@ public class OverviewPage extends Server
         addDirtyListener( ldapsPortText );
         addModifyListener( ldapsPortText, ldapsPortTextListener );
 
-        // LDAPS Address Text
-        addDirtyListener( ldapsAddressText );
-        addModifyListener( ldapsAddressText, ldapsAddressTextListener );
-
         // Enable Kerberos Checkbox
         addDirtyListener( enableKerberosCheckbox );
         addSelectionListener( enableKerberosCheckbox, enableKerberosCheckboxListener );
@@ -565,10 +529,6 @@ public class OverviewPage extends Server
         removeDirtyListener( ldapPortText );
         removeModifyListener( ldapPortText, ldapPortTextListener );
 
-        // LDAP Address Text
-        removeDirtyListener( ldapAddressText );
-        removeModifyListener( ldapAddressText, ldapAddressTextListener );
-
         // Enable LDAPS Checkbox
         removeDirtyListener( enableLdapsCheckbox );
         removeSelectionListener( enableLdapsCheckbox, enableLdapsCheckboxListener );
@@ -577,10 +537,6 @@ public class OverviewPage extends Server
         removeDirtyListener( ldapsPortText );
         removeModifyListener( ldapsPortText, ldapsPortTextListener );
 
-        // LDAPS Address Text
-        removeDirtyListener( ldapsAddressText );
-        removeModifyListener( ldapsAddressText, ldapsAddressTextListener );
-
         // Enable Kerberos Checkbox
         removeDirtyListener( enableKerberosCheckbox );
         removeSelectionListener( enableKerberosCheckbox, enableKerberosCheckboxListener );
@@ -624,8 +580,6 @@ public class OverviewPage extends Server
             setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
             setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
             setText( ldapPortText, Integer.toString( ldapServerTransportBean.getSystemPort() ) );
-            setEnabled( ldapAddressText, enableLdapCheckbox.getSelection() );
-            setText( ldapAddressText, ldapServerTransportBean.getTransportAddress() );
 
             // LDAPS Server
             TransportBean ldapsServerTransportBean = LdapLdapsServersPage
@@ -633,8 +587,6 @@ public class OverviewPage extends Server
             setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
             setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
             setText( ldapsPortText, Integer.toString( ldapsServerTransportBean.getSystemPort() ) );
-            setEnabled( ldapsAddressText, enableLdapsCheckbox.getSelection() );
-            setText( ldapsAddressText, ldapsServerTransportBean.getTransportAddress() );
 
             // Kerberos Server
             KdcServerBean kdcServerBean = KerberosServerPage.getKdcServerBean( directoryServiceBean );

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java Fri Dec  5 04:58:35 2014
@@ -46,9 +46,8 @@ import org.eclipse.swt.events.SelectionL
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -56,9 +55,7 @@ import org.eclipse.swt.widgets.Composite
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolTip;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
@@ -265,6 +262,7 @@ public abstract class ServerConfiguratio
         GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
         gd.widthHint = 42;
         portText.setLayoutData( gd );
+        
         portText.addVerifyListener( new VerifyListener()
         {
             public void verifyText( VerifyEvent e )
@@ -273,15 +271,16 @@ public abstract class ServerConfiguratio
                 // any value between 0 and 65535
                 // Skip spaces on both sides
                 char[] port = e.text.trim().toCharArray();
-                
+
                 if ( port.length > 0 )
                 {
                     for ( char c : port )
                     {
-                        if ( ( c < '0' ) && ( c > '9' ) )
+                        if ( ( c < '0' ) || ( c > '9' ) )
                         {
                             // This is an error
                             e.doit = false;
+                            break;
                         }
                     }
                 }
@@ -341,6 +340,99 @@ public abstract class ServerConfiguratio
 
 
     /**
+     * Creates a Text that can be used to enter the number of threads
+     * (which limit is 999)
+     *
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @return a Text that can be used to enter the number of threads
+     */
+    protected Text createNbThreadsText( FormToolkit toolkit, Composite parent )
+    {
+        Text nbThreadsText = toolkit.createText( parent, "" ); //$NON-NLS-1$
+        GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
+        gd.widthHint = 42;
+        nbThreadsText.setLayoutData( gd );
+        
+        nbThreadsText.addVerifyListener( new VerifyListener()
+        {
+            public void verifyText( VerifyEvent e )
+            {
+                // Check that it's a valid number of threads. It should be
+                // any value between 0 and 999
+                // Skip spaces on both sides
+                char[] nbThreads = e.text.trim().toCharArray();
+
+                if ( nbThreads.length > 0 )
+                {
+                    for ( char c : nbThreads )
+                    {
+                        if ( ( c < '0' ) || ( c > '9' ) )
+                        {
+                            // This is an error
+                            e.doit = false;
+                            break;
+                        }
+                    }
+                }
+            }
+        } );
+        
+        
+        // We can't have more than 999 threads
+        nbThreadsText.setTextLimit( 3 );
+
+        return nbThreadsText;
+    }
+
+
+    /**
+     * Creates a Text that can be used to enter the backLog size
+     *
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @return a Text that can be used to enter the backlog size
+     */
+    protected Text createBackLogSizeText( FormToolkit toolkit, Composite parent )
+    {
+        Text backLogSizetText = toolkit.createText( parent, "" ); //$NON-NLS-1$
+        GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
+        gd.widthHint = 42;
+        backLogSizetText.setLayoutData( gd );
+        
+        backLogSizetText.addVerifyListener( new VerifyListener()
+        {
+            public void verifyText( VerifyEvent e )
+            {
+                // Check that it's a valid size. It should be
+                // any value between 0 and 99999
+                // Skip spaces on both sides
+                char[] backlogSize = e.text.trim().toCharArray();
+
+                if ( backlogSize.length > 0 )
+                {
+                    for ( char c : backlogSize )
+                    {
+                        if ( ( c < '0' ) || ( c > '9' ) )
+                        {
+                            // This is an error
+                            e.doit = false;
+                            break;
+                        }
+                    }
+                }
+            }
+        } );
+        
+        
+        // the backlog size can only have 5 chars max
+        backLogSizetText.setTextLimit( 5 );
+
+        return backLogSizetText;
+    }
+
+
+    /**
      * Creates a Text that can be used to enter an integer.
      *
      * @param toolkit the toolkit
@@ -382,6 +474,22 @@ public abstract class ServerConfiguratio
 
         return label;
     }
+
+
+    /**
+     * Set some Label to Bold
+     *
+     * @param label the Label we want to see as Bold
+     * @return a Label with bold text
+     */
+    protected Label setBold( Label label )
+    {
+        FontData fontData = label.getFont().getFontData()[0];
+        Font font = new Font( label.getDisplay(), new FontData( fontData.getName(), fontData.getHeight(), SWT.BOLD ) );
+        label.setFont( font );
+
+        return label;
+    }
 
 
     /**

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages.properties?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages.properties Fri Dec  5 04:58:35 2014
@@ -43,13 +43,16 @@ KerberosServerPage.TicketSettings=Ticket
 KerberosServerPage.VerifyBodyChecksum=Verify Body Checksum
 
 LdapLdapsServersPage.Add=Add...
+LdapLdapsServersPage.Address=Address:
 LdapLdapsServersPage.Advanced=Advanced
+LdapLdapsServersPage.BackLogSize=BackLog Size:
 LdapLdapsServersPage.Browse=Browse...
-LdapLdapsServersPage.CipherSuite=Cipher Suite:
+LdapLdapsServersPage.CiphersSuite=Ciphers Suite:
 LdapLdapsServersPage.Delete=Delete
 LdapLdapsServersPage.Edit=Edit...
 LdapLdapsServersPage.EnableLdapServer=Enable LDAP Server
 LdapLdapsServersPage.EnableLdapsServer=Enable LDAPS Server
+LdapLdapsServersPage.EnabledProtocols=Enabled Protocols:
 LdapLdapsServersPage.EnableServerSidePasswordHashing=Enable server-side password hashing
 LdapLdapsServersPage.EnableTls=Enable TLS
 LdapLdapsServersPage.HashingMethod=Hashing Method:
@@ -58,6 +61,8 @@ LdapLdapsServersPage.LdapLdapsServers=LD
 LdapLdapsServersPage.Limits=Limits
 LdapLdapsServersPage.MaxSizeLimit=Max Size Limit (entries):
 LdapLdapsServersPage.MaxTimeLimit=Max Time Limit (ms):
+LdapLdapsServersPage.NbThreads=NbThreads:
+LdapLdapsServersPage.NeedClientAuth=Need Client Auth
 LdapLdapsServersPage.Password=Password:
 LdapLdapsServersPage.Port=Port:
 LdapLdapsServersPage.Provider=Provider:
@@ -66,9 +71,10 @@ LdapLdapsServersPage.SaslPrincipal=SASL
 LdapLdapsServersPage.SaslSettings=SASL Settings
 LdapLdapsServersPage.SearchBaseDn=Search Base Dn:
 LdapLdapsServersPage.ShowPassword=Show password
+LdapLdapsServersPage.SslAdvancedSettings=SSL Advanced Settings
 LdapLdapsServersPage.SslStartTlsKeystore=SSL/Start TLS Keystore
-LdapLdapsServersPage.SslStartTlsCipherSuites=SSL/Start TLS Cipher Suites
 LdapLdapsServersPage.SupportedAuthenticationMechanisms=Supported Authentication Mechanisms
+LdapLdapsServersPage.WantClientAuth=Want Client Auth
 
 LoadingPage.LoadingConfiguration=Loading Configuration
 LoadingPage.LoadingConfigurationEllipsis=Loading Configuration...
@@ -92,7 +98,6 @@ OverviewPage.Options=Options
 OverviewPage.Overview=Overview
 OverviewPage.Partitions=Partitions
 OverviewPage.Port=Port:
-OverviewPage.Address=Address:
 OverviewPage.ThereAreXPartitionsDefined=There are {0} partitions defined:
 OverviewPage.ThereIsOnePartitionDefined=There is one partition defined:
 

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_de.properties?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_de.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_de.properties Fri Dec  5 04:58:35 2014
@@ -43,12 +43,16 @@ KerberosServerPage.TicketSettings=Ticket
 KerberosServerPage.VerifyBodyChecksum=Ticket Checksumme verifizieren
 
 LdapLdapsServersPage.Add=Hinzuf\u00FCgen...
+LdapLdapsServersPage.Address=Adressen:
 LdapLdapsServersPage.Advanced=Erweitert
+LdapLdapsServersPage.BackLogSize=BackLog Gr\u00F6\u00DFe:
 LdapLdapsServersPage.Browse=Browsen...
+LdapLdapsServersPage.CiphersSuite=(EN)Ciphers Suite:
 LdapLdapsServersPage.Delete=L\u00F6schen
 LdapLdapsServersPage.Edit=Bearbeiten...
 LdapLdapsServersPage.EnableLdapServer=LDAP Server aktivieren
 LdapLdapsServersPage.EnableLdapsServer=LDAPS Server aktivieren
+LdapLdapsServersPage.EnabledProtocols=(EN)Enabled Protocols:
 LdapLdapsServersPage.EnableServerSidePasswordHashing=Passworte serverseitig hashen
 LdapLdapsServersPage.EnableTls=TLS aktivieren
 LdapLdapsServersPage.HashingMethod=Hash Methode:
@@ -57,6 +61,8 @@ LdapLdapsServersPage.LdapLdapsServers=LD
 LdapLdapsServersPage.Limits=Begrenzungen
 LdapLdapsServersPage.MaxSizeLimit=Max. Anzahl (Eintra\u00E4ge):
 LdapLdapsServersPage.MaxTimeLimit=Max. Zeit (ms):
+LdapLdapsServersPage.NbThreads=Threads Anzahl:
+LdapLdapsServersPage.NeedClientAuth=(EN)Need Client Auth
 LdapLdapsServersPage.Password=Passwort:
 LdapLdapsServersPage.Port=Port:
 LdapLdapsServersPage.Provider=Provider:
@@ -65,8 +71,10 @@ LdapLdapsServersPage.SaslPrincipal=SASL
 LdapLdapsServersPage.SaslSettings=SASL Einstellungen
 LdapLdapsServersPage.SearchBaseDn=Suchbasis DN:
 LdapLdapsServersPage.ShowPassword=Passwort anzeigen
+LdapLdapsServersPage.SslAdvancedSettings=(EN)SSL Advanced Settings
 LdapLdapsServersPage.SslStartTlsKeystore=SSL/Start TLS Keystore
 LdapLdapsServersPage.SupportedAuthenticationMechanisms=Unterst\u00FCtzte Autentifizierungsmechanismen
+LdapLdapsServersPage.WantClientAuth=Want Client Auth
 
 LoadingPage.LoadingConfiguration=Konfiguration wird geladen
 LoadingPage.LoadingConfigurationEllipsis=Konfiguration wird geladen...
@@ -90,7 +98,6 @@ OverviewPage.Options=Optionen
 OverviewPage.Overview=\u00DCbersicht
 OverviewPage.Partitions=Partitionen
 OverviewPage.Port=Port:
-OverviewPage.Address=Adressen:
 OverviewPage.ThereAreXPartitionsDefined={0} Partitionen sind definiert:
 OverviewPage.ThereIsOnePartitionDefined=Eine Partition ist definiert:
 

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_fr.properties?rev=1643152&r1=1643151&r2=1643152&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_fr.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/messages_fr.properties Fri Dec  5 04:58:35 2014
@@ -43,12 +43,16 @@ KerberosServerPage.TicketSettings=Régla
 KerberosServerPage.VerifyBodyChecksum=Vérifier la somme de contrôle du corps
 
 LdapLdapsServersPage.Add=Ajouter...
+LdapLdapsServersPage.Address=Adresse:
 LdapLdapsServersPage.Advanced=Avancé
+LdapLdapsServersPage.BackLogSize=Taille BackLog:
 LdapLdapsServersPage.Browse=Parcourir...
+LdapLdapsServersPage.CiphersSuite=Ciphers authorisés:
 LdapLdapsServersPage.Delete=Supprimer
 LdapLdapsServersPage.Edit=Editer...
 LdapLdapsServersPage.EnableLdapServer=Activer le serveur LDAP
 LdapLdapsServersPage.EnableLdapsServer=Activer le serveur LDAPS
+LdapLdapsServersPage.EnabledProtocols=Protocoles Authoriséss:
 LdapLdapsServersPage.EnableServerSidePasswordHashing=Activer le hachage du mot passe coté serveur
 LdapLdapsServersPage.EnableTls=Activer TLS
 LdapLdapsServersPage.HashingMethod=Méthod de hachage:
@@ -57,6 +61,8 @@ LdapLdapsServersPage.LdapLdapsServers=Se
 LdapLdapsServersPage.Limits=Limites
 LdapLdapsServersPage.MaxSizeLimit=Limite de taille max (entrées):
 LdapLdapsServersPage.MaxTimeLimit=Limite de temps max (ms):
+LdapLdapsServersPage.NbThreads=Nombre de Threads:
+LdapLdapsServersPage.NeedClientAuth=Authentification Client Demandée
 LdapLdapsServersPage.Password=Mot de passe:
 LdapLdapsServersPage.Port=Port:
 LdapLdapsServersPage.Provider=Fournisseur:
@@ -65,8 +71,10 @@ LdapLdapsServersPage.SaslPrincipal=SASL
 LdapLdapsServersPage.SaslSettings=Réglages SASL
 LdapLdapsServersPage.SearchBaseDn=Search Base Dn:
 LdapLdapsServersPage.ShowPassword=Show password
+LdapLdapsServersPage.SslAdvancedSettings=SSL Options Avancées
 LdapLdapsServersPage.SslStartTlsKeystore=Magasin de clé SSL/Start TLS
 LdapLdapsServersPage.SupportedAuthenticationMechanisms=Méchanismes d'authentification supportés
+LdapLdapsServersPage.WantClientAuth=Authentification Client Exigée
 
 LoadingPage.LoadingConfiguration=Chargement de la configuration
 LoadingPage.LoadingConfigurationEllipsis=Chargement de la configuration...
@@ -90,7 +98,6 @@ OverviewPage.Options=Options
 OverviewPage.Overview=Vue d'ensemble
 OverviewPage.Partitions=Partitions
 OverviewPage.Port=Port:
-OverviewPage.Address=Adresse:
 OverviewPage.ThereAreXPartitionsDefined=Il y a {0} partitions définies :
 OverviewPage.ThereIsOnePartitionDefined=Il y a une partition définie :
 



Mime
View raw message