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

14 files changed, 15 insertions, 16 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
index 7d76d0ec..fa48670d 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
@@ -34,7 +34,7 @@ public class AddServerAction extends AbstractActionDelegate {
 	protected void performAction(IAction action) {
 		final String actionDesc = action.getDescription();
 		GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-		GlusterServersClient glusterServersClient = new GlusterServersClient(modelManager.getSecurityToken());
+		GlusterServersClient glusterServersClient = new GlusterServersClient();
 		Server server = (Server) selectedEntity;
 		GlusterServerResponse response = glusterServersClient.addServer(server);
 		if (response.getStatus().isSuccess()) {
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 075d713c..41ebbca7 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
@@ -52,7 +52,7 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 			return;
 		}
 
-		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
+		VolumesClient client = new VolumesClient();
 
 		Status status;
 		if (volume.getStatus() == VOLUME_STATUS.ONLINE) { // To stop the volume service, if running
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java
index 9a75355f..d7a63323 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java
@@ -50,7 +50,7 @@ public class DownloadVolumeLogsAction extends AbstractActionDelegate {
 	@Override
 	protected void performAction(IAction action) {
 		final Volume volume = (Volume)selectedEntity;
-		final VolumesClient client = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+		final VolumesClient client = new VolumesClient();
 		
 		final Runnable downloadLogsThread = new Runnable() {
 			
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
index 5372f986..3ad72e76 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
@@ -47,7 +47,7 @@ public class RemoveDiskAction extends AbstractActionDelegate {
 		}
 		BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
 			public void run() {
-				VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
+				VolumesClient client = new VolumesClient();
 				Status status = client.removeBricks(volume.getName(), bricks, confirmDelete);
 
 				if (status.isSuccess()) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
index acbba6c0..93f28e11 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
@@ -56,7 +56,7 @@ public class RemoveServerAction extends AbstractActionDelegate {
 			return;
 		}
 
-		GlusterServersClient client = new GlusterServersClient(modelManager.getSecurityToken());
+		GlusterServersClient client = new GlusterServersClient();
 		Status status = client.removeServer(server.getName());
 
 		if (status.isSuccess()) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
index 7fd77ea8..5182d25f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
@@ -42,7 +42,7 @@ public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	}
 	
 	private Status resetVolumeOptions() {
-		return new VolumesClient(modelManager.getSecurityToken()).resetVolumeOptions(volume.getName());
+		return new VolumesClient().resetVolumeOptions(volume.getName());
 	}
 
 	/*
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 34080f76..364aa569 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
@@ -37,7 +37,7 @@ public class StartVolumeAction extends AbstractActionDelegate {
 			return; // Volume already online. Don't do anything.
 		}
 
-		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
+		VolumesClient client = new VolumesClient();
 		final Status status = client.startVolume(volume.getName());
 		final String actionDesc = action.getDescription();
 		if (status.isSuccess()) {
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 21ea4339..33d12ce3 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
@@ -56,7 +56,7 @@ public class StopVolumeAction extends AbstractActionDelegate {
 	}
 
 	private Status stopVolume() {
-		return new VolumesClient(modelManager.getSecurityToken()).stopVolume(volume.getName());
+		return new VolumesClient().stopVolume(volume.getName());
 	}
 
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
index 069ed730..8feeacc3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
@@ -61,7 +61,7 @@ public class AddDiskWizard extends Wizard {
 	@Override
 	public boolean performFinish() {
 		List<Brick> bricks = page.getChosenBricks(volume.getName());
-		VolumesClient volumeClient = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+		VolumesClient volumeClient = new VolumesClient();
 		try {
 			List<String> brickList = getBrickList(bricks);
 			Status status = volumeClient.addBricks(volume.getName(), brickList);
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 66c26a89..0742fe6b 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
@@ -45,8 +45,7 @@ public class CreateVolumeWizard extends Wizard {
 		CreateVolumePage1 page = (CreateVolumePage1) getPage(CreateVolumePage1.PAGE_NAME);
 
 		Volume newVolume = page.getVolume();
-		GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-		VolumesClient volumesClient = new VolumesClient(modelManager.getSecurityToken());
+		VolumesClient volumesClient = new VolumesClient();
 		Status status = volumesClient.createVolume(newVolume);
 
 		if (status.isSuccess()) {
@@ -65,7 +64,7 @@ public class CreateVolumeWizard extends Wizard {
 			}
 			
 			// update the model
-			modelManager.addVolume(newVolume);
+			GlusterDataModelManager.getInstance().addVolume(newVolume);
 			if (warning) {
 				MessageDialog.openWarning(getShell(), dialogTitle, message);
 			} else {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
index 61142c5f..07d6e3c5 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
@@ -51,7 +51,7 @@ public class MigrateDiskWizard extends Wizard {
 		Disk targetDisk = page.getTargetDisk();
 		// TODO add custom confirm dialog
 		
-		VolumesClient volumesClient = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+		VolumesClient volumesClient = new VolumesClient();
 		volumesClient.startMigration(volume.getName(), sourceDisk.getQualifiedName(), targetDisk.getQualifiedName());
 		
 		return true;
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 6871c683..11717ee7 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
@@ -305,7 +305,7 @@ public class VolumeSummaryView extends ViewPart {
 			BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
 				@Override
 				public void run() {
-					Status status = (new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken()))
+					Status status = (new VolumesClient())
 							.setVolumeOption(volume.getName(), Volume.OPTION_AUTH_ALLOW, newACL);
 
 					if (status.isSuccess()) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java
index af1ef949..ca222dd0 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java
@@ -66,7 +66,7 @@ public class OptionValueEditingSupport extends EditingSupport {
 
 			@Override
 			public void run() {
-				VolumesClient client = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+				VolumesClient client = new VolumesClient();
 				Status status = client.setVolumeOption(volume.getName(), entry.getKey(), (String) value);
 				if (status.isSuccess()) {
 					entry.setValue((String)value);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
index 8f067183..811b4c5c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
@@ -168,7 +168,7 @@ public class VolumeLogsPage extends Composite {
 		btnGo.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				VolumesClient client = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+				VolumesClient client = new VolumesClient();
 
 				Date fromTimestamp = null;
 				Date toTimestamp = null;