directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r661268 [1/2] - in /directory/studio/branches/apacheds-plugin-branch/apacheds: ./ src/main/java/org/apache/directory/studio/apacheds/ src/main/java/org/apache/directory/studio/apacheds/actions/ src/main/java/org/apache/directory/studio/apac...
Date Thu, 29 May 2008 09:20:52 GMT
Author: pamarcelot
Date: Thu May 29 02:20:51 2008
New Revision: 661268

URL: http://svn.apache.org/viewvc?rev=661268&view=rev
Log:
o Various re-namings for consistency in the plugin.
o Corrected some Javadocs.

Added:
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerAction.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerInstanceAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerInstanceJob.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerInstance.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerInstancePropertyPage.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerWizard.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerInstanceWizard.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerWizardPage.java
      - copied, changed from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerInstanceWizardPage.java
Removed:
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerInstanceAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerInstanceJob.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerInstance.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerInstancePropertyPage.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerInstanceWizard.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/wizards/NewServerInstanceWizardPage.java
Modified:
    directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/StudioConsoleAppender.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/DeleteAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/StopAction.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/dialogs/DeleteServerDialog.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerEvent.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandler.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerAdapter.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIOException.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerListener.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewContentProvider.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewLabelProvider.java

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml Thu May 29 02:20:51 2008
@@ -38,12 +38,12 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            class="org.apache.directory.studio.apacheds.properties.ServerInstancePropertyPage"
-            id="org.apache.directory.studio.apacheds.properties.serverInstanceProperties"
+            class="org.apache.directory.studio.apacheds.properties.ServerPropertyPage"
+            id="org.apache.directory.studio.apacheds.properties.serverProperties"
             name="Info">
          <enabledWhen>
             <instanceof
-                  value="org.apache.directory.studio.apacheds.model.ServerInstance">
+                  value="org.apache.directory.studio.apacheds.model.Server">
             </instanceof>
          </enabledWhen>
       </page>
@@ -56,7 +56,7 @@
       </category>
       <command
             categoryId="org.apache.directory.studio.apacheds.commands"
-            defaultHandler="org.apache.directory.studio.apacheds.actions.NewServerInstanceAction"
+            defaultHandler="org.apache.directory.studio.apacheds.actions.NewServerAction"
             description="Creates a new server"
             id="org.apache.directory.studio.apacheds.commands.newServer"
             name="New Server">

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java Thu May 29 02:20:51 2008
@@ -39,7 +39,7 @@
     /** The plug-in ID */
     public static final String PLUGIN_ID = "org.apache.directory.studio.apacheds";
 
-    /** The shared instance*/
+    /** The shared instance */
     private static ApacheDsPlugin plugin;
 
     /** The servers handler */
@@ -77,8 +77,8 @@
         // Creating the servers handler
         serversHandler = ServersHandler.getDefault();
 
-        // Initializing the server instances from the store
-        serversHandler.loadServerInstancesFromStore();
+        // Initializing the servers from the store
+        serversHandler.loadServersFromStore();
     }
 
 

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java Thu May 29 02:20:51 2008
@@ -31,7 +31,6 @@
     // -------
     // IMAGES
     // -------
