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

15 files changed, 66 insertions, 24 deletions

diff --git a/src/com.gluster.storage.management.console/splash/gluster-about.png b/src/com.gluster.storage.management.console/images/gluster-about.png
index 9518b2b2..9518b2b2 100644
--- a/src/com.gluster.storage.management.console/splash/gluster-about.png
+++ b/src/com.gluster.storage.management.console/images/gluster-about.png
diff --git a/src/com.gluster.storage.management.console/images/splash-dialog.bmp b/src/com.gluster.storage.management.console/images/splash-dialog.bmp
new file mode 100644
index 00000000..932032fb
--- /dev/null
+++ b/src/com.gluster.storage.management.console/images/splash-dialog.bmp
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 60316263..29927d3b 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -393,7 +393,7 @@
          </property>
          <property
                name="aboutImage"
-               value="splash/gluster-about.png">
+               value="images/gluster-about.png">
          </property>
          <property
                name="appName"
diff --git a/src/com.gluster.storage.management.console/splash/splash-dialog.bmp b/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
deleted file mode 100644
index 2de2897f..00000000
--- a/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console/splash/splash-dialog.png b/src/com.gluster.storage.management.console/splash/splash-dialog.png
deleted file mode 100644
index 789eafb0..00000000
--- a/src/com.gluster.storage.management.console/splash/splash-dialog.png
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
index 2b20cb02..89b19f3f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
@@ -89,7 +89,7 @@ public interface IImageKeys {
 	public static final String OVERLAY_STAR_8x8 = "icons/tango/8x8/star.png";
 
 	public static final String SPLASH_IMAGE = "splash.bmp";
-	public static final String DIALOG_SPLASH_IMAGE = "splash/splash-dialog.bmp";
+	public static final String DIALOG_SPLASH_IMAGE = "images/splash-dialog.bmp";
 
 	public static final String GAUGE_SMALL = "images/gauge_small.png";
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
index 7b81ab87..07c5cc77 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
@@ -33,7 +33,7 @@ public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 		VolumeLogMessage logMessage = (VolumeLogMessage) element;
 		return (columnIndex == LOG_TABLE_COLUMN_INDICES.DATE.ordinal() ? DateUtil.formatDate(logMessage.getTimestamp()) 
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.TIME.ordinal() ? DateUtil.formatTime(logMessage.getTimestamp())
-			: columnIndex == LOG_TABLE_COLUMN_INDICES.BRICK.ordinal() ? logMessage.getBrickDirectory()
+			: columnIndex == LOG_TABLE_COLUMN_INDICES.BRICK.ordinal() ? logMessage.getBrick()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.SEVERITY.ordinal() ? "" + logMessage.getSeverity()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.MESSAGE.ordinal() ? logMessage.getMessage() : "Invalid");
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
index 2467735f..4b64ea96 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
@@ -56,7 +56,7 @@ public class InitializeDiskTypeSelection extends Dialog  {
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 
-		newShell.setText("Gluster Management Console - Select FS Type");
+		newShell.setText("Gluster Management Console - Select File System Type");
 		addEscapeListener(newShell);
 	}
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
index b2b647e1..cbb23367 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
@@ -106,9 +106,7 @@ public class LoginDialog extends Dialog {
 		userIdText.setText("gluster");
 		userIdText.setEnabled(false);
 
-		GridData layoutData = new GridData(SWT.FILL, GridData.FILL, true, false);
-		;
-		layoutData.widthHint = convertWidthInCharsToPixels(32);
+		GridData layoutData = new GridData(convertWidthInCharsToPixels(32), 15);
 		userIdText.setLayoutData(layoutData);
 	}
 
@@ -121,20 +119,28 @@ public class LoginDialog extends Dialog {
 	private void createPasswordText(Composite composite) {
 		passwordText = new Text(composite, SWT.BORDER | SWT.PASSWORD);
 
-		GridData layoutData = new GridData(SWT.FILL, GridData.FILL, true, false);
-		;
-		layoutData.widthHint = convertWidthInCharsToPixels(32);
+		GridData layoutData = new GridData(convertWidthInCharsToPixels(32), 15);
 		passwordText.setLayoutData(layoutData);
 	}
 
 	private void configureDialogLayout(Composite composite) {
 		GridLayout layout = (GridLayout) composite.getLayout();
 		layout.numColumns = 2;
+		layout.marginLeft = 10;
+		layout.marginRight = 10;
+		layout.marginTop = 30;
+		layout.marginBottom = 0;
+		layout.horizontalSpacing = 20;
+		layout.verticalSpacing = 10;
+	}
+	
+	private void configureButtonCompositeLayout(Composite composite) {
+		GridLayout layout = (GridLayout) composite.getLayout();
 		layout.marginLeft = 20;
 		layout.marginRight = 20;
-		layout.marginTop = 20;
-		layout.horizontalSpacing = 20;
-		layout.verticalSpacing = 20;
+		layout.marginTop = 0;
+		layout.horizontalSpacing = 10;
+		layout.verticalSpacing = 10;
 	}
 
 	/**
@@ -144,6 +150,7 @@ public class LoginDialog extends Dialog {
 	protected void initializeBounds() {
 		super.initializeBounds();
 
+		getShell().setSize(390, 240);
 		guiHelper.centerShellInScreen(getShell());
 	}
 
@@ -156,6 +163,8 @@ public class LoginDialog extends Dialog {
 
 		composite = (Composite) super.createDialogArea(parent);
 		configureDialogLayout(composite);
+		GridData layoutData = new GridData(390, 110);
+		composite.setLayoutData(layoutData);
 
 		createUserIdLabel(composite);
 		createUserIdText(composite);
@@ -168,8 +177,28 @@ public class LoginDialog extends Dialog {
 
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
+		configureButtonCompositeLayout(parent);
+		GridData layoutData = new GridData(390, 130);
+		layoutData.horizontalAlignment = SWT.CENTER;
+		layoutData.verticalAlignment = SWT.TOP;
+		layoutData.grabExcessHorizontalSpace = true;
+		parent.setLayoutData(layoutData);
+		
+		layoutData = new GridData();
+		layoutData.widthHint = 70;
+		layoutData.horizontalAlignment = SWT.LEFT;
+		layoutData.grabExcessHorizontalSpace = true;
+		
 		okButton = createButton(parent, IDialogConstants.OK_ID, "&Login", true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+		okButton.setLayoutData(layoutData);		
+
+		layoutData = new GridData();
+		layoutData.widthHint = 70;
+		layoutData.horizontalAlignment = SWT.RIGHT;
+		layoutData.grabExcessHorizontalSpace = true;
+
+		Button cancelButton = createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", false);
+		cancelButton.setLayoutData(layoutData);
 
 		setupDataBinding();
 	}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index 97b83f70..b4bd7c15 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -32,7 +32,7 @@ public class RESTConstants {
 	
 	// REST Resource names
 	public static final String RESOURCE_VOLUMES = "volumes";
-	public static final String RESOURCE_DEFAULT_OPTIONS = "defaultoptions";
+	public static final String RESOURCE_DEFAULT_OPTIONS = "options";
 	public static final String RESOURCE_OPTIONS = "options";
 	public static final String RESOURCE_LOGS = "logs";
 	public static final String RESOURCE_DOWNLOAD = "download";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
index a5ac1848..7b7b77c8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
@@ -67,25 +67,25 @@ public class VolumeLogMessage implements Filterable {
 		this.message = message;
 	}
 	
-	public void setBrickDirectory(String brickDirectory) {
-		this.brick = brickDirectory;
+	public void setBrick(String brick) {
+		this.brick = brick;
 	}
 
-
-	public String getBrickDirectory() {
+	@XmlElement(name = "brick")
+	public String getBrick() {
 		return brick;
 	}
 
 	public VolumeLogMessage(Date timestamp, String brickDirectory, String severity, String message) {
 		setTimestamp(timestamp);
-		setBrickDirectory(brickDirectory);
+		setBrick(brickDirectory);
 		setSeverity(severity);
 		setMessage(message);
 	}
 	
 	@Override
 	public boolean filter(String filterString, boolean caseSensitive) {
-		return StringUtil.filterString(getSeverity() + getTimestamp() + getBrickDirectory() + getMessage(), filterString,
+		return StringUtil.filterString(getSeverity() + getTimestamp() + getBrick() + getMessage(), filterString,
 				caseSensitive);
 	}
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
index a54685fa..33adea0b 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
@@ -73,6 +73,7 @@ def main():
     if not uid:
         uid = getLastUid()
         if not uid:
+            sys.stderr.write("Unable to read file %s\n" % Globals.CIFS_USER_FILE)
             sys.exit(10)
         uid += 1
     else:
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 f149b214..90442f4a 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
@@ -56,6 +56,7 @@ import javax.ws.rs.core.Response;
 import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
+import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
@@ -374,7 +375,8 @@ public class GlusterServersResource extends AbstractResource {
 		}
 		
 		if (fsType == null || fsType.isEmpty()) {
-			return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
+			fsType = GlusterConstants.FSTYPE_DEFAULT;
+			// return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
 		}
 
 		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType);
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 0861e1d6..16faf7de 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
@@ -193,7 +193,13 @@ public class TasksResource extends AbstractResource {
 		}
 		
 		if(taskOperation == null || taskOperation.isEmpty()) {
-			return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!");
+			int taskStatus = task.getTaskInfo().getStatus().getCode();
+			if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE) {
+				taskOperation = RESTConstants.TASK_DELETE;
+			} else {
+				taskOperation = RESTConstants.TASK_STOP;
+			}
+//			return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!");
 		}
 		
 		if(!taskOperation.equals(RESTConstants.TASK_STOP) && !taskOperation.equals(RESTConstants.TASK_DELETE)) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
index 58335f8f..1a7fa38f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
@@ -433,6 +433,10 @@ public class VolumeService {
 		if (clusterService.getCluster(clusterName) == null) {
 			throw new GlusterValidationException("Cluster [" + clusterName + "] not found!");
 		}
+		
+		if (lineCount == null || lineCount == 0) {
+			lineCount = 100;
+		}
 
 		List<VolumeLogMessage> logMessages = null;
 		Volume volume = getVolume(clusterName, volumeName);
@@ -526,7 +530,7 @@ public class VolumeService {
 		// populate disk and trim other fields
 		List<VolumeLogMessage> logMessages = response.getLogMessages();
 		for (VolumeLogMessage logMessage : logMessages) {
-			logMessage.setBrickDirectory(brick.getBrickDirectory());
+			logMessage.setBrick(brick.getQualifiedName());
 		}
 		return logMessages;
 	}