Modified AbstractClient to automatically find out server url from system property

5 files changed, 9 insertions, 9 deletions

diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
index 1a438898..7957b6f0 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
@@ -35,8 +35,7 @@ public class AddServerAction extends AbstractActionDelegate {
 	@Override
 	public void run(IAction action) {
 		GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-		GlusterServersClient glusterServersClient = new GlusterServersClient(modelManager.getServerName(),
-				modelManager.getSecurityToken());
+		GlusterServersClient glusterServersClient = new GlusterServersClient(modelManager.getSecurityToken());
 		Server server = (Server) selectedEntity;
 		GlusterServerResponse response = glusterServersClient.addServer(server);
 		if (response.getStatus().isSuccess()) {
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
index e00b8f8b..fff5faa0 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
@@ -39,7 +39,7 @@ public class StartVolumeAction extends AbstractActionDelegate {
 			return; // Volume already online. Don't do anything.
 		}
 		
-		VolumesClient client = new VolumesClient(modelManager.getServerName(), modelManager.getSecurityToken());
+		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
 		Status status = client.startVolume(volume.getName());
 		if (status.isSuccess()) {
 			new MessageDialog(Display.getDefault().getActiveShell(), action.getDescription(), null, "Volume ["
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
index 42f0ff92..32a6ce08 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
@@ -39,7 +39,7 @@ public class StopVolumeAction extends AbstractActionDelegate {
 			return; // Volume already offline. Don't do anything.
 		}
 		
-		VolumesClient client = new VolumesClient(modelManager.getServerName(), modelManager.getSecurityToken());
+		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
 		Status status = client.stopVolume(volume.getName());
 		if (status.isSuccess()) {
 			new MessageDialog(Display.getDefault().getActiveShell(), action.getDescription(), null, "Volume ["
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
index e21286d2..7095caad 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
@@ -44,7 +44,7 @@ public class CreateVolumeWizard extends Wizard {
 		Volume newVol = page.getVolume();
 
 		GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-		VolumesClient volumesClient = new VolumesClient(modelManager.getServerName(), modelManager.getSecurityToken());
+		VolumesClient volumesClient = new VolumesClient(modelManager.getSecurityToken());
 		Status status = volumesClient.createVolume(newVol);
 		if (status.isSuccess()) {
 			new MessageDialog(getShell(), "Create Volume", null, "Volume created successfully!",
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
index 3e7fa5c3..45b13a19 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
@@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Text;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.UsersClient;
+import com.gluster.storage.management.client.constants.ClientConstants;
 import com.gluster.storage.management.core.model.ConnectionDetails;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.utils.GUIHelper;
@@ -55,7 +56,7 @@ public class LoginDialog extends Dialog {
 	private Text passwordText = null;
 	private Button okButton;
 
-	private final ConnectionDetails connectionDetails = new ConnectionDetails("localhost", "gluster", "");
+	private final ConnectionDetails connectionDetails = new ConnectionDetails("gluster", "");
 	private final GUIHelper guiHelper = GUIHelper.getInstance();
 	private Composite composite;
 
@@ -63,6 +64,7 @@ public class LoginDialog extends Dialog {
 		super(parentShell);
 	}
 
+
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -186,11 +188,10 @@ public class LoginDialog extends Dialog {
 	protected void okPressed() {
 		String user = connectionDetails.getUserId();
 		String password = connectionDetails.getPassword();
-		String server = connectionDetails.getServer();
 
-		UsersClient usersClient = new UsersClient(server);
+		UsersClient usersClient = new UsersClient();
 		if (usersClient.authenticate(user, password)) {
-			GlusterDataModelManager.getInstance().initializeModel(server, usersClient.getSecurityToken());
+			GlusterDataModelManager.getInstance().initializeModel(usersClient.getSecurityToken());
 			super.okPressed();
 		} else {
 			MessageDialog.openError(getShell(), "Authentication Failed", "Invalid User ID or password");