From fe085d96a9c631536db668c576482e311826c46b Mon Sep 17 00:00:00 2001
From: Dhandapani <dhandapani@gluster.com>
Date: Tue, 29 Nov 2011 15:55:39 +0530
Subject: Warnings issue fixed.

---
 .../.classpath                                     |  2 +-
 .../build.properties                               |  6 +-
 .../plugin.xml                                     | 80 +++++++++++++++-------
 .../src/test.xml                                   |  1 -
 4 files changed, 59 insertions(+), 30 deletions(-)
 delete mode 100644 src/org.gluster.storage.management.console/src/test.xml

(limited to 'src')

diff --git a/src/org.gluster.storage.management.client/.classpath b/src/org.gluster.storage.management.client/.classpath
index cd4aaff7..9e3c9ce6 100644
--- a/src/org.gluster.storage.management.client/.classpath
+++ b/src/org.gluster.storage.management.client/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-multipart-1.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="keystore/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-client-1.5.jar" sourcepath="/data/downloads/sun/jersey/sources/jersey-client-1.5-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-core-1.5.jar" sourcepath="/home/selvam/sources/jersey/jersey-core-1.5-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="keystore/" kind="src" path="src"/>
+	<classpathentry kind="src" path="keystore"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.gluster.storage.management.core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/org.gluster.storage.management.client/build.properties b/src/org.gluster.storage.management.client/build.properties
index 3e13aff8..c29a4184 100644
--- a/src/org.gluster.storage.management.client/build.properties
+++ b/src/org.gluster.storage.management.client/build.properties
@@ -1,9 +1,9 @@
-source.. = src/
+source.. = src/,\
+           keystore/
 output.. = bin/
 bin.includes = .,\
                META-INF/,\
                lib/,\
                keystore/,\
                lib/jersey-1.5/jersey-multipart-1.5.jar
-src.includes = lib/,\
-               keystore/
+src.includes = lib/
diff --git a/src/org.gluster.storage.management.console/plugin.xml b/src/org.gluster.storage.management.console/plugin.xml
index a19d6f0d..4bd53b89 100644
--- a/src/org.gluster.storage.management.console/plugin.xml
+++ b/src/org.gluster.storage.management.console/plugin.xml
@@ -307,6 +307,60 @@
             id="org.gluster.storage.management.console.commands.LogRotate"
             name="LogRotate">
       </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Download Volume Log"
+            id="org.gluster.storage.management.console.commands.DownloadVolumeLogs"
+            name="Download Log">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Clear Task"
+            id="org.gluster.storage.management.console.commands.Clear"
+            name="Clear Task">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Manual Server Addition"
+            id="org.gluster.storage.management.console.commands.ServerAddition"
+            name="Manual Server Addition">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Commit Task"
+            id="org.gluster.storage.management.console.commands.Commit"
+            name="Commit Task">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Export SSH Keys"
+            id="org.gluster.storage.management.console.commands.ExportSshKeys"
+            name="Export SSH Keys">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Force Start Volume"
+            id="org.gluster.storage.management.console.commands.ForceStartVolume"
+            name="Force Start Volume">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Import SSH Keys"
+            id="org.gluster.storage.management.console.commands.ImportSshKeys"
+            name="Import SSH Keys">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Support Info"
+            id="org.gluster.storage.management.console.commands.Support"
+            name="Support Info">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Manual Server Addition"
+            id="org.gluster.storage.management.console.commands.ServerAddition"
+            name="Manual Server Addition">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
@@ -1221,7 +1275,7 @@
                moveable="false"
                ratio="0.30f"
                relationship="right"
-               relative="org.gluster.storage.management.console.views.navigator.NavigationView"
+               relative="org.gluster.storage.management.console.views.NavigationView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1476,73 +1530,58 @@
             id="gluster.context.menu.volume"
             objectClass="org.gluster.storage.management.core.model.Volume">
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.MigrateBrickAction"
                definitionId="org.gluster.storage.management.console.commands.MigrateDisk"
                enablesFor="1"
                id="org.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Disk"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Migrate Disk">
          </action>
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                enablesFor="1"
                id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Delete Volume">
          </action>
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                definitionId="org.gluster.storage.management.console.commands.RebalanceVolume"
                enablesFor="1"
                id="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Rebalance Volume">
          </action>
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.StopVolumeAction"
                definitionId="org.gluster.storage.management.console.commands.StopVolume"
                enablesFor="+"
                id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Stop Volume">
          </action>
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.StartVolumeAction"
                definitionId="org.gluster.storage.management.console.commands.StartVolume"
                enablesFor="+"
                id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Start Volume">
          </action>
       </objectContribution>
@@ -1550,17 +1589,14 @@
             id="gluster.context.menu.server"
             objectClass="org.gluster.storage.management.core.model.Server">
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.AddServerAction"
                definitionId="org.gluster.storage.management.console.commands.AddServer"
                enablesFor="+"
                id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Add Server(s) to Cluster">
          </action>
          <visibility>
@@ -1575,29 +1611,23 @@
             id="gluster.context.menu.entityGroup"
             objectClass="org.gluster.storage.management.core.model.EntityGroup">
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.CreateVolumeAction"
                definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="&amp;Create Volume"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Create a new Volume">
          </action>
          <action
-               allowLabelUpdate="false"
                class="org.gluster.storage.management.console.actions.AddServerAction"
                definitionId="org.gluster.storage.management.console.commands.AddServer"
                id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Add Server(s) to Cluster">
          </action>
       </objectContribution>
diff --git a/src/org.gluster.storage.management.console/src/test.xml b/src/org.gluster.storage.management.console/src/test.xml
deleted file mode 100644
index 12bbf745..00000000
--- a/src/org.gluster.storage.management.console/src/test.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-- 
cgit