directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1643086 - in /directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2: ./ editor/ jobs/
Date Mon, 15 Dec 2014 17:12:26 GMT
Author: elecharny
Date: Wed Dec  3 10:44:51 2014
New Revision: 1643086

URL: http://svn.apache.org/r1643086
Log:
o Added some input boxes for the LDAP and LDAPS addresses in the Overview page
o Renamed the getTRansportBean to getLdap(s)TransportBean in LdapLdapsServersPage
o Added some Javadoc
o Other minor formatings

Modified:
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java
    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/ServerConfigurationEditor.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
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.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/ApacheDS2ConfigurationContentDescriber.java?rev=1643086&r1=1643085&r2=1643086&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java Wed Dec  3 10:44:51 2014
@@ -75,9 +75,11 @@ public class ApacheDS2ConfigurationConte
     public int describe( Reader contents, IContentDescription description ) throws IOException
     {
         LdifReader reader = null;
+        
         try
         {
             reader = new LdifReader( contents );
+            
             return isValid( reader );
         }
         catch ( LdapException e )
@@ -100,9 +102,11 @@ public class ApacheDS2ConfigurationConte
     public int describe( InputStream contents, IContentDescription description ) throws IOException
     {
         LdifReader reader = null;
+        
         try
         {
             reader = new LdifReader( contents );
+            
             return isValid( reader );
         }
         catch ( LdapException e )
@@ -129,10 +133,10 @@ public class ApacheDS2ConfigurationConte
 
 
     /**
-     * Indicates if the given {@link Reader} is a valid server configuration.
+     * Indicates if the given {@link Reader} is a valid server configuration. It can either 
+     * contain the "ou=config" entry or the "ads-directoryServiceId=default,ou=config" entry
      *
-     * @param reader
-     *      the LDIF reader
+     * @param reader the LDIF reader
      * @return
      *      <code>ITextContentDescriber.VALID</code> if the given LDIF reader is a valid server 
      *      configuration, <code>ITextContentDescriber.INVALID</code> if not
@@ -155,23 +159,19 @@ public class ApacheDS2ConfigurationConte
             checkedEntries++;
 
             // Checking if this is the config entry
-            if ( !configEntryFound )
+            if ( ( !configEntryFound ) &&
+                 ( configEntryDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) ) )
             {
-                if ( configEntryDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) )
-                {
-                    configEntryFound = true;
-                    continue;
-                }
+                configEntryFound = true;
+                continue;
             }
 
             // Checking if this is the directory service entry
-            if ( !directoryServiceEntryFound )
+            if ( ( !directoryServiceEntryFound ) &&
+                 ( directoryServiceDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) ) )
             {
-                if ( directoryServiceDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) )
-                {
-                    directoryServiceEntryFound = true;
-                    continue;
-                }
+                directoryServiceEntryFound = true;
+                continue;
             }
         }
 

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.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/ApacheDS2ConfigurationPlugin.java?rev=1643086&r1=1643085&r2=1643086&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Wed Dec  3 10:44:51 2014
@@ -84,10 +84,8 @@ public class ApacheDS2ConfigurationPlugi
     /**
      * Gets the schema manager.
      *
-     * @return
-     *      the schema manager
-     * @throws Exception
-     *      if an error occurs when initializing the schema manager
+     * @return the schema manager
+     * @throws Exception if an error occurs when initializing the schema manager
      */
     public SchemaManager getSchemaManager() throws Exception
     {
@@ -115,8 +113,7 @@ public class ApacheDS2ConfigurationPlugi
     /**
      * Returns the shared instance.
      *
-     * @return
-     *      the shared instance
+     * @return the shared instance
      */
     public static ApacheDS2ConfigurationPlugin getDefault()
     {
@@ -128,8 +125,7 @@ public class ApacheDS2ConfigurationPlugi
      * Use this method to get SWT images. Use the IMG_ constants from
      * PluginConstants for the key.
      *
-     * @param key
-     *                The key (relative path to the image in filesystem)
+     * @param key The key (relative path to the image in filesystem)
      * @return The image descriptor or null
      */
     public ImageDescriptor getImageDescriptor( String key )
@@ -137,10 +133,15 @@ public class ApacheDS2ConfigurationPlugi
         if ( key != null )
         {
             URL url = FileLocator.find( getBundle(), new Path( key ), null );
+            
             if ( url != null )
+            {
                 return ImageDescriptor.createFromURL( url );
+            }
             else
+            {
                 return null;
+            }
         }
         else
         {
@@ -157,22 +158,24 @@ public class ApacheDS2ConfigurationPlugi
      * Note: Don't dispose the returned SWT Image. It is disposed
      * automatically when the plugin is stopped.
      *
-     * @param key
-     *                The key (relative path to the image in filesystem)
+     * @param keynThe key (relative path to the image in filesystem)
      * @return The SWT Image or null
      */
     public Image getImage( String key )
     {
         Image image = getImageRegistry().get( key );
+        
         if ( image == null )
         {
             ImageDescriptor id = getImageDescriptor( key );
+            
             if ( id != null )
             {
                 image = id.createImage();
                 getImageRegistry().put( key, image );
             }
         }
+        
         return image;
     }
 
@@ -180,8 +183,7 @@ public class ApacheDS2ConfigurationPlugi
     /**
      * Gets the plugin properties.
      *
-     * @return
-     *      the plugin properties
+     * @return the plugin properties
      */
     public PropertyResourceBundle getPluginProperties()
     {

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.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/Messages.java?rev=1643086&r1=1643085&r2=1643086&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java Wed Dec  3 10:44:51 2014
@@ -24,6 +24,11 @@ import java.util.MissingResourceExceptio
 import java.util.ResourceBundle;
 
 
+/**
+ * The class that returns messages based on a given key.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
 public class Messages
 {
     private static final String BUNDLE_NAME = "org.apache.directory.studio.apacheds.configuration.v2.messages"; //$NON-NLS-1$
@@ -31,11 +36,20 @@ public class Messages
     private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
 
 
+    /**
+     * Private constructor
+     */
     private Messages()
     {
     }
 
 
+    /**
+     * Returns the message associated to a key
+     * 
+     * @param key The message we want to retrieve
+     * @return The message associated with a given key
+     */
     public static String getString( String key )
     {
         try

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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -32,6 +32,7 @@ import org.apache.directory.server.confi
 import org.apache.directory.server.config.beans.InterceptorBean;
 import org.apache.directory.server.config.beans.LdapServerBean;
 import org.apache.directory.server.config.beans.SaslMechHandlerBean;
+import org.apache.directory.server.config.beans.TcpTransportBean;
 import org.apache.directory.server.config.beans.TransportBean;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -64,7 +65,11 @@ import org.eclipse.ui.forms.widgets.Tabl
 
 
 /**
- * This class represents the General Page of the Server Configuration Editor.
+ * This class represents the General Page of the Server Configuration Editor. We manage the following
+ * parameters :
+ * <ul>
+ * <li></li>
+ * </ul>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -100,8 +105,10 @@ public class LdapLdapsServersPage extend
     // UI Controls
     private Button enableLdapCheckbox;
     private Text ldapPortText;
+    private Text ldapAddressText;
     private Button enableLdapsCheckbox;
     private Text ldapsPortText;
+    private Text ldapsAddressText;
     private Text maxTimeLimitText;
     private Text maxSizeLimitText;
     private Button authMechSimpleCheckbox;
@@ -130,6 +137,7 @@ public class LdapLdapsServersPage extend
     private Text diskSynchronizationDelayText;
 
     // UI Controls Listeners
+    // The LdapServer.enabled flag
     private SelectionAdapter enableLdapCheckboxListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
@@ -1304,12 +1312,10 @@ public class LdapLdapsServersPage extend
 
 
     /**
-     * Gets the LDAP Server bean.
+     * Gets the LDAP Server bean for a given DirectoryService, or create a new one.
      *
-     * @param directoryServiceBean
-     *      the directory service bean
-     * @return
-     *      the LDAP Server bean
+     * @param directoryServiceBean the directory service bean
+     * @return the LDAP Server bean
      */
     public static LdapServerBean getLdapServerBean( DirectoryServiceBean directoryServiceBean )
     {
@@ -1317,6 +1323,7 @@ public class LdapLdapsServersPage extend
 
         if ( ldapServerBean == null )
         {
+            // We don't have any LdapServer associated with this DirectoryService, create one
             ldapServerBean = new LdapServerBean();
             directoryServiceBean.addServers( ldapServerBean );
         }
@@ -1328,87 +1335,78 @@ public class LdapLdapsServersPage extend
     /**
      * Gets the LDAP Server transport bean.
      *
-     * @return
-     *      the LDAP Server transport bean
+     * @return the LDAP Server transport bean
      */
     private TransportBean getLdapServerTransportBean()
     {
-        return getTransportBean( TRANSPORT_ID_LDAP );
+        return getLdapTransportBean( TRANSPORT_ID_LDAP );
     }
 
 
     /**
      * Gets the LDAP Server transport bean.
      *
-     * @param directoryServiceBean
-     *      the directory service bean
-     * @return
-     *      the LDAP Server transport bean
+     * @param directoryServiceBean the directory service bean
+     * @return the LDAP Server transport bean
      */
     public static TransportBean getLdapServerTransportBean( DirectoryServiceBean directoryServiceBean )
     {
-        return getTransportBean( directoryServiceBean, TRANSPORT_ID_LDAP );
+        return getLdapTransportBean( directoryServiceBean, TRANSPORT_ID_LDAP );
     }
 
 
     /**
      * Gets the LDAPS Server transport bean.
      *
-     * @return
-     *      the LDAPS Server transport bean
+     * @return the LDAPS Server transport bean
      */
     private TransportBean getLdapsServerTransportBean()
     {
-        return getTransportBean( TRANSPORT_ID_LDAPS );
+        return getLdapTransportBean( TRANSPORT_ID_LDAPS );
     }
 
 
     /**
      * Gets the LDAPS Server transport bean.
      *
-     * @param directoryServiceBean
-     *      the directory service bean
-     * @return
-     *      the LDAPS Server transport bean
+     * @param directoryServiceBean the directory service bean
+     * @return the LDAPS Server transport bean
      */
     public static TransportBean getLdapsServerTransportBean( DirectoryServiceBean directoryServiceBean )
     {
-        return getTransportBean( directoryServiceBean, TRANSPORT_ID_LDAPS );
+        return getLdapTransportBean( directoryServiceBean, TRANSPORT_ID_LDAPS );
     }
 
 
     /**
-     * Gets a transport bean based on its id.
+     * Gets a LDAP transport bean based on its id.
      *
-     * @param id
-     *      the id
-     * @return
-     *      the corresponding transport bean
+     * @param id the transport id
+     * @return the corresponding transport bean
      */
-    private TransportBean getTransportBean( String id )
+    private TransportBean getLdapTransportBean( String id )
     {
-        return getTransportBean( getDirectoryServiceBean(), id );
+        return getLdapTransportBean( getDirectoryServiceBean(), id );
     }
 
 
     /**
-     * Gets a transport bean based on its id.
+     * Gets a LDAP server transport bean based on its id
      *
-     * @param directoryServiceBean
-     *      the directory service bean
-     * @param id
-     *      the id
-     * @return
-     *      the corresponding transport bean
+     * @param directoryServiceBean the directory service bean
+     * @param id the transport id
+     * @return the corresponding transport bean
      */
-    public static TransportBean getTransportBean( DirectoryServiceBean directoryServiceBean, String id )
+    public static TransportBean getLdapTransportBean( DirectoryServiceBean directoryServiceBean, String id )
     {
+        // First fetch the LdapServer bean
         LdapServerBean ldapServerBean = getLdapServerBean( directoryServiceBean );
 
         TransportBean transportBean = null;
 
-        // Looking for the transport in the list
+        // Looking for the transports for this server
         TransportBean[] ldapServerTransportBeans = ldapServerBean.getTransports();
+        
         if ( ldapServerTransportBeans != null )
         {
             for ( TransportBean ldapServerTransportBean : ldapServerTransportBeans )
@@ -1424,8 +1422,8 @@ public class LdapLdapsServersPage extend
         // No corresponding transport has been found
         if ( transportBean == null )
         {
-            // Creating a transport bean
-            transportBean = new TransportBean();
+            // Creating a TCP transport bean
+            transportBean = new TcpTransportBean();
             ldapServerBean.addTransports( transportBean );
 
             // ID
@@ -1478,6 +1476,7 @@ public class LdapLdapsServersPage extend
 
         // Getting the list of extended operation handlers
         List<ExtendedOpHandlerBean> extendedOpHandlers = ldapServerBean.getExtendedOps();
+        
         for ( ExtendedOpHandlerBean extendedOpHandlerBean : extendedOpHandlers )
         {
             // Looking for the Start TLS extended operation handler 
@@ -1494,6 +1493,7 @@ public class LdapLdapsServersPage extend
         extendedOpHandlerBean.setExtendedOpHandlerClass( START_TLS_HANDLER_CLASS );
         extendedOpHandlerBean.setEnabled( false );
         extendedOpHandlers.add( extendedOpHandlerBean );
+        
         return extendedOpHandlerBean;
     }
 

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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -53,7 +53,26 @@ import org.eclipse.ui.forms.widgets.Tabl
 
 /**
  * This class represents the General Page of the Server Configuration Editor.
- *
+ * 
+ * The Overview tab exposes 4 panels, in 2 columns :
+ * 
+ * <pre>
+ * +-------------------------------------------------------------------------------+
+ * | +------------------------------------+ +------------------------------------+ |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | |                                | | | |                                | | |
+ * | | |    LDAP/LDAPS Servers          | | | |    Kerberos Server             | | |
+ * | | |                                | | | |                                | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | | |                                | | | |                                | | |
+ * | | |    Partitions                  | | | |    Options                     | | |
+ * | | |                                | | | |                                | | |
+ * | | +--------------------------------+ | | +--------------------------------+ | |
+ * | +------------------------------------+ +------------------------------------+ |
+ * +-------------------------------------------------------------------------------+
+ * </pre>
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class OverviewPage extends ServerConfigurationEditorPage
@@ -65,19 +84,31 @@ public class OverviewPage extends Server
     private static final String TITLE = Messages.getString( "OverviewPage.Overview" ); //$NON-NLS-1$
 
     // UI Controls
+    /** 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
     private Hyperlink openLdapConfigurationLink;
+    
+    /** Kerberos Server controls */
     private Button enableKerberosCheckbox;
     private Text kerberosPortText;
     private Button enableChangePasswordCheckbox;
     private Text changePasswordPortText;
+    // This link opens the advanced kerberos configuration tab 
     private Hyperlink openKerberosConfigurationLink;
+    
+    /** The Partitions controls */
     private Label partitionsLabel;
     private TableViewer partitionsTableViewer;
+    // This link open the advanced partitions configuration Tab */
     private Hyperlink openPartitionsConfigurationLink;
+
+    /** The Options controls */
     private Button allowAnonymousAccessCheckbox;
     private Button enableAccessControlCheckbox;
 
@@ -89,8 +120,14 @@ public class OverviewPage extends Server
             LdapLdapsServersPage.getLdapServerTransportBean( getDirectoryServiceBean() ).setEnabled(
                 enableLdapCheckbox.getSelection() );
             setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
+            setEnabled( ldapAddressText, enableLdapCheckbox.getSelection() );
         }
     };
+
+    
+    /**
+     * The Ldap port modify listener
+     */
     private ModifyListener ldapPortTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
@@ -99,6 +136,21 @@ 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()
     {
         public void widgetSelected( SelectionEvent e )
@@ -106,8 +158,14 @@ public class OverviewPage extends Server
             LdapLdapsServersPage.getLdapsServerTransportBean( getDirectoryServiceBean() ).setEnabled(
                 enableLdapsCheckbox.getSelection() );
             setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
+            setEnabled( ldapsAddressText, enableLdapsCheckbox.getSelection() );
         }
     };
+
+    
+    /**
+     * The Ldaps port modify listener
+     */
     private ModifyListener ldapsPortTextListener = new ModifyListener()
     {
         public void modifyText( ModifyEvent e )
@@ -116,6 +174,20 @@ public class OverviewPage extends Server
                 Integer.parseInt( ldapsPortText.getText() ) );
         }
     };
+
+    
+    /**
+     * 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 )
@@ -267,6 +339,12 @@ 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$
@@ -278,6 +356,12 @@ 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$
@@ -426,6 +510,10 @@ 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 );
@@ -434,6 +522,10 @@ 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 );
@@ -473,6 +565,10 @@ 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 );
@@ -481,6 +577,10 @@ 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 );
@@ -523,14 +623,18 @@ public class OverviewPage extends Server
                 .getLdapServerTransportBean( directoryServiceBean );
             setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
             setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
-            setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
+            setText( ldapPortText, Integer.toString( ldapServerTransportBean.getSystemPort() ) );
+            setEnabled( ldapAddressText, enableLdapCheckbox.getSelection() );
+            setText( ldapAddressText, ldapServerTransportBean.getTransportAddress() );
 
             // LDAPS Server
             TransportBean ldapsServerTransportBean = LdapLdapsServersPage
                 .getLdapsServerTransportBean( directoryServiceBean );
             setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
             setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
-            setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
+            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/ServerConfigurationEditor.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/ServerConfigurationEditor.java?rev=1643086&r1=1643085&r2=1643086&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java Wed Dec  3 10:44:51 2014
@@ -142,9 +142,11 @@ public class ServerConfigurationEditor e
     private void showOrHideTabFolder()
     {
         Composite container = getContainer();
+        
         if ( container instanceof CTabFolder )
         {
             CTabFolder folder = ( CTabFolder ) container;
+            
             if ( getPageCount() == 1 )
             {
                 folder.setTabHeight( 0 );
@@ -153,6 +155,7 @@ public class ServerConfigurationEditor e
             {
                 folder.setTabHeight( -1 );
             }
+            
             folder.layout( true, true );
         }
     }
@@ -224,6 +227,7 @@ public class ServerConfigurationEditor e
 
         // Checking if the 'save as' is successful 
         boolean success = newInput != null;
+        
         if ( success )
         {
             // Setting the new input to the editor

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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -20,6 +20,9 @@
 package org.apache.directory.studio.apacheds.configuration.v2.editor;
 
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import org.apache.directory.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.studio.apacheds.configuration.v2.actions.EditorExportConfigurationAction;
@@ -43,13 +46,19 @@ 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.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 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;
@@ -78,6 +87,8 @@ public abstract class ServerConfiguratio
             setEditorDirty();
         }
     };
+    
+    
     private SelectionListener dirtySelectionListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
@@ -85,6 +96,8 @@ public abstract class ServerConfiguratio
             setEditorDirty();
         }
     };
+    
+    
     private ISelectionChangedListener dirtySelectionChangedListener = new ISelectionChangedListener()
     {
         public void selectionChanged( SelectionChangedEvent event )
@@ -97,8 +110,9 @@ public abstract class ServerConfiguratio
     /**
      * Creates a new instance of GeneralPage.
      *
-     * @param editor
-     *      the associated editor
+     * @param editor the associated editor
+     * @param id the unique identifier
+     * @param title The page title
      */
     public ServerConfigurationEditorPage( ServerConfigurationEditor editor, String id, String title )
     {
@@ -109,8 +123,7 @@ public abstract class ServerConfiguratio
     /**
      * Gets the ServerConfigurationEditor object associated with the page.
      *
-     * @return
-     *      the ServerConfigurationEditor object associated with the page
+     * @return the ServerConfigurationEditor object associated with the page
      */
     public ServerConfigurationEditor getServerConfigurationEditor()
     {
@@ -130,8 +143,7 @@ public abstract class ServerConfiguratio
     /**
      * Gets the configuration bean associated with the editor.
      *
-     * @return
-     *      the configuration bean associated with the editor
+     * @return the configuration bean associated with the editor
      */
     public ConfigBean getConfigBean()
     {
@@ -150,8 +162,7 @@ public abstract class ServerConfiguratio
     /**
      * Gets the directory service associated with the editor.
      *
-     * @return
-     *      the directory service bean associated with the editor
+     * @return the directory service bean associated with the editor
      */
     public DirectoryServiceBean getDirectoryServiceBean()
     {
@@ -217,10 +228,8 @@ public abstract class ServerConfiguratio
     /**
      * Subclasses must implement this method to create the content of their form.
      *
-     * @param parent
-     *      the parent element
-     * @param toolkit
-     *      the form toolkit
+     * @param parent the parent element
+     * @param toolkit the form toolkit
      */
     protected abstract void createFormContent( Composite parent, FormToolkit toolkit );
 
@@ -230,6 +239,7 @@ public abstract class ServerConfiguratio
      */
     protected abstract void refreshUI();
     
+    
     /**
      * Indicates if the page is initialized.
      *
@@ -245,12 +255,9 @@ public abstract class ServerConfiguratio
     /**
      * Creates a Text that can be used to enter a port number.
      *
-     * @param toolkit
-     *      the toolkit
-     * @param parent
-     *      the parent
-     * @return
-     *      a Text that can be used to enter a port number
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @return a Text that can be used to enter a port number
      */
     protected Text createPortText( FormToolkit toolkit, Composite parent )
     {
@@ -262,12 +269,27 @@ public abstract class ServerConfiguratio
         {
             public void verifyText( VerifyEvent e )
             {
-                if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
+                // Check that it's a valid port. It should be
+                // any value between 0 and 65535
+                // Skip spaces on both sides
+                char[] port = e.text.trim().toCharArray();
+                
+                if ( port.length > 0 )
                 {
-                    e.doit = false;
+                    for ( char c : port )
+                    {
+                        if ( ( c < '0' ) && ( c > '9' ) )
+                        {
+                            // This is an error
+                            e.doit = false;
+                        }
+                    }
                 }
             }
         } );
+        
+        
+        // the port can only have 5 chars max
         portText.setTextLimit( 5 );
 
         return portText;
@@ -275,18 +297,60 @@ public abstract class ServerConfiguratio
 
 
     /**
+     * Creates a Text that can be used to enter an address. If the address is incorrect, 
+     * it will be in red while typing until it gets correct.
+     *
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @return a Text that can be used to enter an address
+     */
+    protected Text createAddressText( FormToolkit toolkit, Composite parent )
+    {
+        final Text addressText = toolkit.createText( parent, "" ); //$NON-NLS-1$
+        GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
+        gd.widthHint = 200;
+        addressText.setLayoutData( gd );
+        
+        addressText.addModifyListener( new ModifyListener()
+        {
+            Display display = addressText.getDisplay();
+
+            // Check that the address is valid
+            public void modifyText( ModifyEvent e )
+            {
+                Text addressText = (Text)e.widget;
+                String address = addressText.getText();
+                
+                try
+                {
+                    InetAddress.getAllByName( address );
+                    addressText.setForeground( null );
+                }
+                catch ( UnknownHostException uhe )
+                {
+                    addressText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                }
+            }
+        } );
+        
+        // An address can be fairly long...
+        addressText.setTextLimit( 256 );
+
+        return addressText;
+    }
+
+
+    /**
      * Creates a Text that can be used to enter an integer.
      *
-     * @param toolkit
-     *      the toolkit
-     * @param parent
-     *      the parent
-     * @return
-     *      a Text that can be used to enter a port number
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @return a Text that can be used to enter a port number
      */
     protected Text createIntegerText( FormToolkit toolkit, Composite parent )
     {
         Text integerText = toolkit.createText( parent, "" ); //$NON-NLS-1$
+        
         integerText.addVerifyListener( new VerifyListener()
         {
             public void verifyText( VerifyEvent e )
@@ -305,14 +369,10 @@ public abstract class ServerConfiguratio
     /**
      * Creates default value Label.
      *
-     * @param toolkit
-     *      the toolkit
-     * @param parent
-     *      the parent
-     * @param text
-     *      the text string
-     * @return
-     *      a default value Label
+     * @param toolkit the toolkit
+     * @param parent the parent
+     * @param text the text string
+     * @return a default value Label
      */
     protected Label createDefaultValueLabel( FormToolkit toolkit, Composite parent, String text )
     {
@@ -327,10 +387,8 @@ public abstract class ServerConfiguratio
     /**
      * Adds a modify listener to the given Text.
      *
-     * @param text
-     *      the Text control
-     * @param listener
-     *      the listener
+     * @param text the Text control
+     * @param listener the listener
      */
     protected void addModifyListener( Text text, ModifyListener listener )
     {
@@ -344,10 +402,8 @@ public abstract class ServerConfiguratio
     /**
      * Adds a selection changed listener to the given Viewer.
      *
-     * @param viewer
-     *      the viewer control
-     * @param listener
-     *      the listener
+     * @param viewer the viewer control
+     * @param listener the listener
      */
     protected void addSelectionChangedListener( Viewer viewer, ISelectionChangedListener listener )
     {
@@ -362,10 +418,8 @@ public abstract class ServerConfiguratio
     /**
      * Adds a double click listener to the given StructuredViewer.
      *
-     * @param viewer
-     *      the viewer control
-     * @param listener
-     *      the listener
+     * @param viewer the viewer control
+     * @param listener the listener
      */
     protected void addDoubleClickListener( StructuredViewer viewer, IDoubleClickListener listener )
     {
@@ -380,10 +434,8 @@ public abstract class ServerConfiguratio
     /**
      * Adds a selection listener to the given Button.
      *
-     * @param button
-     *      the Button control
-     * @param listener
-     *      the listener
+     * @param button the Button control
+     * @param listener the listener
      */
     protected void addSelectionListener( Button button, SelectionListener listener )
     {
@@ -397,10 +449,8 @@ public abstract class ServerConfiguratio
     /**
      * Removes a modify listener to the given Text.
      *
-     * @param text
-     *      the Text control
-     * @param listener
-     *      the listener
+     * @param text the Text control
+     * @param listener the listener
      */
     protected void removeModifyListener( Text text, ModifyListener listener )
     {
@@ -414,10 +464,8 @@ public abstract class ServerConfiguratio
     /**
      * Removes a selection changed listener to the given Viewer.
      *
-     * @param viewer
-     *      the viewer control
-     * @param listener
-     *      the listener
+     * @param viewer the viewer control
+     * @param listener the listener
      */
     protected void removeSelectionChangedListener( Viewer viewer, ISelectionChangedListener listener )
     {
@@ -432,10 +480,8 @@ public abstract class ServerConfiguratio
     /**
      * Removes a selection changed listener to the given Viewer.
      *
-     * @param viewer
-     *      the viewer control
-     * @param listener
-     *      the listener
+     * @param viewer the viewer control
+     * @param listener the listener
      */
     protected void removeDoubleClickListener( StructuredViewer viewer, IDoubleClickListener listener )
     {
@@ -450,10 +496,8 @@ public abstract class ServerConfiguratio
     /**
      * Removes a selection listener to the given Button.
      *
-     * @param button
-     *      the Button control
-     * @param listener
-     *      the listener
+     * @param button the Button control
+     * @param listener the listener
      */
     protected void removeSelectionListener( Button button, SelectionListener listener )
     {
@@ -467,8 +511,7 @@ public abstract class ServerConfiguratio
     /**
      * Adds a 'dirty' listener to the given Text.
      *
-     * @param text
-     *      the Text control
+     * @param text the Text control
      */
     protected void addDirtyListener( Text text )
     {
@@ -479,8 +522,7 @@ public abstract class ServerConfiguratio
     /**
      * Adds a 'dirty' listener to the given Button.
      *
-     * @param button
-     *      the Button control
+     * @param button the Button control
      */
     protected void addDirtyListener( Button button )
     {
@@ -491,8 +533,7 @@ public abstract class ServerConfiguratio
     /**
      * Adds a 'dirty' listener to the given Viewer.
      *
-     * @param viewer
-     *      the viewer control
+     * @param viewer the viewer control
      */
     protected void addDirtyListener( Viewer viewer )
     {
@@ -503,8 +544,7 @@ public abstract class ServerConfiguratio
     /**
      * Removes a 'dirty' listener to the given Text.
      *
-     * @param text
-     *      the Text control
+     * @param text the Text control
      */
     protected void removeDirtyListener( Text text )
     {
@@ -515,8 +555,7 @@ public abstract class ServerConfiguratio
     /**
      * Removes a 'dirty' listener to the given Button.
      *
-     * @param button
-     *      the Button control
+     * @param button the Button control
      */
     protected void removeDirtyListener( Button button )
     {
@@ -527,8 +566,7 @@ public abstract class ServerConfiguratio
     /**
      * Removes a 'dirty' listener to the given Viewer.
      *
-     * @param viewer
-     *      the viewer control
+     * @param viewer the viewer control
      */
     protected void removeDirtyListener( Viewer viewer )
     {
@@ -542,10 +580,8 @@ public abstract class ServerConfiguratio
      * Verifies that the button exists and is not disposed 
      * before applying the new selection state.
      *
-     * @param button
-     *      the button
-     * @param selected
-     *      the new selection state
+     * @param button the button
+     * @param selected the new selection state
      */
     protected void setSelection( Button button, boolean selected )
     {
@@ -562,10 +598,8 @@ public abstract class ServerConfiguratio
      * Verifies that the viewer exists and is not disposed 
      * before applying the new selection.
      *
-     * @param button
-     *      the button
-     * @param selection
-     *      the new selection
+     * @param button the button
+     * @param selection the new selection
      */
     protected void setSelection( Viewer viewer, Object selection )
     {
@@ -582,10 +616,8 @@ public abstract class ServerConfiguratio
      * Verifies that the button exists and is not disposed 
      * before applying the new text.
      *
-     * @param text
-     *      the text
-     * @param string
-     *       the new text
+     * @param text the text
+     * @param string the new text
      */
     protected void setText( Text text, String string )
     {

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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -92,6 +92,7 @@ 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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -90,6 +90,7 @@ 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=1643086&r1=1643085&r2=1643086&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 Wed Dec  3 10:44:51 2014
@@ -90,6 +90,7 @@ 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 :
 

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.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/jobs/LoadConfigurationRunnable.java?rev=1643086&r1=1643085&r2=1643086&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Wed Dec  3 10:44:51 2014
@@ -78,8 +78,7 @@ public class LoadConfigurationRunnable i
     /**
      * Creates a new instance of LoadConfigurationRunnable.
      * 
-     * @param editor
-     *            the editor
+     * @param editor the editor
      */
     public LoadConfigurationRunnable( ServerConfigurationEditor editor )
     {
@@ -125,6 +124,7 @@ public class LoadConfigurationRunnable i
         try
         {
             final ConfigBean configBean = getConfiguration( input, monitor );
+            
             if ( configBean != null )
             {
                 Display.getDefault().asyncExec( new Runnable()
@@ -157,17 +157,15 @@ public class LoadConfigurationRunnable i
     /**
      * Gets the configuration from the input.
      * 
-     * @param input
-     *      the editor input
-     * @param monitor
-     *      the studio progress monitor
-     * @return
-     *      the configuration
+     * @param input the editor input
+     * @param monitor the studio progress monitor
+     * @return the configuration
      * @throws Exception
      */
     public ConfigBean getConfiguration( IEditorInput input, StudioProgressMonitor monitor ) throws Exception
     {
         String inputClassName = input.getClass().getName();
+        
         // If the input is a NewServerConfigurationInput, then we only 
         // need to get the server configuration and return
         if ( input instanceof NewServerConfigurationInput )
@@ -175,6 +173,7 @@ public class LoadConfigurationRunnable i
             InputStream is = ApacheDS2ConfigurationPlugin.class.getResourceAsStream( "config.ldif" ); //$NON-NLS-1$
             return readConfiguration( is );
         }
+        
         // If the input is a ConnectionServerConfigurationInput, then we 
         // read the server configuration from the selected connection
         if ( input instanceof ConnectionServerConfigurationInput )
@@ -212,10 +211,8 @@ public class LoadConfigurationRunnable i
     /**
      * Reads the configuration from the given input stream.
      *
-     * @param is
-     *      the input stream
-     * @return
-     *      the associated configuration bean
+     * @param is the input stream
+     * @return the associated configuration bean
      * @throws Exception
      */
     public static ConfigBean readConfiguration( InputStream is ) throws Exception
@@ -239,10 +236,8 @@ public class LoadConfigurationRunnable i
     /**
      * Reads the configuration from the given partition.
      *
-     * @param partition
-     *      the configuration partition
-     * @return
-     *      the associated configuration bean
+     * @param partition the configuration partition
+     * @return the associated configuration bean
      * @throws LdapException
      */
     private static ConfigBean readConfiguration( AbstractBTreePartition partition ) throws LdapException
@@ -260,12 +255,9 @@ public class LoadConfigurationRunnable i
     /**
      * Reads the configuration from the given connection.
      *
-     * @param input
-     *      the editor input
-     * @param monitor 
-     *      the studio progress monitor
-     * @return
-     *      the associated configuration bean
+     * @param input the editor input
+     * @param monitor the studio progress monitor
+     * @return the associated configuration bean
      * @throws Exception
      */
     private ConfigBean readConfiguration( ConnectionServerConfigurationInput input,
@@ -313,6 +305,7 @@ public class LoadConfigurationRunnable i
                 configEntry = new DefaultEntry( schemaManager, AttributeUtils.toEntry(
                     searchResult.getAttributes(), new Dn( searchResult.getNameInNamespace() ) ) );
             }
+            
             enumeration.close();
 
             // Verifying we found the 'ou=config' base entry
@@ -362,6 +355,7 @@ public class LoadConfigurationRunnable i
                     // Adding the children to the list of entries
                     entries.add( childEntry );
                 }
+                
                 childrenEnumeration.close();
             }
 
@@ -388,6 +382,7 @@ public class LoadConfigurationRunnable i
         if ( connection != null && !connection.getConnectionWrapper().isConnected() )
         {
             connection.getConnectionWrapper().connect( monitor );
+            
             if ( connection.getConnectionWrapper().isConnected() )
             {
                 connection.getConnectionWrapper().bind( monitor );
@@ -400,6 +395,7 @@ public class LoadConfigurationRunnable i
                 {
                     listener.connectionOpened( connection, monitor );
                 }
+                
                 ConnectionEventRegistry.fireConnectionOpened( connection, input );
             }
         }



Mime
View raw message