Merge pull request #188 from Selvasundaram/master

Bug 3302 - Alerts/Tasks belonging to one cluster is shown in another cluster also - fix

16 files changed, 99 insertions, 64 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index 3578dd31..6830db00 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -378,7 +378,7 @@ public class GlusterServersResource extends AbstractResource {
 			// Check the initialize disk status
 			TaskStatus taskStatus = initializeTask.checkStatus();
 			initializeTask.getTaskInfo().setStatus(taskStatus);			
-			taskResource.addTask(initializeTask);
+			taskResource.addTask(clusterName, initializeTask);
 
 			return acceptedResponse(RESTConstants.RESOURCE_PATH_CLUSTERS + "/" + clusterName + "/" + RESOURCE_TASKS + "/"
 					+ initializeTask.getId());
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index e5874f4b..d838aac6 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -57,30 +57,41 @@ import com.sun.jersey.spi.resource.Singleton;
 @Singleton
 @Component
 public class TasksResource extends AbstractResource {
-	private Map<String, Task> tasksMap = new HashMap<String, Task>();
+	private Map<String, Map<String, Task>> tasksMap = new HashMap<String, Map<String, Task>>();
 
 	public TasksResource() {
 	}
 
-	public void addTask(Task task) {
-		tasksMap.put(task.getId(), task);
+	@SuppressWarnings("unchecked")
+	public void addTask(String clusterName, Task task) {
+		Map clusterTaskMap = tasksMap.get(clusterName);
+		if(clusterTaskMap == null) {
+			clusterTaskMap = new HashMap<String, Task>();
+			tasksMap.put(clusterName, clusterTaskMap);
+		}
+		clusterTaskMap.put(task.getId(), task);
 	}
 
 	public void removeTask(Task task) {
 		tasksMap.remove(task.getId());
 	}
 
-	public List<TaskInfo> getAllTasksInfo() {
+	public List<TaskInfo> getAllTasksInfo(String clusterName) {
+		Map<String, Task> clusterTasksMap = tasksMap.get(clusterName);
 		List<TaskInfo> allTasksInfo = new ArrayList<TaskInfo>();
-		for (Map.Entry<String, Task> entry : tasksMap.entrySet()) {
-			checkTaskStatus(entry.getKey());
+		if ( clusterTasksMap == null) {
+			return allTasksInfo;
+		}
+		for (Map.Entry<String, Task> entry : clusterTasksMap.entrySet()) {
+			checkTaskStatus(clusterName, entry.getKey());
 			allTasksInfo.add(entry.getValue().getTaskInfo()); // TaskInfo with latest status 
 		}
 		return allTasksInfo;
 	}
 
-	public Task getTask(String taskId) {
-		for (Map.Entry<String, Task> entry : tasksMap.entrySet()) {
+	public Task getTask(String clusterName, String taskId) {
+		Map<String, Task> clusterTasksMap = tasksMap.get(clusterName);
+		for (Map.Entry<String, Task> entry : clusterTasksMap.entrySet()) {
 			if (entry.getValue().getId().equals(taskId)) {
 				return entry.getValue();
 			}
@@ -88,10 +99,11 @@ public class TasksResource extends AbstractResource {
 		return null;
 	}
 	
-	public List<Task> getAllTasks() {
+	public List<Task> getAllTasks(String clusterName) {
+		Map<String, Task> clusterTasksMap = tasksMap.get(clusterName);
 		List<Task> tasks = new ArrayList<Task>();
-		for (Map.Entry<String, Task> entry : tasksMap.entrySet()) {
-			checkTaskStatus(entry.getKey());
+		for (Map.Entry<String, Task> entry : clusterTasksMap.entrySet()) {
+			checkTaskStatus(clusterName, entry.getKey());
 			tasks.add( (Task) entry.getValue());
 		}
 		return tasks;
@@ -99,9 +111,9 @@ public class TasksResource extends AbstractResource {
 	
 	@GET
 	@Produces(MediaType.APPLICATION_XML)
-	public Response getTasks() {
+	public Response getTasks(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName) {
 		try {
-			return okResponse(new TaskInfoListResponse(getAllTasksInfo()), MediaType.APPLICATION_XML);
+			return okResponse(new TaskInfoListResponse(getAllTasksInfo(clusterName)), MediaType.APPLICATION_XML);
 		} catch (GlusterRuntimeException e) {
 			return errorResponse(e.getMessage());
 		}
@@ -110,17 +122,18 @@ public class TasksResource extends AbstractResource {
 	@GET
 	@Path("/{" + PATH_PARAM_TASK_ID + "}")
 	@Produces(MediaType.APPLICATION_XML)
-	public Response getTaskStatus( @PathParam(PATH_PARAM_TASK_ID) String taskId) {
+	public Response getTaskStatus(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
+			@PathParam(PATH_PARAM_TASK_ID) String taskId) {
 		try {
-			Task task = checkTaskStatus(taskId);
+			Task task = checkTaskStatus(clusterName, taskId);
 			return okResponse(task.getTaskInfo(), MediaType.APPLICATION_XML);
 		} catch (GlusterRuntimeException e) {
 			return errorResponse(e.getMessage());
 		}
 	}
 
-	private Task checkTaskStatus(String taskId) {
-		Task task = getTask(taskId);
+	private Task checkTaskStatus(String clusterName, String taskId) {
+		Task task = getTask(clusterName, taskId);
 		// No status check required if the task already complete or failure
 		if (task.getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_FAILURE
 				|| task.getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_SUCCESS) {
@@ -135,7 +148,7 @@ public class TasksResource extends AbstractResource {
 	@Produces(MediaType.APPLICATION_XML)
 	public Response performTask(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
 			@PathParam(PATH_PARAM_TASK_ID) String taskId, @FormParam(FORM_PARAM_OPERATION) String taskOperation) {
-		Task task = getTask(taskId);
+		Task task = getTask(clusterName, taskId);
 		
 		try {
 			if (taskOperation.equals(RESTConstants.TASK_RESUME)) {
@@ -144,7 +157,7 @@ public class TasksResource extends AbstractResource {
 				task.pause();
 			} else if (taskOperation.equals(RESTConstants.TASK_STOP)) {
 				// task.stop();
-				clearTask(taskId, taskOperation); // Stop and remove from the task list
+				clearTask(clusterName, taskId, taskOperation); // Stop and remove from the task list
 			} else if (taskOperation.equals(RESTConstants.TASK_COMMIT)) {
 				task.commit();
 			}
@@ -159,9 +172,9 @@ public class TasksResource extends AbstractResource {
 	@DELETE
 	@Path("/{" + PATH_PARAM_TASK_ID + "}")
 	@Produces(MediaType.APPLICATION_XML)
-	public Response clearTask(@PathParam(PATH_PARAM_TASK_ID) String taskId,
-			@QueryParam(FORM_PARAM_OPERATION) String taskOperation) {
-		Task task = getTask(taskId);
+	public Response clearTask(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
+			@PathParam(PATH_PARAM_TASK_ID) String taskId, @QueryParam(FORM_PARAM_OPERATION) String taskOperation) {
+		Task task = getTask(clusterName, taskId);
 		if (task == null) {
 			return notFoundResponse("Task [" + taskId + "] not found!");
 		}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index f72a6a64..5762c89f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -63,6 +63,7 @@ import static com.gluster.storage.management.core.constants.RESTConstants.TASK_S
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -531,8 +532,11 @@ public class VolumesResource extends AbstractResource {
 	}
 	
 	public File createOnlineServerList(String clusterName) throws IOException {
+		String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+		
 		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
-		String clusterServersListFile = FileUtil.getTempDirName() + CoreConstants.FILE_SEPARATOR + ALL_SERVERS_FILE_NAME;
+		String clusterServersListFile = FileUtil.getTempDirName() + CoreConstants.FILE_SEPARATOR
+				+ ALL_SERVERS_FILE_NAME + "_" + timestamp;
 		List<GlusterServer> glusterServers = glusterUtil.getGlusterServers(onlineServer);
 		File serversFile = new File(clusterServersListFile);
 		FileOutputStream fos = new FileOutputStream(serversFile);
@@ -1122,7 +1126,7 @@ public class VolumesResource extends AbstractResource {
 				toBrick);
 		migrateDiskTask.setAutoCommit(autoCommit);
 		migrateDiskTask.start();
-		taskResource.addTask(migrateDiskTask);
+		taskResource.addTask(clusterName, migrateDiskTask);
 		return migrateDiskTask.getTaskInfo().getName(); // Return Task ID
 	}
 	
@@ -1144,7 +1148,7 @@ public class VolumesResource extends AbstractResource {
 		RebalanceVolumeTask rebalanceTask = new RebalanceVolumeTask(clusterService, clusterName, volumeName, getLayout(
 				isFixLayout, isMigrateData, isForcedDataMigrate));
 		rebalanceTask.start();
-		taskResource.addTask(rebalanceTask);
+		taskResource.addTask(clusterName, rebalanceTask);
 		return rebalanceTask.getId();
 	}
 	
@@ -1152,6 +1156,6 @@ public class VolumesResource extends AbstractResource {
 		// TODO: arrive at the task id and fetch it
 		String taskId = "";
 		
-		taskResource.getTask(taskId).stop();
+		taskResource.getTask(clusterName, taskId).stop();
 	}
 }
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
index 2554ccb3..503a6ea0 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
@@ -45,12 +45,12 @@ public class PasswordManager {
 			
 			userAuthDao.changePassword(username, encodedPassword);
 			System.out.println("Password for user [" + username + "] reset successsfully to default value of ["
-					+ CoreConstants.DEFAULT_PASSWORD + "].\n");
+					+ CoreConstants.DEFAULT_PASSWORD + "]." + CoreConstants.NEWLINE);
 		} catch (Exception e) {
-			System.err
-					.println("\n\nPassword reset for user ["
-							+ username
-							+ "] failed! \nMake sure that the Management Gateway is not running while performing password reset.\n");
+			System.err.println(CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Password reset for user [" + username
+					+ "] failed! " + CoreConstants.NEWLINE
+					+ "Make sure that the Management Gateway is not running while performing password reset."
+					+ CoreConstants.NEWLINE);
 			System.exit(SQL_ERR);
 		}
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
index 59e2a957..a230198a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.utils.StringUtil;
@@ -50,7 +51,7 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 		if (onlineVolumeNames.size() > 0) { // There are some online volumes, get confirmation to stop and delete all
 											// the volumes
 			warningMessage = "Following volume(s) [" + StringUtil.collectionToString(onlineVolumeNames, ", ")
-					+ "] are online, \nAre you sure to continue?";
+					+ "] are online, " + CoreConstants.NEWLINE + "Are you sure to continue?";
 		} else {
 			warningMessage = "Are you sure to delete the following volume(s) ["
 					+ StringUtil.collectionToString(selectedVolumeNames, ", ") + "] ?";
@@ -80,11 +81,12 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 				// there is a possibility that the error was in post-delete operation, which means
 				// volume was deleted, but some other error happened. check if this is the case.
 				if (vc.volumeExists(volume.getName())) {
-					errorMessage += "\nVolume [" + volume.getName() + "] could not be deleted! Error: ["
-							+ e.getMessage() + "]";
+					errorMessage += CoreConstants.NEWLINE + "Volume [" + volume.getName()
+							+ "] could not be deleted! Error: [" + e.getMessage() + "]";
 					failedVolumes.add(volume.getName());
 				} else {
-					errorMessage += "\nVolume deleted, but following error(s) occured: [" + e.getMessage() + "]";
+					errorMessage += CoreConstants.NEWLINE + "Volume deleted, but following error(s) occured: ["
+							+ e.getMessage() + "]";
 					modelManager.deleteVolume(volume);
 					deletedVolumes.add(volume.getName());
 				}
@@ -94,13 +96,14 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 		// Display the success or failure info
 		if (deletedVolumes.size() == 0) { // No volume(s) deleted successfully
 			showErrorDialog(actionDesc, "Following volume(s) [" + StringUtil.collectionToString(failedVolumes, ", ")
-					+ "] could not be delete! " + "\nError: [" + errorMessage + "]");
+					+ "] could not be delete! " + CoreConstants.NEWLINE + "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Following volumes [" + StringUtil.collectionToString(deletedVolumes, ", ")
 					+ "] are deleted successfully!";
 			if (errorMessage != "") {
-				info += "\n\nFollowing volumes [" + StringUtil.collectionToString(failedVolumes, ", ")
-						+ "] are failed to delete! [" + errorMessage + "]";
+				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Following volumes ["
+						+ StringUtil.collectionToString(failedVolumes, ", ") + "] are failed to delete! ["
+						+ errorMessage + "]";
 			}
 			showInfoDialog(actionDesc, info);
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
index 2e71d1f6..2ce25043 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
@@ -12,6 +12,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.utils.StringUtil;
@@ -33,7 +34,7 @@ public class RemoveBrickAction extends AbstractActionDelegate {
 		List<String> brickList = getBrickList(bricks);
 		Integer deleteOption = new MessageDialog(getShell(), "Remove Bricks(s)", GUIHelper.getInstance().getImage(
 				IImageKeys.VOLUME_16x16), "Are you sure you want to remove following bricks from volume [" + volume.getName()
-				+ "] ? \n" + StringUtil.collectionToString(brickList, ", "), MessageDialog.QUESTION, new String[] {
+				+ "] ? " + CoreConstants.NEWLINE + StringUtil.collectionToString(brickList, ", "), MessageDialog.QUESTION, new String[] {
 				"Cancel", "Remove bricks, delete data", "Remove bricks, keep data" }, -1).open();
 		if (deleteOption <= 0) { // By Cancel button(0) or Escape key(-1)
 			return;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
index b52952af..df897507 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
@@ -26,6 +26,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.utils.StringUtil;
@@ -78,13 +79,14 @@ public class StartVolumeAction extends AbstractActionDelegate {
 		// Display the success or failure info
 		if (startedVolumes.size() == 0) { // No volume(s) started successfully
 			showErrorDialog(actionDesc, "Following volume(s) [" + StringUtil.collectionToString(failedVolumes, ", ")
-					+ "] could not be start! " + "\nError: [" + errorMessage + "]");
+					+ "] could not be start! " + CoreConstants.NEWLINE + "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Following volume(s) [" + StringUtil.collectionToString(startedVolumes, ", ")
 					+ "] are started successfully!";
 			if (errorMessage != "") {
-				info += "\n\nFollowing volume(s) [" + StringUtil.collectionToString(failedVolumes, ", ")
-						+ "] are failed to start! [" + errorMessage + "]";
+				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Following volume(s) ["
+						+ StringUtil.collectionToString(failedVolumes, ", ") + "] are failed to start! ["
+						+ errorMessage + "]";
 			}
 			showInfoDialog(actionDesc, info);
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
index f2d23490..765b856c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.utils.StringUtil;
@@ -61,9 +62,9 @@ public class StopVolumeAction extends AbstractActionDelegate {
 		}
 
 		Integer userAction = new MessageDialog(getShell(), "Stop Volume", GUIHelper.getInstance().getImage(
-				IImageKeys.VOLUME_16x16), "Are you sure you want to stop the following volume(s)?\n" + "["
-				+ StringUtil.collectionToString(onlineVolumeNames, ", ") + "]", MessageDialog.QUESTION, new String[] {
-				"No", "Yes" }, -1).open();
+				IImageKeys.VOLUME_16x16), "Are you sure you want to stop the following volume(s)?"
+				+ CoreConstants.NEWLINE + "[" + StringUtil.collectionToString(onlineVolumeNames, ", ") + "]",
+				MessageDialog.QUESTION, new String[] { "No", "Yes" }, -1).open();
 
 		if (userAction <= 0) { // user select cancel or pressed escape key
 			return;
@@ -90,13 +91,14 @@ public class StopVolumeAction extends AbstractActionDelegate {
 		// Display the success or failure info
 		if (stoppedVolumes.size() == 0) { // No volume(s) stopped successfully
 			showErrorDialog(actionDesc, "Following volume(s) [" + StringUtil.collectionToString(failedVolumes, ", ")
-					+ "] could not be stopped! " + "\nError: [" + errorMessage + "]");
+					+ "] could not be stopped! " + CoreConstants.NEWLINE + "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Following volume(s) [" + StringUtil.collectionToString(stoppedVolumes, ", ")
 					+ "] are stopped successfully!";
 			if (errorMessage != "") {
-				info += "\n\nFollowing volume(s) [" + StringUtil.collectionToString(failedVolumes, ", ")
-						+ "] are failed to stop! [" + errorMessage + "]";
+				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Following volume(s) ["
+						+ StringUtil.collectionToString(failedVolumes, ", ") + "] are failed to stop! [" + errorMessage
+						+ "]";
 			}
 			showInfoDialog(actionDesc, info);
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
index c5cbcc16..0d8104bb 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.gui.GlusterDataModelManager;
@@ -92,9 +93,9 @@ public class CreateVolumeWizard extends Wizard {
 		boolean error = false;
 		String message1 = null;
 		if (page.startVolumeAfterCreation()) {
-			if (MessageDialog.openConfirm(getShell(), title,
-					"Volume created, but following error(s) occured: " + errMsg
-							+ "\n\nDo you still want to start the volume [" + newVolume.getName()  + "]?")) {
+			if (MessageDialog.openConfirm(getShell(), title, "Volume created, but following error(s) occured: "
+					+ errMsg + CoreConstants.NEWLINE + CoreConstants.NEWLINE
+					+ "Do you still want to start the volume [" + newVolume.getName() + "]?")) {
 				try {
 					volumesClient.startVolume(newVolume.getName());
 					newVolume.setStatus(VOLUME_STATUS.ONLINE);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
index 11f0ac87..3b4fd7ca 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
@@ -224,7 +224,7 @@ public class LoginDialog extends Dialog {
 
 			if (dialog.open() == Dialog.CANCEL) {
 				MessageDialog.openError(getShell(), "Change password Cancelled",
-						"Password must be changed on first login!" + "\n" + "Application will close.");
+						"Password must be changed on first login!" + CoreConstants.NEWLINE + "Application will close.");
 				cancelPressed();
 				return;
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java
index e2035468..1297d2f4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java
@@ -35,6 +35,7 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.NetworkInterface;
@@ -83,9 +84,9 @@ public class ChartUtil {
 		extractChartData(stats, timestamps, data, dataColumnIndex);
 
 		if (timestamps.size() == 0) {
-			toolkit.createLabel(
-					section,
-					"Server statistics not available!\nCheck if all services are running properly \non the cluster servers, or try after some time!");
+			toolkit.createLabel(section, "Server statistics not available!" + CoreConstants.NEWLINE
+					+ "Check if all services are running properly " + CoreConstants.NEWLINE
+					+ "on the cluster servers, or try after some time!");
 			return null;
 		}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
index 8318522b..37269711 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
@@ -41,6 +41,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.model.Alert;
 import com.gluster.storage.management.core.model.Cluster;
@@ -212,7 +213,8 @@ public class ClusterSummaryView extends ViewPart {
 	private void createDiskSpaceSection() {
 		Composite section = guiHelper.createSection(form, toolkit, "Disk Space", null, 3, false);
 		if (cluster.getServers().size() == 0) {
-			toolkit.createLabel(section, "This section will be populated after at least\none server is added to the storage cloud.");
+			toolkit.createLabel(section, "This section will be populated after at least" + CoreConstants.NEWLINE
+					+ "one server is added to the storage cloud.");
 			return;
 		}
 		
@@ -324,7 +326,8 @@ public class ClusterSummaryView extends ViewPart {
 	private Composite createAreaChartSection(ServerStats stats, String sectionTitle, int dataColumnIndex, String unit, String timestampFormat, ChartPeriodLinkListener listener, double maxValue, int chartLinkColumnCount) {
 		Composite section = guiHelper.createSection(form, toolkit, sectionTitle, null, 1, false);
 		if (cluster.getServers().size() == 0) {
-			toolkit.createLabel(section, "This section will be populated after at least\none server is added to the storage cloud.");
+			toolkit.createLabel(section, "This section will be populated after at least" + CoreConstants.NEWLINE
+					+ "one server is added to the storage cloud.");
 			return null;
 		}
 		
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
index 45893d12..25c966c1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
@@ -32,6 +32,7 @@ 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.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Alert;
 import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
 import com.gluster.storage.management.core.model.ClusterListener;
@@ -156,8 +157,8 @@ public class GlusterServersSummaryView extends ViewPart {
 
 	private void populateAvailabilitySection() {
 		if (servers.getEntities().size() == 0) {
-			toolkit.createLabel(serversAvailabilitySection,
-					"This section will be populated after at least\none server is added to the storage cloud.");
+			toolkit.createLabel(serversAvailabilitySection, "This section will be populated after at least"
+					+ CoreConstants.NEWLINE + "one server is added to the storage cloud.");
 			return;
 		}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
index b14b078d..07782143 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
@@ -31,6 +31,7 @@ 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.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Alert;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.ClusterListener;
@@ -220,7 +221,7 @@ public class VolumesSummaryView extends ViewPart {
 	private void populateSummarySection() {
 		if(volumes.getEntities().size() == 0) {
 			toolkit.createLabel(summarySection,
-					"This section will be populated after at least\none volume is created the storage cloud.");
+					"This section will be populated after at least" + CoreConstants.NEWLINE +"one volume is created the storage cloud.");
 			return;
 		}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java
index 8dc58ff1..962ab80b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java
@@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.EntityGroup;
@@ -45,8 +46,9 @@ public class GlusterServersPage extends AbstractTableViewerPage<GlusterServer> {
 		NAME, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_FREE_SPACE, TOTAL_DISK_SPACE, STATUS // Removed PREFERRED_NETWORK 
 	};
 
-	private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", 
-			"IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Free Space (GB)", "Total \n Space (GB)", "Status" }; // Removed "Preferred\nNetwork", 
+	private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", "IP Address(es)",
+			"Number" + CoreConstants.NEWLINE + "of CPUs", "Total" + CoreConstants.NEWLINE + "Memory (GB)",
+			"Free Space (GB)", "Total " + CoreConstants.NEWLINE + " Space (GB)", "Status" }; // Removed "Preferred\nNetwork",
 
 	public GlusterServersPage(IWorkbenchSite site, final Composite parent, int style, final EntityGroup<GlusterServer> servers) {
 		super(site, parent, style, true, true, servers);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
index 04c77758..1676ce77 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
@@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.EntityGroup;
@@ -46,7 +47,7 @@ public class VolumesPage extends AbstractTableViewerPage<Volume> {
 	};
 
 	private static final String[] VOLUME_TABLE_COLUMN_NAMES = new String[] { "Name", "Volume Type",
-			"Number of\nBricks", "Transport Type", "Status" };
+			"Number of" + CoreConstants.NEWLINE + "Bricks", "Transport Type", "Status" };
 
 	public VolumesPage(final Composite parent, IWorkbenchSite site, EntityGroup<Volume> volumes) {
 		super(site, parent, SWT.NONE, true, true, volumes);