-    public static final String IMG_SERVER_INSTANCE = "resources/icons/server-instance.png";
     public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif";
     public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png";
     public static final String IMG_SERVER = "resources/icons/server.gif";

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java Thu May 29 02:20:51 2008
@@ -42,7 +42,7 @@
 {
     private static final String RESOURCES = "resources";
     private static final String LIBS = "libs";
-    private static final String INSTANCES = "instances";
+    private static final String SERVERS = "servers";
     /** The name of the libraries folder */
     private static final String LIBRARIES_FOLDER_NAME = "libs";
     private static final String APACHEDS = "apacheds";
@@ -181,41 +181,41 @@
 
 
     /**
-     * Get the path to the Apache DS instances folder.
+     * Get the path to the Apache DS servers folder.
      *
      * @return
-     *      the path to the Apache DS instances folder
+     *      the path to the Apache DS server folder
      */
-    public static IPath getApacheDsInstancesFolder()
+    public static IPath getApacheDsServersFolder()
     {
-        return ApacheDsPlugin.getDefault().getStateLocation().append( INSTANCES );
+        return ApacheDsPlugin.getDefault().getStateLocation().append( SERVERS );
     }
 
 
     /**
-     * Creates a new instance folder for the given id.
+     * Creates a new server folder for the given id.
      *
      * @param id
-     *      the id of the instance
+     *      the id of the server
      */
-    public static void createNewInstanceFolder( String id )
+    public static void createNewServerFolder( String id )
     {
-        // Checking if the Apache DS instance folder exists
-        checkApacheDsInstancesFolder();
+        // Checking if the Apache DS servers folder exists
+        checkApacheDsServersFolder();
 
-        // Creating the instance folder
-        IPath instanceFolderPath = getApacheDsInstancesFolder().append( id );
-        File instanceFolder = new File( instanceFolderPath.toOSString() );
-        instanceFolder.mkdir();
+        // Creating the server folder
+        IPath serverFolderPath = getApacheDsServersFolder().append( id );
+        File serverFolder = new File( serverFolderPath.toOSString() );
+        serverFolder.mkdir();
 
-        // Creating the instance sub folders
-        File confFolder = new File( instanceFolder, "conf" );
+        // Creating the server sub folders
+        File confFolder = new File( serverFolder, "conf" );
         confFolder.mkdir();
-        File serverSocketFolder = new File( instanceFolder, "serverSocket" );
+        File serverSocketFolder = new File( serverFolder, "serverSocket" );
         serverSocketFolder.mkdir();
-        new File( instanceFolder, "ldif" ).mkdir();
-        new File( instanceFolder, "log" ).mkdir();
-        new File( instanceFolder, "partitions" ).mkdir();
+        new File( serverFolder, "ldif" ).mkdir();
+        new File( serverFolder, "log" ).mkdir();
+        new File( serverFolder, "partitions" ).mkdir();
 
         // Copying default configuration files
         try
@@ -226,7 +226,7 @@
 
             // Creating log4j.properties file
             File log4jPropertiesFile = new File( confFolder, "log4j.properties" );
-            createServerInstanceLog4jPropertiesFile( new FileOutputStream( log4jPropertiesFile ), 1024 ); // Setting 1024 as default port
+            createServersLog4jPropertiesFile( new FileOutputStream( log4jPropertiesFile ), 1024 ); // Setting 1024 as default port
 
             // Copying server.xml file
             File serverXmlFile = new File( confFolder, "server.xml" );
@@ -245,14 +245,16 @@
 
 
     /**
-     * Create the log4j.properties file for the server socket logger.
+     * Create the log4j.properties file for the server.
      *
      * @param os
      *      the {@link OutputStream} to write to
+     * @param port
+     *      the port
      * @throws IOException
      *      if an error occurs when writing to the file
      */
-    public static void createServerInstanceLog4jPropertiesFile( OutputStream os, int port ) throws IOException
+    public static void createServersLog4jPropertiesFile( OutputStream os, int port ) throws IOException
     {
         // Creating the file content in a StringBuffer
         StringBuffer sb = new StringBuffer();
@@ -295,7 +297,7 @@
      * @param os
      *      the {@link OutputStream} to write to
      * @param id
-     *      the id of the server instance
+     *      the id of the server
      * @throws IOException
      *      if an error occurs when writing to the file
      */
@@ -321,12 +323,12 @@
         sb.append( "#############################################################################" ).append( "\n" );
         sb.append( "log4j.rootCategory=ALL, studioConsoleAppender" ).append( "\n" );
         sb.append( "" ).append( "\n" );
-        sb.append( "# Studio Console Appender (identified with the server instance id)" ).append( "\n" );
+        sb.append( "# Studio Console Appender (identified with the server id)" ).append( "\n" );
         sb
             .append(
                 "log4j.appender.studioConsoleAppender=org.apache.directory.studio.apacheds.StudioConsoleAppender" )
             .append( "\n" );
-        sb.append( "log4j.appender.studioConsoleAppender.ServerInstanceId=" ).append( id ).append( "\n" );
+        sb.append( "log4j.appender.studioConsoleAppender.ServerId=" ).append( id ).append( "\n" );
         sb.append( "log4j.appender.studioConsoleAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" );
         sb.append( "" ).append( "\n" );
         sb.append( "# Hiding logs from log4j" ).append( "\n" );
@@ -368,15 +370,15 @@
 
 
     /**
-     * Verifies that the Apache DS instances folder exists.
+     * Verifies that the Apache DS server folder exists.
      * If it does not exists, it creates it.
      */
-    private static void checkApacheDsInstancesFolder()
+    private static void checkApacheDsServersFolder()
     {
-        File apacheDsInstancesFolder = new File( getApacheDsInstancesFolder().toOSString() );
-        if ( !apacheDsInstancesFolder.exists() )
+        File apacheDsserversFolder = new File( getApacheDsServersFolder().toOSString() );
+        if ( !apacheDsserversFolder.exists() )
         {
-            apacheDsInstancesFolder.mkdir();
+            apacheDsserversFolder.mkdir();
         }
     }
 }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java Thu May 29 02:20:51 2008
@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServersHandler;
 import org.eclipse.ui.console.ConsolePlugin;
 import org.eclipse.ui.console.IConsole;
@@ -33,7 +33,7 @@
  * This class implements the consoles handler.
  * <p>
  * 
- * It is used to store all the consoles associated to server instances.
+ * It is used to store all the consoles associated to servers.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -43,7 +43,7 @@
     /** The default instance */
     private static ConsolesHandler instance;
 
-    /** The map of consoles identified by server instance ID */
+    /** The map of consoles identified by server ID */
     private Map<String, LogMessageConsole> consolesMap;
 
 
@@ -75,26 +75,26 @@
 
 
     /**
-     * Gets the log message console associated with the if of the server instance.
+     * Gets the log message console associated with the if of the server.
      *
-     * @param serverInstanceId
-     *      the id of the server instance
+     * @param serverId
+     *      the id of the server
      * @return
      *      the associated log message console.
      */
-    public LogMessageConsole getLogMessageConsole( String serverInstanceId )
+    public LogMessageConsole getLogMessageConsole( String serverId )
     {
-        if ( consolesMap.containsKey( serverInstanceId ) )
+        if ( consolesMap.containsKey( serverId ) )
         {
-            return consolesMap.get( serverInstanceId );
+            return consolesMap.get( serverId );
         }
         else
         {
-            ServerInstance serverInstance = ServersHandler.getDefault().getServerInstanceById( serverInstanceId );
+            Server server = ServersHandler.getDefault().getServerById( serverId );
 
-            LogMessageConsole logMessageConsole = new LogMessageConsole( serverInstance.getName() );
+            LogMessageConsole logMessageConsole = new LogMessageConsole( server.getName() );
 
-            consolesMap.put( serverInstanceId, logMessageConsole );
+            consolesMap.put( serverId, logMessageConsole );
 
             ConsolePlugin.getDefault().getConsoleManager().addConsoles( new IConsole[]
                 { logMessageConsole } );

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/StudioConsoleAppender.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/StudioConsoleAppender.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/StudioConsoleAppender.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/StudioConsoleAppender.java Thu May 29 02:20:51 2008
@@ -34,8 +34,8 @@
  */
 public class StudioConsoleAppender extends AppenderSkeleton
 {
-    /** The id of the server instance */
-    private String serverInstanceId;
+    /** The id of the server */
+    private String serverId;
 
 
     /**
@@ -51,7 +51,7 @@
      */
     protected void append( LoggingEvent event )
     {
-        LogMessageConsole console = ConsolesHandler.getDefault().getLogMessageConsole( serverInstanceId );
+        LogMessageConsole console = ConsolesHandler.getDefault().getLogMessageConsole( serverId );
 
         Level level = event.getLevel();
         Object message = event.getMessage();
@@ -100,25 +100,25 @@
 
 
     /**
-     * Gets the id of the server instance.
+     * Gets the id of the server.
      *
      * @return
-     *      the id of the server instance
+     *      the id of the server
      */
-    public String getServerInstanceId()
+    public String getServerId()
     {
-        return serverInstanceId;
+        return serverId;
     }
 
 
     /**
-     * Sets the id of the server instance.
+     * Sets the id of the server.
      *
-     * @param serverInstanceId
-     *      the id of the server instance
+     * @param serverId
+     *      the id of the server
      */
-    public void setServerInstanceId( String serverInstanceId )
+    public void setServerId( String serverId )
     {
-        this.serverInstanceId = serverInstanceId;
+        this.serverId = serverId;
     }
 }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/DeleteAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/DeleteAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/DeleteAction.java Thu May 29 02:20:51 2008
@@ -25,7 +25,7 @@
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
 import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
 import org.apache.directory.studio.apacheds.dialogs.DeleteServerDialog;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServersHandler;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.jface.action.Action;
@@ -39,7 +39,7 @@
 
 
 /**
- * This class implements the delete action for a server instance.
+ * This class implements the delete action for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -77,17 +77,17 @@
         StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
 
         // Here's the real object
-        ServerInstance server = ( ServerInstance ) selection.getFirstElement();
+        Server server = ( Server ) selection.getFirstElement();
 
         // Asking for confirmation
         DeleteServerDialog dsd = new DeleteServerDialog( view.getSite().getShell(), server );
         if ( dsd.open() == DeleteServerDialog.OK )
         {
             // Removing the server
-            ServersHandler.getDefault().removeServerInstance( server );
+            ServersHandler.getDefault().removeServer( server );
 
             // Deleting the associated directory on disk
-            deleteDirectory( new File( ApacheDsPluginUtils.getApacheDsInstancesFolder().append( server.getId() )
+            deleteDirectory( new File( ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() )
                 .toOSString() ) );
         }
     }

Copied: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerAction.java (from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerInstanceAction.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerAction.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerAction.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerInstanceAction.java&r1=661232&r2=661268&rev=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerInstanceAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/NewServerAction.java Thu May 29 02:20:51 2008
@@ -22,7 +22,7 @@
 
 import org.apache.directory.studio.apacheds.ApacheDsPlugin;
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
-import org.apache.directory.studio.apacheds.wizards.NewServerInstanceWizard;
+import org.apache.directory.studio.apacheds.wizards.NewServerWizard;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -34,17 +34,17 @@
 
 
 /**
- * This class implements the new server instance action.
+ * This class implements the new server action.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class NewServerInstanceAction extends Action implements IWorkbenchWindowActionDelegate
+public class NewServerAction extends Action implements IWorkbenchWindowActionDelegate
 {
     /**
-     * Creates a new instance of NewServerInstanceAction.
+     * Creates a new instance of NewServerAction.
      */
-    public NewServerInstanceAction()
+    public NewServerAction()
     {
         super( "New &Server" );
         setId( ApacheDsPluginConstants.CMD_NEW_SERVER );
@@ -60,7 +60,7 @@
     public void run()
     {
         // Instantiates and initializes the wizard
-        NewServerInstanceWizard wizard = new NewServerInstanceWizard();
+        NewServerWizard wizard = new NewServerWizard();
         wizard.init( PlatformUI.getWorkbench(), StructuredSelection.EMPTY );
         // Instantiates the wizard container with the wizard and opens it
         WizardDialog dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard );

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java Thu May 29 02:20:51 2008
@@ -23,7 +23,7 @@
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
 import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
 import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
@@ -42,7 +42,7 @@
 
 
 /**
- * This class implements the open action for a server instance.
+ * This class implements the open action for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -78,13 +78,13 @@
         StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
 
         // Here's the real object
-        ServerInstance serverInstance = ( ServerInstance ) selection.getFirstElement();
-        if ( serverInstance != null )
+        Server server = ( Server ) selection.getFirstElement();
+        if ( server != null )
         {
             // Opening the editor
             IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-            PathEditorInput input = new PathEditorInput( ApacheDsPluginUtils.getApacheDsInstancesFolder().append(
-                serverInstance.getId() ).append( "conf" ).append( "server.xml" ) );
+            PathEditorInput input = new PathEditorInput( ApacheDsPluginUtils.getApacheDsServersFolder().append(
+                server.getId() ).append( "conf" ).append( "server.xml" ) );
             try
             {
                 page.openEditor( input, ServerConfigurationEditor.ID );

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java Thu May 29 02:20:51 2008
@@ -21,7 +21,8 @@
 
 
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
+import org.apache.directory.studio.apacheds.properties.ServerPropertyPage;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -34,7 +35,7 @@
 
 
 /**
- * This class implements the properties action for a server instance.
+ * This class implements the properties action for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -46,7 +47,7 @@
 
 
     /**
-     * Creates a new instance of NewServerInstanceAction.
+     * Creates a new instance of PropertiesAction.
      * 
      * @param view
      *      the associated view
@@ -69,10 +70,10 @@
         StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
         if ( !selection.isEmpty() )
         {
-            ServerInstance serverInstance = ( ServerInstance ) selection.getFirstElement();
-            PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( view.getViewSite().getShell(),
-                serverInstance, "org.apache.directory.studio.apacheds.properties.serverInstanceProperties", null, null );
-            dialog.getShell().setText( "Properties for '" + shorten( serverInstance.getName(), 30 ) + "'" );
+            Server server = ( Server ) selection.getFirstElement();
+            PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( view.getViewSite().getShell(), server,
+                ServerPropertyPage.ID, null, null );
+            dialog.getShell().setText( "Properties for '" + shorten( server.getName(), 30 ) + "'" );
             dialog.open();
         }
     }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java Thu May 29 02:20:51 2008
@@ -31,7 +31,7 @@
 
 
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServersHandler;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.jface.action.Action;
@@ -72,13 +72,13 @@
     protected Text textEditor;
     private TextActionHandler textActionHandler;
     // The server being edited if this is being done inline
-    protected ServerInstance editedServer;
+    protected Server editedServer;
 
     protected boolean saving = false;
 
 
     /**
-     * Creates a new instance of OpenAction.
+     * Creates a new instance of RenameAction.
      * 
      * @param view
      *      the associated view
@@ -104,7 +104,7 @@
         StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
 
         // Here's the real object
-        ServerInstance server = ( ServerInstance ) selection.getFirstElement();
+        Server server = ( Server ) selection.getFirstElement();
         if ( server != null )
         {
             queryNewServerNameInline( server );
@@ -120,7 +120,7 @@
      *
      * @param server the server to rename
      */
-    private void queryNewServerNameInline( final ServerInstance server )
+    private void queryNewServerNameInline( final Server server )
     {
         // Make sure text editor is created only once. Simply reset text
         // editor when action is executed more than once. Fixes bug 22269
@@ -148,7 +148,7 @@
      * 
      * @param server the server to rename
      */
-    private void createTextEditor( final ServerInstance server )
+    private void createTextEditor( final Server server )
     {
         // Create text editor parent. This draws a nice bounding rect
         textEditorParent = createParent();
@@ -255,7 +255,7 @@
      * 
      * @param server the server to rename
      */
-    protected void saveChangesAndDispose( ServerInstance server )
+    protected void saveChangesAndDispose( Server server )
     {
         if ( saving == true )
             return;

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java Thu May 29 02:20:51 2008
@@ -32,8 +32,8 @@
 import org.apache.directory.studio.apacheds.configuration.model.ServerXmlIOException;
 import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
 import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
-import org.apache.directory.studio.apacheds.jobs.LaunchServerInstanceJob;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.jobs.LaunchServerJob;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.apache.mina.util.AvailablePortFinder;
 import org.eclipse.jface.action.Action;
@@ -47,7 +47,7 @@
 
 
 /**
- * This class implements the run action for a server instance.
+ * This class implements the run action for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -84,8 +84,8 @@
         StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
         if ( ( !selection.isEmpty() ) && ( selection.size() == 1 ) )
         {
-            // Getting the server instance
-            final ServerInstance serverInstance = ( ServerInstance ) selection.getFirstElement();
+            // Getting the server
+            final Server server = ( Server ) selection.getFirstElement();
 
             // Parsing the 'server.xml' file
             ServerXmlIOV152 serverXmlIOV152 = new ServerXmlIOV152();
@@ -93,7 +93,7 @@
             try
             {
                 serverConfiguration = ( ServerConfigurationV152 ) serverXmlIOV152.parse( new FileInputStream( new File(
-                    ApacheDsPluginUtils.getApacheDsInstancesFolder().append( serverInstance.getId() ).append( "conf" )
+                    ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() ).append( "conf" )
                         .append( "server.xml" ).toOSString() ) ) );
             }
             catch ( FileNotFoundException e )
@@ -152,8 +152,8 @@
             ApacheDsPluginUtils.verifyLibrariesFolder();
 
             // Creating, setting and launching the launch job
-            LaunchServerInstanceJob job = new LaunchServerInstanceJob( serverInstance, serverConfiguration );
-            serverInstance.setLaunchJob( job );
+            LaunchServerJob job = new LaunchServerJob( server, serverConfiguration );
+            server.setLaunchJob( job );
             job.schedule();
         }
     }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/StopAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/StopAction.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/StopAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/StopAction.java Thu May 29 02:20:51 2008
@@ -22,8 +22,8 @@
 
 import org.apache.directory.studio.apacheds.ApacheDsPlugin;
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
-import org.apache.directory.studio.apacheds.jobs.LaunchServerInstanceJob;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.jobs.LaunchServerJob;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.debug.core.DebugException;
@@ -37,7 +37,7 @@
 
 
 /**
- * This class implements the stop action for a server instance.
+ * This class implements the stop action for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -72,13 +72,13 @@
         if ( ( !selection.isEmpty() ) && ( selection.size() == 1 ) )
         {
             // Getting the server
-            ServerInstance server = ( ServerInstance ) selection.getFirstElement();
+            Server server = ( Server ) selection.getFirstElement();
 
             // Setting the server of the server to 'stopping'
             server.setState( ServerStateEnum.STOPPING );
 
             // Getting the launch job
-            LaunchServerInstanceJob launchJob = server.getLaunchJob();
+            LaunchServerJob launchJob = server.getLaunchJob();
             if ( launchJob != null )
             {
                 // Getting the launch

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/dialogs/DeleteServerDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/dialogs/DeleteServerDialog.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/dialogs/DeleteServerDialog.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/dialogs/DeleteServerDialog.java Thu May 29 02:20:51 2008
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.apacheds.dialogs;
 
 
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -45,7 +45,7 @@
  */
 public class DeleteServerDialog extends MessageDialog
 {
-    protected ServerInstance server;
+    protected Server server;
 
     protected Button checkDeleteRunning;
     protected Button checkDeleteRunningStop;
@@ -58,7 +58,7 @@
      * @param server
      *      the server
      */
-    public DeleteServerDialog( Shell parentShell, ServerInstance server )
+    public DeleteServerDialog( Shell parentShell, Server server )
     {
         super( parentShell, "Delete Server", null, null, QUESTION, new String[]
             { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }, OK );

Copied: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java (from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerInstanceJob.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerInstanceJob.java&r1=661232&r2=661268&rev=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerInstanceJob.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java Thu May 29 02:20:51 2008
@@ -35,7 +35,7 @@
 import org.apache.directory.studio.apacheds.ConsolesHandler;
 import org.apache.directory.studio.apacheds.LogMessageConsole;
 import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.apache.log4j.net.SocketServer;
 import org.apache.mina.util.AvailablePortFinder;
@@ -64,15 +64,15 @@
 
 
 /**
- * This class implements a {@link Job} that is used to launch a server instance.
+ * This class implements a {@link Job} that is used to launch a server.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class LaunchServerInstanceJob extends Job
+public class LaunchServerJob extends Job
 {
     /** The server */
-    private ServerInstance server;
+    private Server server;
 
     /** The configuration */
     private ServerConfigurationV152 configuration;
@@ -85,14 +85,14 @@
 
 
     /**
-     * Creates a new instance of LaunchServerInstanceJob.
+     * Creates a new instance of LaunchServerJob.
      *
      * @param server
      *      the server
      * @param configuration
      *      the configuration
      */
-    public LaunchServerInstanceJob( ServerInstance server, ServerConfigurationV152 configuration )
+    public LaunchServerJob( Server server, ServerConfigurationV152 configuration )
     {
         super( "" );
         this.server = server;
@@ -135,10 +135,10 @@
         // Launching the socket server
         launchSocketServer( port );
 
-        // Overwriting the server instance log4j.properties file
+        // Overwriting the server's log4j.properties file
         try
         {
-            overwriteServerInstanceLog4jPropertiesFile( port );
+            overwriteServersLog4jPropertiesFile( port );
         }
         catch ( IOException e1 )
         {
@@ -311,7 +311,7 @@
     private void launchSocketServer( int port )
     {
         final int finalPort = port;
-        final IPath serverSocketFolderPath = ApacheDsPluginUtils.getApacheDsInstancesFolder().append( server.getId() )
+        final IPath serverSocketFolderPath = ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() )
             .append( "serverSocket" );
         final IPath log4jPropertiesFilePath = serverSocketFolderPath.append( "log4j.properties" );
 
@@ -331,19 +331,19 @@
 
 
     /**
-     * Overwrites the log4j.properties file of the server instance with the
+     * Overwrites the log4j.properties file of the server with the
      * given port number.
      * 
      * @param port
      *            the port
      * @throws IOException 
      */
-    private void overwriteServerInstanceLog4jPropertiesFile( int port ) throws IOException
+    private void overwriteServersLog4jPropertiesFile( int port ) throws IOException
     {
-        IPath confFolderPath = ApacheDsPluginUtils.getApacheDsInstancesFolder().append( server.getId() )
+        IPath confFolderPath = ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() )
             .append( "conf" );
         File confFolder = new File( confFolderPath.toOSString() );
-        ApacheDsPluginUtils.createServerInstanceLog4jPropertiesFile( new FileOutputStream( new File( confFolder,
+        ApacheDsPluginUtils.createServersLog4jPropertiesFile( new FileOutputStream( new File( confFolder,
             "log4j.properties" ) ), port );
     }
 
@@ -406,23 +406,23 @@
         workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false );
 
         // Useful paths
-        IPath instancesFolderPath = ApacheDsPluginUtils.getApacheDsInstancesFolder();
-        IPath instanceFolderPath = instancesFolderPath.append( server.getId() );
+        IPath serversFolderPath = ApacheDsPluginUtils.getApacheDsServersFolder();
+        IPath serverFolderPath = serversFolderPath.append( server.getId() );
 
         // Setting the program arguments attribute
-        workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, instanceFolderPath.append(
+        workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, serverFolderPath.append(
             "conf" ).append( "server.xml" ).toOSString() );
 
         // Creating the VM arguments string
         StringBuffer vmArguments = new StringBuffer();
         vmArguments.append( "-Dlog4j.configuration=file:"
-            + instanceFolderPath.append( "conf" ).append( "log4j.properties" ).toOSString() );
+            + serverFolderPath.append( "conf" ).append( "log4j.properties" ).toOSString() );
         vmArguments.append( " " );
-        vmArguments.append( "-Dapacheds.var.dir=\"" + instanceFolderPath.toOSString() + "\"" );
+        vmArguments.append( "-Dapacheds.var.dir=\"" + serverFolderPath.toOSString() + "\"" );
         vmArguments.append( " " );
-        vmArguments.append( "-Dapacheds.log.dir=\"" + instanceFolderPath.append( "log" ).toOSString() + "\"" );
+        vmArguments.append( "-Dapacheds.log.dir=\"" + serverFolderPath.append( "log" ).toOSString() + "\"" );
         vmArguments.append( " " );
-        vmArguments.append( "-Dapacheds.run.dir=\"" + instanceFolderPath.append( "run" ).toOSString() + "\"" );
+        vmArguments.append( "-Dapacheds.run.dir=\"" + serverFolderPath.append( "run" ).toOSString() + "\"" );
         vmArguments.append( " " );
         vmArguments.append( "-Dapacheds.instance=\"" + server.getName() + "\"" );
 

Copied: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java (from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerInstance.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerInstance.java&r1=661232&r2=661268&rev=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerInstance.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java Thu May 29 02:20:51 2008
@@ -24,38 +24,38 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.directory.studio.apacheds.jobs.LaunchServerInstanceJob;
+import org.apache.directory.studio.apacheds.jobs.LaunchServerJob;
 import org.eclipse.core.runtime.IAdaptable;
 
 
 /**
- * This class represents an Apache DS instance.
+ * This class represents an Apache DS server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ServerInstance implements IAdaptable
+public class Server implements IAdaptable
 {
-    /** The name of the instance */
+    /** The name of the server */
     private String name;
 
-    /** The ID of the instance */
+    /** The ID of the server */
     private String id;
 
-    /** The state of the instance */
+    /** The state of the server */
     private ServerStateEnum state = ServerStateEnum.STOPPED;
 
     /** The listeners list*/
     private List<ServerListener> listeners = new ArrayList<ServerListener>();
 
     /** The launch job */
-    private LaunchServerInstanceJob launchJob;
+    private LaunchServerJob launchJob;
 
 
     /**
-     * Creates a new instance of ApacheDsInstance.
+     * Creates a new instance of Server.
      */
-    public ServerInstance()
+    public Server()
     {
     }
 
@@ -95,14 +95,14 @@
 
 
     /**
-     * Creates a new instance of ApacheDsInstance.
+     * Creates a new instance of Server.
      * <p>
      * An ID is automatically created.
      *
      * @param name
-     *      the name of the instance
+     *      the name of the server
      */
-    public ServerInstance( String name )
+    public Server( String name )
     {
         this.name = name;
         id = createId();
@@ -110,14 +110,14 @@
 
 
     /**
-     * Creates a new instance of ApacheDsInstance.
+     * Creates a new instance of Server.
      *
      * @param name
-     *      the name of the instance
+     *      the name of the server
      * @param id
-     *      the id of the instance
+     *      the id of the server
      */
-    public ServerInstance( String name, String id )
+    public Server( String name, String id )
     {
         this.name = name;
         this.id = id;
@@ -125,10 +125,10 @@
 
 
     /**
-     * Gets the name of the instance
+     * Gets the name of the server
      *
      * @return
-     *      the name of the instance
+     *      the name of the server
      */
     public String getName()
     {
@@ -137,10 +137,10 @@
 
 
     /**
-     * Sets the name of the instance
+     * Sets the name of the server
      *
      * @param name
-     *      the name of the instance
+     *      the name of the server
      */
     public void setName( String name )
     {
@@ -168,10 +168,10 @@
 
 
     /**
-     * Gets the ID of the instance.
+     * Gets the ID of the server.
      *
      * @return
-     *      the ID of the instance
+     *      the ID of the server
      */
     public String getId()
     {
@@ -180,10 +180,10 @@
 
 
     /**
-     * Sets the ID of the instance.
+     * Sets the ID of the server.
      *
      * @param id
-     *      the ID of the instance
+     *      the ID of the server
      */
     public void setId( String id )
     {
@@ -252,7 +252,7 @@
      * @return
      *      the launch job
      */
-    public LaunchServerInstanceJob getLaunchJob()
+    public LaunchServerJob getLaunchJob()
     {
         return launchJob;
     }
@@ -264,7 +264,7 @@
      * @param launchJob
      *      the launch job
      */
-    public void setLaunchJob( LaunchServerInstanceJob launchJob )
+    public void setLaunchJob( LaunchServerJob launchJob )
     {
         this.launchJob = launchJob;
     }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerEvent.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerEvent.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerEvent.java Thu May 29 02:20:51 2008
@@ -29,13 +29,13 @@
 public class ServerEvent
 {
     /** The server */
-    private ServerInstance server;
+    private Server server;
 
     /** The kind of event */
     private ServerEventEnum kind;
 
 
-    public ServerEvent( ServerInstance server, ServerEventEnum kind )
+    public ServerEvent( Server server, ServerEventEnum kind )
     {
         super();
         this.server = server;
@@ -43,13 +43,13 @@
     }
 
 
-    public ServerInstance getServer()
+    public Server getServer()
     {
         return server;
     }
 
 
-    public void setServer( ServerInstance server )
+    public void setServer( Server server )
     {
         this.server = server;
     }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandler.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandler.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandler.java Thu May 29 02:20:51 2008
@@ -40,7 +40,7 @@
  * This class implements the servers handler.
  * <p>
  * 
- * It is used to store all the server instances used in the plugin.
+ * It is used to store all the servers used in the plugin.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -50,11 +50,11 @@
     /** The default instance */
     private static ServersHandler instance;
 
-    /** The list of server instances */
-    private List<ServerInstance> serverInstancesList;
+    /** The list of servers */
+    private List<Server> serversList;
     
-    /** The map of server instances identified by ID */
-    private Map<String, ServerInstance> serverInstancesIdMap;
+    /** The map of servers identified by ID */
+    private Map<String, Server> serversIdMap;
 
     /** The listeners */
     private List<ServersHandlerListener> listeners;
@@ -66,8 +66,8 @@
     private ServersHandler()
     {
         // Initializing lists and maps
-        serverInstancesList = new ArrayList<ServerInstance>();
-        serverInstancesIdMap = new HashMap<String, ServerInstance>();
+        serversList = new ArrayList<Server>();
+        serversIdMap = new HashMap<String, Server>();
         listeners = new ArrayList<ServersHandlerListener>();
     }
 
@@ -90,42 +90,42 @@
 
 
     /**
-     * Adds a server instance.
+     * Adds a server.
      *
-     * @param serverInstance
-     *      the server instance to be added
+     * @param server
+     *      the server to be added
      */
-    public void addServerInstance( ServerInstance serverInstance )
+    public void addServer( Server server )
     {
-        addServerInstance( serverInstance, true );
+        addServer( server, true );
 
-        saveServerInstancesToStore();
+        saveServersToStore();
     }
 
 
     /**
-     * Adds a server instance.
+     * Adds a server.
      *
-     * @param serverInstance
-     *      the server instance to be added
+     * @param server
+     *      the server to be added
      * @param notifyListeners
      *      <code>true</code> if the listeners need to be notified, 
      *      <code>false</code> if not.
      */
-    private void addServerInstance( ServerInstance serverInstance, boolean notifyListeners )
+    private void addServer( Server server, boolean notifyListeners )
     {
-        if ( !serverInstancesList.contains( serverInstance ) )
+        if ( !serversList.contains( server ) )
         {
-            // Adding the server instance
-            serverInstancesList.add( serverInstance );
-            serverInstancesIdMap.put( serverInstance.getId(), serverInstance );
+            // Adding the server
+            serversList.add( server );
+            serversIdMap.put( server.getId(), server );
 
             // Notifying listeners
             if ( notifyListeners )
             {
                 for ( ServersHandlerListener listener : listeners.toArray( new ServersHandlerListener[0] ) )
                 {
-                    listener.serverInstanceAdded( serverInstance );
+                    listener.serverAdded( server );
                 }
             }
         }
@@ -133,42 +133,42 @@
 
 
     /**
-     * Removes a server instance
+     * Removes a server.
      *
-     * @param serverInstance
-     *      the server instance to be removed
+     * @param server
+     *      the server to be removed
      */
-    public void removeServerInstance( ServerInstance serverInstance )
+    public void removeServer( Server server )
     {
-        removeServerInstance( serverInstance, true );
+        removeServer( server, true );
 
-        saveServerInstancesToStore();
+        saveServersToStore();
     }
 
 
     /**
-     * Removes a server instance
+     * Removes a server.
      *
-     * @param serverInstance
-     *      the server instance to be removed
+     * @param server
+     *      the server to be removed
      * @param notifyListeners
      *      <code>true</code> if the listeners need to be notified, 
      *      <code>false</code> if not.
      */
-    private void removeServerInstance( ServerInstance serverInstance, boolean notifyListeners )
+    private void removeServer( Server server, boolean notifyListeners )
     {
-        if ( serverInstancesList.contains( serverInstance ) )
+        if ( serversList.contains( server ) )
         {
-            // Removing the server instance
-            serverInstancesList.remove( serverInstance );
-            serverInstancesIdMap.remove( serverInstance.getId() );
+            // Removing the server
+            serversList.remove( server );
+            serversIdMap.remove( server.getId() );
 
             // Notifying listeners
             if ( notifyListeners )
             {
                 for ( ServersHandlerListener listener : listeners.toArray( new ServersHandlerListener[0] ) )
                 {
-                    listener.serverInstanceRemoved( serverInstance );
+                    listener.serverRemoved( server );
                 }
             }
         }
@@ -176,17 +176,17 @@
 
 
     /**
-     * Indicates if the server handler contains the given server instance.
+     * Indicates if the server handler contains the given server.
      *
-     * @param serverInstance
-     *      the server instance
+     * @param server
+     *      the server
      * @return
-     *      <code>true</code> if the server hander contains the given server
-     *      instance, <code>false</code> if not
+     *      <code>true</code> if the server hander contains the given server, 
+     *      <code>false</code> if not
      */
-    public boolean containsServerInstance( ServerInstance serverInstance )
+    public boolean containsServer( Server server )
     {
-        return serverInstancesList.contains( serverInstance );
+        return serversList.contains( server );
     }
 
 
@@ -221,21 +221,21 @@
 
 
     /**
-     * Loads the server instances from the file store.
+     * Loads the server from the file store.
      */
-    public void loadServerInstancesFromStore()
+    public void loadServersFromStore()
     {
-        File store = getServerInstancesStorePath().toFile();
+        File store = getServersStorePath().toFile();
 
         if ( store.exists() )
         {
             try
             {
                 InputStream inputStream = new FileInputStream( store );
-                List<ServerInstance> serverInstances = ServersHandlerIO.read( inputStream );
-                for ( ServerInstance serverInstance : serverInstances )
+                List<Server> servers = ServersHandlerIO.read( inputStream );
+                for ( Server server : servers )
                 {
-                    addServerInstance( serverInstance, false );
+                    addServer( server, false );
                 }
             }
             catch ( FileNotFoundException e )
@@ -253,14 +253,14 @@
 
 
     /**
-     * Saves the server instances to the file store.
+     * Saves the server to the file store.
      */
-    public void saveServerInstancesToStore()
+    public void saveServersToStore()
     {
         try
         {
-            OutputStream outputStream = new FileOutputStream( getServerInstancesStorePath().toFile() );
-            ServersHandlerIO.write( serverInstancesList, outputStream );
+            OutputStream outputStream = new FileOutputStream( getServersStorePath().toFile() );
+            ServersHandlerIO.write( serversList, outputStream );
         }
         catch ( FileNotFoundException e )
         {
@@ -276,20 +276,20 @@
 
 
     /**
-     * Gets the path to the server instances file.
+     * Gets the path to the server file.
      *
      * @return
-     *      the path to the server instances file.
+     *      the path to the server file.
      */
-    private IPath getServerInstancesStorePath()
+    private IPath getServersStorePath()
     {
-        return ApacheDsPlugin.getDefault().getStateLocation().append( "serverInstances.xml" );
+        return ApacheDsPlugin.getDefault().getStateLocation().append( "servers.xml" );
     }
 
 
     /**
      * Indicates if the given is available (i.e. not already taken by another 
-     * server instance).
+     * server).
      *
      * @param name
      *      the name
@@ -299,7 +299,7 @@
      */
     public boolean isNameAvailable( String name )
     {
-        for ( ServerInstance server : serverInstancesList )
+        for ( Server server : serversList )
         {
             if ( server.getName().equalsIgnoreCase( name ) )
             {
@@ -312,25 +312,25 @@
 
 
     /**
-     * Gets the server instances list.
+     * Gets the servers list.
      *
      * @return
-     *      the server instances list.
+     *      the servers list.
      */
-    public List<ServerInstance> getServerInstancesList()
+    public List<Server> getServersList()
     {
-        return serverInstancesList;
+        return serversList;
     }
 
 
     /**
-     * Gets the server instance associated with the given id.
+     * Gets the server associated with the given id.
      *
      * @return
-     *      the server instance associated witht the given id.
+     *      the server associated witht the given id.
      */
-    public ServerInstance getServerInstanceById( String id )
+    public Server getServerById( String id )
     {
-        return serverInstancesIdMap.get( id );
+        return serversIdMap.get( id );
     }
 }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerAdapter.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerAdapter.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerAdapter.java Thu May 29 02:20:51 2008
@@ -28,27 +28,26 @@
  */
 public class ServersHandlerAdapter implements ServersHandlerListener
 {
-
     /* (non-Javadoc)
-     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverInstanceAdded(org.apache.directory.studio.apacheds.model.ServerInstance)
+     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverAdded(org.apache.directory.studio.apacheds.model.Server)
      */
-    public void serverInstanceAdded( ServerInstance serverInstance )
+    public void serverAdded( Server server )
     {
     }
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverInstanceRemoved(org.apache.directory.studio.apacheds.model.ServerInstance)
+     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverRemoved(org.apache.directory.studio.apacheds.model.Server)
      */
-    public void serverInstanceRemoved( ServerInstance serverInstance )
+    public void serverRemoved( Server server )
     {
     }
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverInstanceUpdated(org.apache.directory.studio.apacheds.model.ServerInstance)
+     * @see org.apache.directory.studio.apacheds.model.ServersHandlerListener#serverUpdated(org.apache.directory.studio.apacheds.model.Server)
      */
-    public void serverInstanceUpdated( ServerInstance serverInstance )
+    public void serverUpdated( Server server )
     {
     }
 }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java Thu May 29 02:20:51 2008
@@ -46,8 +46,8 @@
 public class ServersHandlerIO
 {
     // XML tags and attributes
-    private static final String SERVER_INSTANCES_TAG = "serverInstances";
-    private static final String SERVER_INSTANCE_TAG = "serverInstance";
+    private static final String SERVERS_TAG = "servers";
+    private static final String SERVER_TAG = "server";
     private static final String SERVER_ID_ATTRIBUTE = "id";
     private static final String SERVER_NAME_ATTRIBUTE = "name";
 
@@ -61,9 +61,9 @@
      *      
      * @throws ServersHandlerIOException
      */
-    public static List<ServerInstance> read( InputStream stream ) throws ServersHandlerIOException
+    public static List<Server> read( InputStream stream ) throws ServersHandlerIOException
     {
-        List<ServerInstance> serverInstances = new ArrayList<ServerInstance>();
+        List<Server> servers = new ArrayList<Server>();
 
         SAXReader saxReader = new SAXReader();
         Document document = null;
@@ -78,73 +78,73 @@
         }
 
         Element rootElement = document.getRootElement();
-        if ( !rootElement.getName().equals( SERVER_INSTANCES_TAG ) )
+        if ( !rootElement.getName().equals( SERVERS_TAG ) )
         {
             throw new ServersHandlerIOException( "The file does not seem to be a valid servers file." );
         }
 
-        for ( Iterator<?> i = rootElement.elementIterator( SERVER_INSTANCE_TAG ); i.hasNext(); )
+        for ( Iterator<?> i = rootElement.elementIterator( SERVER_TAG ); i.hasNext(); )
         {
-            serverInstances.add( readServerInstance( ( Element ) i.next() ) );
+            servers.add( readServer( ( Element ) i.next() ) );
         }
 
-        return serverInstances;
+        return servers;
     }
 
 
     /**
-     * Reads a server instance element.
+     * Reads a server element.
      *
      * @param element
      *      the element
      * @return
-     *      the corresponding {@link ServerInstance}
+     *      the corresponding {@link Server}
      */
-    private static ServerInstance readServerInstance( Element element )
+    private static Server readServer( Element element )
     {
-        ServerInstance serverInstance = new ServerInstance();
+        Server server = new Server();
 
         // ID
         Attribute idAttribute = element.attribute( SERVER_ID_ATTRIBUTE );
         if ( idAttribute != null )
         {
-            serverInstance.setId( idAttribute.getValue() );
+            server.setId( idAttribute.getValue() );
         }
 
         // Name
         Attribute nameAttribute = element.attribute( SERVER_NAME_ATTRIBUTE );
         if ( nameAttribute != null )
         {
-            serverInstance.setName( nameAttribute.getValue() );
+            server.setName( nameAttribute.getValue() );
         }
 
-        return serverInstance;
+        return server;
     }
 
 
     /**
-     * Writes the list of server instances to the given stream.
+     * Writes the list of servers to the given stream.
      *
-     * @param serverInstances
-     *      the server instances
+     * @param servers
+     *      the servers
      * @param outputStream
      *      the output stream
      * @throws IOException
      *      if an error occurs when writing to the stream
      */
-    public static void write( List<ServerInstance> serverInstances, OutputStream outputStream ) throws IOException
+    public static void write( List<Server> servers, OutputStream outputStream ) throws IOException
     {
         // Creating the Document
         Document document = DocumentHelper.createDocument();
 
         // Creating the root element
-        Element root = document.addElement( SERVER_INSTANCES_TAG );
+        Element root = document.addElement( SERVERS_TAG );
 
-        if ( serverInstances != null )
+        if ( servers != null )
         {
-            for ( ServerInstance serverInstance : serverInstances )
+            for ( Server server : servers )
             {
-                addServerInstance( serverInstance, root );
+                addServer( server, root );
             }
         }
 
@@ -158,22 +158,22 @@
 
 
     /**
-     * Adds the XML representation of the server instance to the given parent. 
+     * Adds the XML representation of the server to the given parent. 
      *
-     * @param serverInstance
-     *      the server instance
+     * @param server
+     *      the server
      * @param parent
      *      the parent element
      */
-    private static void addServerInstance( ServerInstance serverInstance, Element parent )
+    private static void addServer( Server server, Element parent )
     {
-        // Server instance element
-        Element serverInstanceElement = parent.addElement( SERVER_INSTANCE_TAG );
+        // Server element
+        Element serverElement = parent.addElement( SERVER_TAG );
 
         // ID
-        serverInstanceElement.addAttribute( SERVER_ID_ATTRIBUTE, serverInstance.getId() );
+        serverElement.addAttribute( SERVER_ID_ATTRIBUTE, server.getId() );
 
         // Name
-        serverInstanceElement.addAttribute( SERVER_NAME_ATTRIBUTE, serverInstance.getName() );
+        serverElement.addAttribute( SERVER_NAME_ATTRIBUTE, server.getName() );
     }
 }

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIOException.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIOException.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIOException.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIOException.java Thu May 29 02:20:51 2008
@@ -22,7 +22,7 @@
 
 /**
  * This exception can be raised when an error occurs when loading or saving 
- * the server instances to the store.
+ * the servers to the store.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerListener.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerListener.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerListener.java Thu May 29 02:20:51 2008
@@ -29,28 +29,28 @@
 public interface ServersHandlerListener
 {
     /**
-     * This method is called when a server instance is added.
+     * This method is called when a server is added.
      *
-     * @param serverInstance
-     *      the added server instance
+     * @param server
+     *      the added server
      */
-    void serverInstanceAdded( ServerInstance serverInstance );
+    void serverAdded( Server server );
 
 
     /**
-     * This method is called when a server instance is removed.
+     * This method is called when a server is removed.
      *
-     * @param serverInstance
-     *      the removed server instance
+     * @param server
+     *      the removed server
      */
-    void serverInstanceRemoved( ServerInstance serverInstance );
+    void serverRemoved( Server server );
 
 
     /**
-     * This method is called when a server instance is updated.
+     * This method is called when a server is updated.
      *
-     * @param serverInstance
-     *      the updated server instance
+     * @param server
+     *      the updated server
      */
-    void serverInstanceUpdated( ServerInstance serverInstance );
+    void serverUpdated( Server server );
 }

Copied: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java (from r661232, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerInstancePropertyPage.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerInstancePropertyPage.java&r1=661232&r2=661268&rev=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerInstancePropertyPage.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java Thu May 29 02:20:51 2008
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -34,17 +34,20 @@
 
 
 /**
- * This class implements the 
+ * This class implements the Info property page for a server.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ServerInstancePropertyPage extends PropertyPage implements IWorkbenchPropertyPage
+public class ServerPropertyPage extends PropertyPage implements IWorkbenchPropertyPage
 {
+    public static final String ID = "org.apache.directory.studio.apacheds.properties.serverProperties";
+
+
     /**
-     * Creates a new instance of ServerInstancePropertyPage.
+     * Creates a new instance of ServerPropertyPage.
      */
-    public ServerInstancePropertyPage()
+    public ServerPropertyPage()
     {
         super();
         super.noDefaultAndApplyButton();
@@ -79,12 +82,12 @@
         gd.widthHint = 300;
         locationText.setLayoutData( gd );
 
-        // Getting the server instance
-        ServerInstance serverInstance = ( ServerInstance ) getElement();
-        if ( serverInstance != null )
+        // Getting the server
+        Server server = ( Server ) getElement();
+        if ( server != null )
         {
-            nameText.setText( serverInstance.getName() );
-            locationText.setText( ApacheDsPluginUtils.getApacheDsInstancesFolder().append( serverInstance.getId() )
+            nameText.setText( server.getName() );
+            locationText.setText( ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() )
                 .toOSString() );
         }
 

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java?rev=661268&r1=661267&r2=661268&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java Thu May 29 02:20:51 2008
@@ -35,7 +35,7 @@
 
 import org.apache.directory.studio.apacheds.model.ServerEvent;
 import org.apache.directory.studio.apacheds.model.ServerEventEnum;
-import org.apache.directory.studio.apacheds.model.ServerInstance;
+import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerListener;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.apache.directory.studio.apacheds.model.ServersHandler;
@@ -75,7 +75,7 @@
     private boolean stopAnimation;
 
     /** The list of server needing animation */
-    private List<ServerInstance> serversNeedingAnimation = new ArrayList<ServerInstance>();
+    private List<Server> serversNeedingAnimation = new ArrayList<Server>();
 
 
     public ServersTableViewer( Tree tree )
@@ -102,23 +102,23 @@
         // The server handler listener
         serversHandlerListener = new ServersHandlerListener()
         {
-            public void serverInstanceAdded( ServerInstance serverInstance )
+            public void serverAdded( Server server )
             {
-                addServer( serverInstance );
-                serverInstance.addListener( serverListener );
+                addServer( server );
+                server.addListener( serverListener );
             }
 
 
-            public void serverInstanceRemoved( ServerInstance serverInstance )
+            public void serverRemoved( Server server )
             {
-                refreshServer( serverInstance );
+                refreshServer( server );
             }
 
 
-            public void serverInstanceUpdated( ServerInstance serverInstance )
+            public void serverUpdated( Server server )
             {
-                removeServer( serverInstance );
-                serverInstance.removeListener( serverListener );
+                removeServer( server );
+                server.removeListener( serverListener );
 
             }
         };
@@ -139,7 +139,7 @@
 
                 // Getting the kind of event and the associated server 
                 ServerEventEnum kind = event.getKind();
-                ServerInstance server = event.getServer();
+                Server server = event.getServer();
                 switch ( kind )
                 {
                     // The server state has changed
@@ -209,7 +209,7 @@
         };
 
         // Adding the listener to the servers
-        for ( ServerInstance server : ServersHandler.getDefault().getServerInstancesList() )
+        for ( Server server : ServersHandler.getDefault().getServersList() )
         {
             server.addListener( serverListener );
         }
@@ -222,7 +222,7 @@
      * @param server
      *      the server
      */
-    private void addServer( final ServerInstance server )
+    private void addServer( final Server server )
     {
         Display.getDefault().asyncExec( new Runnable()
         {
@@ -240,7 +240,7 @@
      * @param server
      *      the server
      */
-    private void refreshServer( final ServerInstance server )
+    private void refreshServer( final Server server )
     {
         Display.getDefault().asyncExec( new Runnable()
         {
@@ -267,7 +267,7 @@
      * @param server
      *      the server
      */
-    private void removeServer( final ServerInstance server )
+    private void removeServer( final Server server )
     {
         Display.getDefault().asyncExec( new Runnable()
         {
@@ -302,7 +302,7 @@
                         labelProvider.animate();
 
                         // Looping on the currently starting servers
-                        for ( ServerInstance server : serversNeedingAnimation.toArray( new ServerInstance[0] ) )
+                        for ( Server server : serversNeedingAnimation.toArray( new Server[0] ) )
                         {
                             if ( server != null && getTree() != null && !getTree().isDisposed() )
                             {
@@ -347,7 +347,7 @@
      * @param server
      *      the server
      */
-    private void updateAnimation( ServerInstance server )
+    private void updateAnimation( Server server )
     {
         try
         {



Mime
View raw message