Merge branch 'master' of git@github.com:gluster/console

23 files changed, 211 insertions, 115 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index 6f4ba050..3c6a2d40 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -22,7 +22,6 @@ import javax.ws.rs.core.MultivaluedMap;
 

 import com.gluster.storage.management.client.utils.ClientUtil;

 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;

-import com.gluster.storage.management.core.model.TaskInfo;

 import com.sun.jersey.api.client.Client;

 import com.sun.jersey.api.client.ClientResponse;

 import com.sun.jersey.api.client.UniformInterfaceException;

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 221651a3..8d821174 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -24,6 +24,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Cluster;
@@ -53,6 +55,8 @@ public class GlusterDataModelManager {
 	private List<ClusterListener> listeners = new ArrayList<ClusterListener>();
 	private List<VolumeOptionInfo> volumeOptionsDefaults;
 	private String clusterName;
+ 	private static Boolean syncInProgress = false;
+	private static final Logger logger = Logger.getLogger(GlusterDataModelManager.class);
 
 	private GlusterDataModelManager() {
 	}
@@ -106,7 +110,17 @@ public class GlusterDataModelManager {
 	}
 	
 	public void refreshModel() {
+		synchronized (syncInProgress) {
+			if(syncInProgress) {
+				logger.info("Previous data sync is still running. Skipping this one.");
+				return;
+			}
+			syncInProgress = true;
+		}
+		
+		logger.info("Starting data sync");
 		updateModel(fetchData(clusterName));
+		syncInProgress = false;
 	}
 	
 	private void updateModel(GlusterDataModel model) {
@@ -600,8 +614,7 @@ public class GlusterDataModelManager {
 	}
 	
 	public void removeTask(TaskInfo taskInfo) {
-		Cluster cluster = model.getCluster();
-		cluster.removeTaskInfo(taskInfo);
+		model.getCluster().removeTaskInfo(taskInfo);
 		for (ClusterListener listener : listeners) {
 			listener.taskAdded(taskInfo);
 		}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
index 4f6c317c..289978ad 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
@@ -155,7 +155,7 @@ public class Cluster extends Entity {
 	
 	public GlusterServer getServer(String serverName) {
 		for(GlusterServer server : servers) {
-			if (server.getName().equals(serverName)) {
+			if (server.getName().equalsIgnoreCase(serverName)) {
 				return server;
 			}
 		}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
index 9e9212dc..39696665 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
@@ -1,5 +1,4 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
  * Gluster Management Console is free software; you can redistribute it and/or 
@@ -35,8 +34,6 @@ public class Server extends Entity {
 	private double cpuUsage;
 	private double totalMemory;
 	private double memoryInUse;
-	private double totalDiskSpace = 0;
-	private double diskSpaceInUse = 0;
 	private List<Disk> disks = new ArrayList<Disk>();
 	private List<NetworkInterface> networkInterfaces = new ArrayList<NetworkInterface>();
 
@@ -89,19 +86,22 @@ public class Server extends Entity {
 	}
 
 	public double getTotalDiskSpace() {
+		double totalDiskSpace = 0;
+		for(Disk disk : getDisks()) {
+			if(disk.isReady()) {
+				totalDiskSpace += disk.getSpace();
+			}
+		}
 		return totalDiskSpace;
 	}
 
-	/**
-	 * Total disk space is automatically calculated, and hence this method should never be called. It is required only
-	 * to make sure that the element "totalDiskSpace" gets added to the XML tag when jersey converts the server object
-	 * to XML for sending to client.
-	 */
-	public void setTotalDiskSpace(double totalDiskSpace) {
-		this.totalDiskSpace = totalDiskSpace;
-	}
-
 	public double getDiskSpaceInUse() {
+		double diskSpaceInUse = 0;
+		for(Disk disk : getDisks()) {
+			if(disk.isReady()) {
+				diskSpaceInUse += disk.getSpaceInUse();
+			}
+		}
 		return diskSpaceInUse;
 	}
 	
@@ -109,15 +109,6 @@ public class Server extends Entity {
 		return getTotalDiskSpace() - getDiskSpaceInUse();
 	}
 	
-	/**
-	 * Total disk space in use is automatically calculated, and hence this method should never be called. It is required
-	 * only to make sure that the element "diskSpaceInUse" gets added to the XML tag when jersey converts the server
-	 * object to XML for sending to client.
-	 */
-	public void setDiskSpaceInUse(double diskSpaceInUse) {
-		this.diskSpaceInUse = diskSpaceInUse;
-	}
-
 	@XmlElementWrapper(name = "networkInterfaces")
 	@XmlElement(name = "networkInterface", type = NetworkInterface.class)
 	public List<NetworkInterface> getNetworkInterfaces() {
@@ -139,10 +130,7 @@ public class Server extends Entity {
 	}
 
 	public void addDisk(Disk disk) {
-		if (disks.add(disk) && disk.isReady()) {
-			totalDiskSpace += disk.getSpace();
-			diskSpaceInUse += disk.getSpaceInUse();
-		}
+		disks.add(disk);
 	}
 
 	public void addDisks(Collection<Disk> disks) {
@@ -152,16 +140,11 @@ public class Server extends Entity {
 	}
 
 	public void removeDisk(Disk disk) {
-		if (disks.remove(disk)) {
-			totalDiskSpace -= disk.getSpace();
-			diskSpaceInUse -= disk.getSpaceInUse();
-		}
+		disks.remove(disk);
 	}
 
 	public void removeAllDisks() {
 		disks.clear();
-		totalDiskSpace = 0;
-		diskSpaceInUse = 0;
 	}
 
 	public void setDisks(List<Disk> disks) {
@@ -203,8 +186,6 @@ public class Server extends Entity {
 		setCpuUsage(server.getCpuUsage());
 		setTotalMemory(server.getTotalMemory());
 		setMemoryInUse(server.getMemoryInUse());
-		setTotalDiskSpace(server.getTotalDiskSpace());
-		setDiskSpaceInUse(server.getDiskSpaceInUse());
 	}
 	
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java
index 598f9639..bff46096 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java
@@ -23,10 +23,14 @@ import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -35,6 +39,8 @@ import org.eclipse.ui.PlatformUI;
 
 import com.gluster.storage.management.core.model.Entity;
 import com.gluster.storage.management.gui.dialogs.LoginDialog;
+import com.gluster.storage.management.gui.jobs.DataSyncJob;
+import com.gluster.storage.management.gui.preferences.PreferenceConstants;
 
 /**
  * This class controls all aspects of the application's execution
@@ -45,6 +51,7 @@ public class Application implements IApplication {
 	private static Application instance;
 	private List<IEntityListener> entityListeners = Collections.synchronizedList(new ArrayList<IEntityListener>());
 	private IStatusLineManager statusLineManager;
+	private Job syncJob;
 
 	public Application() {
 		instance = this;
@@ -88,16 +95,36 @@ public class Application implements IApplication {
 			return IApplication.EXIT_OK;
 		}
 		try {
+			setupBackgroundJobs();
+			
 			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
 			if (returnCode == PlatformUI.RETURN_RESTART) {
 				return IApplication.EXIT_RESTART;
 			}
+			
 			return IApplication.EXIT_OK;
 		} finally {
 			display.dispose();
 		}
 	}
 
+	private void setupBackgroundJobs() {
+		// 1 minute delay for first run
+		final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
+		final long JOB_INTERVAL = preferenceStore.getLong(PreferenceConstants.P_DATA_SYNC_INTERVAL) * 1000;
+		
+		syncJob = new DataSyncJob("Syncing cluster data in background");
+		syncJob.schedule(JOB_INTERVAL);
+		syncJob.addJobChangeListener(new JobChangeAdapter() {
+			@Override
+			public void done(IJobChangeEvent event) {
+				super.done(event);
+				// job done. schedule again after the pre-defined interval
+				syncJob.schedule(JOB_INTERVAL);
+			}
+		});
+	}
+
 	private void setSystemProperties() {
 		// TODO: Trying this to avoid the webstart authentication dialog
 		// to be tested, and removed if this doesn't work.
@@ -116,6 +143,7 @@ public class Application implements IApplication {
 		final Display display = workbench.getDisplay();
 		display.syncExec(new Runnable() {
 			public void run() {
+				syncJob.cancel();
 				if (!display.isDisposed())
 					workbench.close();
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java
index 6fff4f44..4a580d05 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java
@@ -17,7 +17,7 @@ public class ClearTaskAction extends AbstractActionDelegate {
 		final String actionDesc = action.getDescription();
 
 		try {
-			new TasksClient().resumeTask(taskInfo.getName());
+			new TasksClient().deleteTask(taskInfo.getName()); // taskId
 			modelManager.removeTask(taskInfo);
 		} catch (Exception e) {
 			showErrorDialog(actionDesc,
@@ -33,6 +33,8 @@ public class ClearTaskAction extends AbstractActionDelegate {
 			taskInfo = (TaskInfo) selectedEntity;
 			action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_SUCCESS 
 							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_FAILURE);
+		} else {
+			action.setEnabled(false);
 		}
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
index 86e3032e..86a71882 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
@@ -5,11 +5,9 @@ import org.eclipse.jface.viewers.ISelection;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
 
 public class CommitTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
@@ -21,12 +19,8 @@ public class CommitTaskAction extends AbstractActionDelegate {
 		try {
 			new TasksClient().commitTask(taskInfo.getName());
 			taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_SUCCESS, "Committed")));
-			modelManager.removeTask(taskInfo);
-			Volume volume = (new VolumesClient()).getVolume(taskInfo.getReference());
-			modelManager.updateVolumeBricks(modelManager.getModel().getCluster().getVolume(taskInfo.getReference()),
-					volume.getBricks());
-
 			showInfoDialog(actionDesc, "Commit successful");
+			modelManager.removeTask(taskInfo);
 		} catch (Exception e) {
 			showErrorDialog(actionDesc,
 					"Task [" + taskInfo.getName() + "] could not be Committed! Error: [" + e.getMessage() + "]");
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java
index e3a4b835..872df738 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java
@@ -28,6 +28,7 @@ import com.gluster.storage.management.client.TasksClient;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskStatus;
+import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
 
 
 public class PauseTaskAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java
index 12d14b43..306edbf3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java
@@ -2,13 +2,11 @@ package com.gluster.storage.management.gui.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Display;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.TasksClient;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
 
 public class StopTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
@@ -19,9 +17,10 @@ public class StopTaskAction extends AbstractActionDelegate {
 		final String actionDesc = action.getDescription();
 
 		try {
-			new TasksClient().resumeTask(taskInfo.getName());
-			taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_SUCCESS, "Stopped")));
-			modelManager.updateTask(taskInfo);
+			new TasksClient().stopTask(taskInfo.getName());
+			// On successful stop clear from the task list
+			modelManager.removeTask(taskInfo);
+			action.setEnabled(false); // TODO disable other task buttons
 		} catch (Exception e) {
 			showErrorDialog(actionDesc,
 					"Task [" + taskInfo.getDescription() + "] could not be Stopped! Error: [" + e.getMessage() + "]");
@@ -42,7 +41,6 @@ public class StopTaskAction extends AbstractActionDelegate {
 
 	@Override
 	public void dispose() {
-
 	}
 
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
new file mode 100644
index 00000000..f6fd1ba4
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *  
+ * Gluster Management Console is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package com.gluster.storage.management.gui.jobs;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.gui.utils.GUIHelper;
+
+/**
+ *
+ */
+public class DataSyncJob extends Job {
+	public DataSyncJob(String name) {
+		super(name);		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	protected IStatus run(IProgressMonitor monitor) {
+		Display.getDefault().asyncExec(new Runnable() {
+			
+			@Override
+			public void run() {
+				GUIHelper.getInstance().setStatusMessage("Data sync in progress...");
+				GlusterDataModelManager.getInstance().refreshModel();
+				GUIHelper.getInstance().setStatusMessage(null);
+			}
+		});
+		
+		return Status.OK_STATUS;
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java
index 431a8128..d8eee3e4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java
@@ -77,7 +77,7 @@ public class GlusterPreferencePage
 
 		addField(new ComboFieldEditor(PreferenceConstants.P_DEFAULT_CLUSTER_NAME, "Default &Cluster to manage:",
 				clusterNamesArr, getFieldEditorParent()));
-		addField(new IntegerFieldEditor(PreferenceConstants.P_DATA_REFRESH_INTERVAL, "&Data Refresh Interval:",
+		addField(new IntegerFieldEditor(PreferenceConstants.P_DATA_SYNC_INTERVAL, "&Data Sync Interval (sec):",
 				getFieldEditorParent()));
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
index 260aadb6..039cf488 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
@@ -25,12 +25,11 @@ public class PreferenceConstants {
 	
 	public static final String P_SHOW_CLUSTER_SELECTION_DIALOG = "show.cluster.selection.dialog";
 	public static final String P_DEFAULT_CLUSTER_NAME = "default.cluster.name";
-	public static final String P_DATA_REFRESH_INTERVAL = "data.refresh.interval";
+	public static final String P_DATA_SYNC_INTERVAL = "data.sync.interval";
 
 	// TODO: Remove after proper preferences are added
 	public static final String P_PATH = "pathPreference";
 	public static final String P_BOOLEAN = "booleanPreference";
 	public static final String P_CHOICE = "choicePreference";
 	public static final String P_STRING = "stringPreference";
-	
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
index 1a4104ac..909b957a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
@@ -37,5 +37,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		
 		store.setDefault(PreferenceConstants.P_SHOW_CLUSTER_SELECTION_DIALOG, true);
+		
+		// default data sync interval = 5 minutes
+		store.setDefault(PreferenceConstants.P_DATA_SYNC_INTERVAL, 300);
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
index 77e902ab..f9526ef9 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
@@ -41,11 +41,17 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.model.ClusterListener;
+import com.gluster.storage.management.core.model.DefaultClusterListener;
+import com.gluster.storage.management.core.model.Event;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS;
+import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.NetworkInterfaceTableLabelProvider;
+import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.richclientgui.toolbox.gauges.CoolGauge;
 
@@ -55,6 +61,7 @@ public class GlusterServerSummaryView extends ViewPart {
 	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 	private ScrolledForm form;
 	private GlusterServer server;
+	private ClusterListener serverChangedListener;
 
 	public enum NETWORK_INTERFACE_TABLE_COLUMN_INDICES {
 		INTERFACE, MODEL, SPEED, IP_ADDRESS, NETMASK, GATEWAY
@@ -62,6 +69,7 @@ public class GlusterServerSummaryView extends ViewPart {
 
 	private static final String[] NETWORK_INTERFACE_TABLE_COLUMN_NAMES = { "Interface", "Model", "Speed", "IP Address",
 			"Netmask", "Gateway" };
+	private CoolGauge cpuGauge;
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -70,6 +78,28 @@ public class GlusterServerSummaryView extends ViewPart {
 		}
 		setPartName("Summary");
 		createSections(parent);
+		
+		final GlusterToolbarManager toolbarManager = new GlusterToolbarManager(getSite().getWorkbenchWindow());
+		// Refresh the navigation tree whenever there is a change to the data model
+		serverChangedListener = new DefaultClusterListener() {
+			@Override
+			public void serverChanged(GlusterServer server, Event event) {
+				updateServerDetails();
+				toolbarManager.updateToolbar(server);
+			}
+		};
+		GlusterDataModelManager.getInstance().addClusterListener(serverChangedListener);
+	}
+	
+	private void updateServerDetails() {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	@Override
+	public void dispose() {
+		super.dispose();
+		GlusterDataModelManager.getInstance().removeClusterListener(serverChangedListener);
 	}
 
 	private void createSections(Composite parent) {
@@ -100,15 +130,15 @@ public class GlusterServerSummaryView extends ViewPart {
 			// toolkit.createLabel(section, online ? "" + server.getCpuUsage() : "NA", SWT.NONE);
 
 			toolkit.createLabel(section, "% CPU Usage (avg): ", SWT.NONE);
-			CoolGauge gauge = new CoolGauge(section, guiHelper.getImage(IImageKeys.GAUGE_SMALL));
-			gauge.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false));
-			gauge.setGaugeNeedleColour(Display.getDefault().getSystemColor(SWT.COLOR_RED));
-			gauge.setGaugeNeedleWidth(2);
-			gauge.setGaugeNeedlePivot(new Point(66, 65));
-
-			gauge.setPoints(getPnts());
-			gauge.setLevel(server.getCpuUsage() / 100);
-			gauge.setToolTipText(server.getCpuUsage() + "%");
+			cpuGauge = new CoolGauge(section, guiHelper.getImage(IImageKeys.GAUGE_SMALL));
+			cpuGauge.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false));
+			cpuGauge.setGaugeNeedleColour(Display.getDefault().getSystemColor(SWT.COLOR_RED));
+			cpuGauge.setGaugeNeedleWidth(2);
+			cpuGauge.setGaugeNeedlePivot(new Point(66, 65));
+
+			cpuGauge.setPoints(getPnts());
+			cpuGauge.setLevel(server.getCpuUsage() / 100);
+			cpuGauge.setToolTipText(server.getCpuUsage() + "%");
 
 			toolkit.createLabel(section, "Memory Usage: ", SWT.NONE);
 			ProgressBar memoryUsageBar = new ProgressBar(section, SWT.SMOOTH);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index 17bb28f4..e0df170b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -80,24 +80,14 @@ public class VolumeSummaryView extends ViewPart {
 		setPartName("Summary");
 		createSections();
 
+		final GlusterToolbarManager toolbarManager = new GlusterToolbarManager(getSite().getWorkbenchWindow());
 		// Refresh the navigation tree whenever there is a change to the data model
 		volumeChangedListener = new DefaultClusterListener() {
-			@SuppressWarnings("unchecked")
 			@Override
 			public void volumeChanged(Volume volume, Event event) {
-				if (event.getEventType() == EVENT_TYPE.VOLUME_STATUS_CHANGED) {
-					updateVolumeStatusLabel();
-					new GlusterToolbarManager(getSite().getWorkbenchWindow()).updateToolbar(volume);
-				} else if (event.getEventType() == EVENT_TYPE.VOLUME_OPTION_SET) {
-					Entry<String, String> option = (Entry<String, String>) event.getEventData();
-					if (option.getKey().equals(Volume.OPTION_AUTH_ALLOW)) {
-						// access control option value has changed. update the text field with new value.
-						populateAccessControlText();
-					}
-				} else if (event.getEventType() == EVENT_TYPE.VOLUME_OPTIONS_RESET) {
-					// all volume options reset. populate access control text with default value.
-					populateAccessControlText();
-				}
+				updateVolumeStatusLabel();
+				populateAccessControlText();
+				toolbarManager.updateToolbar(volume);
 			}
 		};
 		GlusterDataModelManager.getInstance().addClusterListener(volumeChangedListener);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java
index 80aceb8b..5aaf7094 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java
@@ -61,12 +61,14 @@ public abstract class AbstractTableViewerPage<T> extends Composite implements IS
 	protected TableViewer tableViewer;
 	protected GUIHelper guiHelper = GUIHelper.getInstance();
 	protected Composite parent;
+	protected IWorkbenchSite site;
 	
 	private Hyperlink linkAll, linkNone;
 
 	public AbstractTableViewerPage(IWorkbenchSite site, final Composite parent, int style, boolean useChechboxes, boolean multiSelection, Object model) {
 		super(parent, style);
 		this.parent = parent;
+		this.site = site;
 		
 		this.useCheckboxes = useChechboxes;
 		this.multiSelection = multiSelection;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java
index b3821c6b..8fbeb891 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java
@@ -28,8 +28,6 @@ import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
@@ -39,13 +37,11 @@ import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.Entity;
 import com.gluster.storage.management.core.model.Event;
+import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
 import com.gluster.storage.management.gui.TasksTableLabelProvider;
-import com.gluster.storage.management.gui.actions.IActionConstants;
 import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	private List<TaskInfo> taskInfoList;
@@ -77,11 +73,17 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 			@Override
 			public void taskRemoved(TaskInfo taskInfo) {
 				refreshViewer();
+				// hide the task related actionset as no task is selected
+				// site.getPage().hideActionSet(IActionConstants.ACTION_SET_TASK);
+				tableViewer.setSelection(new StructuredSelection(taskInfo));
 			}
 			
 			@Override
 			public void taskUpdated(TaskInfo taskInfo) {
 				refreshViewer();
+				// fire selection event so that toolbar gets updated
+				// (the action class listens to selection and enables/disables automatically)
+				tableViewer.setSelection(new StructuredSelection(taskInfo));
 			}
 			
 			private void refreshViewer() {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java
index 1acba6b7..38b68040 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java
@@ -153,7 +153,7 @@ public class TasksResource extends AbstractResource {
 	@DELETE
 	@Path("/{" + PATH_PARAM_TASK_ID + "}")
 	@Produces(MediaType.APPLICATION_XML)
-	public Response deleteTask(@PathParam(PATH_PARAM_TASK_ID) String taskId,
+	public Response clearTask(@PathParam(PATH_PARAM_TASK_ID) String taskId,
 			@QueryParam(FORM_PARAM_OPERATION) String taskOperation) {
 		Task task = getTask(taskId);
 		if (task == null) {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/DiskMigrationStatusTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/BrickMigrationStatusTask.java
index ccfd58be..0f00ad3a 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/DiskMigrationStatusTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/BrickMigrationStatusTask.java
@@ -27,7 +27,7 @@ import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.server.resources.v1_0.TasksResource;
 
 @Component
-public class DiskMigrationStatusTask {
+public class BrickMigrationStatusTask {
 
 	@Autowired
 	private TasksResource tasksResource;
@@ -39,5 +39,4 @@ public class DiskMigrationStatusTask {
 			}
 		}
 	}
-
 }
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java
index 8e38bd40..3fe794f5 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java
@@ -94,7 +94,7 @@ public class InitServerTask extends JdbcDaoSupport {
 	}
 
 	private void initDatabase() {
-		logger.debug("Initializing server data...");
+		logger.info("Initializing server data...");
 		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + appVersion));
 
 		securePasswords(); // encrypt the passwords
@@ -134,7 +134,7 @@ public class InitServerTask extends JdbcDaoSupport {
 				upgradeData(dbVersion, appVersion);
 			}
 		} catch (Exception ex) {
-			ex.printStackTrace();
+			logger.info("No cluster created yet. DB version query failed with error [" + ex.getMessage() + "]", ex);
 			// Database not created yet. Create it!
 			initDatabase();
 		}
@@ -148,7 +148,7 @@ public class InitServerTask extends JdbcDaoSupport {
 				logger.info("Cluster: [" + cluster.getId() + "][" + cluster.getName() + "]");
 			}
 		} else {
-			logger.info("No cluster created yet.");
+			
 		}
 	}
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
index af5e657a..9236a6d3 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
@@ -20,22 +20,16 @@
  */
 package com.gluster.storage.management.server.tasks;
 
-import java.util.concurrent.ExecutionException;
-
-import org.apache.derby.iapi.sql.execute.ExecPreparedStatement;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
 import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.server.services.ClusterService;
 import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class MigrateBrickTask extends Task {
@@ -142,6 +136,19 @@ public class MigrateBrickTask extends Task {
 			commitMigration(getNewOnlineServer().getName());
 		}
 	}
+	
+	private void commitMigration(String serverName) {
+		ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, getTaskInfo().getReference(),
+				getFromBrick(), getToBrick(), "commit");
+		TaskStatus taskStatus = new TaskStatus();
+		if (processResult.isSuccess()) {
+			if (processResult.getOutput().trim().matches(".*commit successful$")) {
+				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
+				taskStatus.setMessage(processResult.getOutput()); 
+				getTaskInfo().setStatus(taskStatus);
+			}
+		}
+	}
 
 	@Override
 	public void stop() {
@@ -173,30 +180,25 @@ public class MigrateBrickTask extends Task {
 			return checkMigrationStatus(getNewOnlineServer().getName());
 		}
 	}
-
-	public void commitMigration(String serverName) {
-		ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, getTaskInfo().getReference(),
-				getFromBrick(), getToBrick(), "commit");
-		TaskStatus taskStatus = new TaskStatus();
-		if (processResult.isSuccess()) {
-			if (processResult.getOutput().trim().matches(".*commit successful$")) {
-				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
-				taskStatus.setMessage(processResult.getOutput()); // Common
-				getTaskInfo().setStatus(taskStatus);
-			}
-		}
-	}
-
+	
 	private TaskStatus checkMigrationStatus(String serverName) {
 		if (getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_PAUSE) {
 			return getTaskInfo().getStatus();
 		}
+		// For committed task, status command (CLI) is invalid, just return current status
+		if (getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_SUCCESS) {
+			return getTaskInfo().getStatus();
+		}
+		
 
 		TaskStatus taskStatus = new TaskStatus();
 		try {
 			ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, getTaskInfo().getReference(),
 					getFromBrick(), getToBrick(), "status");
-			if (processResult.getOutput().trim().matches("^Number of files migrated.*Migration complete$")) {
+			if (processResult.getOutput().trim().matches("^Number of files migrated.*Migration complete$")
+					|| processResult.getOutput().trim().matches("^Number of files migrated = 0 .*Current file=")) {
+				// Note: Workaround - if no file in the volume brick to migrate, Gluster CLI is not giving proper
+				// (complete) status
 				taskStatus.setCode(Status.STATUS_CODE_COMMIT_PENDING);
 				if (autoCommit) {
 					commitMigration(serverName);
diff --git a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml b/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
index 0a000732..b9fb2126 100644
--- a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
+++ b/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
@@ -19,7 +19,7 @@
 	<!-- This task keeps checking status of disk migration tasks (wherever auto-commit is set to true)
 	so that auto-commit can be performed as soon as the migration is complete -->
 	<task:scheduled-tasks>
-		<task:scheduled ref="diskMigrationStatusTask" method="checkMigrationStatus" fixed-delay="60000" />
+		<task:scheduled ref="brickMigrationStatusTask" method="checkMigrationStatus" fixed-delay="60000" />
 	</task:scheduled-tasks>
 
 	<!-- Cluster environment. Valid values: vmware, aws, baremetal -->
diff --git a/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml b/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml
index c8301c7b..6f3ad72f 100644
--- a/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml
+++ b/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml
@@ -11,15 +11,13 @@
 	">
 
 	<http auto-config="true" use-expressions="true">
-		<!-- intercept-url pattern="/resources/*"
+		<!-- intercept-url pattern="/1.0/*"
 			access="hasRole('ROLE_ADMIN') and fullyAuthenticated" />
 		<intercept-url pattern="/*" access="permitAll" /-->
 		
 		<!-- SSL Protection -->
-	<intercept-url pattern="/1.0/*" access="hasRole('ROLE_ADMIN') 
-			and fullyAuthenticated"
-		requires-channel="https" />
-	<intercept-url pattern="/*" access="permitAll" requires-channel="any" />
+	<intercept-url pattern="/*" access="hasRole('ROLE_ADMIN') and fullyAuthenticated" requires-channel="https" />
+	<!-- intercept-url pattern="/*" access="permitAll" requires-channel="any" /-->
 	<port-mappings>
 		<port-mapping http="8080" https="8443" />
 	</port-mappings>