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

7 files changed, 15 insertions, 18 deletions

diff --git a/src/com.gluster.storage.management.console.help/build.properties b/src/com.gluster.storage.management.console.help/build.properties
index 9c6ba40f..9fb97e12 100644
--- a/src/com.gluster.storage.management.console.help/build.properties
+++ b/src/com.gluster.storage.management.console.help/build.properties
@@ -4,4 +4,5 @@ bin.includes = plugin.xml,\
                toc.xml,\
                tocconcepts.xml,\
                tocgettingstarted.xml,\
-               toctasks.xml
+               toctasks.xml,\
+               tocreference.xml
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
index af04461f..fad76f27 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
@@ -41,6 +41,7 @@ Gluster Management Gateway communicates with every node of your cluster using th
 <ul>

 <li>You must enable port 24729 (UDP) for auto discovery of servers.

 <li>In case CIFS only, the Samba services must be configured to run on port 445  which needs to be enabled and open on all the storage servers in your cluster.

+<li>Paravirtual VMs on Xen are not supported.

 </ul>

 </body>

 </html>
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
new file mode 100644
index 00000000..af8884e3
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 3cb0e1e3..e7c2c2d4 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -950,7 +950,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.ClearTaskAction"
                definitionId="com.gluster.storage.management.console.commands.Clear"
-               disabledIcon="icons/tango/32x32/create-volume-disabled.png"
+               disabledIcon="icons/tango/32x32/clear-task-disabled.png"
                icon="icons/tango/32x32/clear-task.png"
                id="com.gluster.storage.management.console.actions.Clear"
                label="&amp;Clear Task"
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
index c9995517..fcbe3fcf 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
@@ -78,7 +78,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 	}
 	
 	private void setupBackgroundJobs() {
-		syncJob = new DataSyncJob("Retrieving Management Information");
+		syncJob = new DataSyncJob("Retrieving Management Info");
 		syncJob.schedule(JOB_INTERVAL);
 		syncJob.addJobChangeListener(new JobChangeAdapter() {
 			@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
index edf09f33..81abb01f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
@@ -39,28 +39,23 @@ public class DownloadVolumeLogsAction extends AbstractActionDelegate {
 	@Override
 	protected void performAction(IAction action) {
 		final VolumesClient client = new VolumesClient();
-		final Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class);
+		Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class);
 
 		FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
 		dialog.setFilterNames(new String[] { "GZipped Tar (*.tar.gz)" });
 		dialog.setFilterExtensions(new String[] { "*.tar.gz" });
-		final String filePath = dialog.open();
+		String filePath = dialog.open();
 
 		if (filePath == null) {
 			return;
 		}
 
-		Display.getDefault().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				String title = "Download Volume Logs [" + volume.getName() + "]";
-				try {
-					client.downloadLogs(volume.getName(), filePath);
-					showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]");
-				} catch (Exception e) {
-					showErrorDialog(title, e.getMessage());
-				}
-			}
-		});
+		String title = "Download Volume Logs [" + volume.getName() + "]";
+		try {
+			client.downloadLogs(volume.getName(), filePath);
+			showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]");
+		} catch (Exception e) {
+			showErrorDialog(title, e.getMessage());
+		}
 	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
index 49b4f7d0..4d492f8d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
@@ -38,6 +38,6 @@ public class RefreshDataAction extends AbstractActionDelegate {
 	 */
 	@Override
 	protected void performAction(IAction action) {
-		new DataSyncJob("Retrieving Management Information").schedule();
+		new DataSyncJob("Retrieving Management Info").schedule();
 	}
 }