Merge remote branch 'upstream/master'

183 files changed, 591 insertions, 463 deletions

diff --git a/build/gmc-server-buckminster.commands b/build/gmg-buckminster.commands
index 54008800..96175b57 100755
--- a/build/gmc-server-buckminster.commands
+++ b/build/gmg-buckminster.commands
@@ -4,8 +4,8 @@ importtarget --active src/com.gluster.storage.management.releng/gluster-manageme
 
 import src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
 #import src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery
+import src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
 
 perform com.gluster.storage.management.core#bundle.jar
 #perform com.gluster.storage.management.client#bundle.jar
-perform com.gluster.storage.management.server#archive
+perform com.gluster.storage.management.gateway#archive
diff --git a/build/gmc-junit-buckminster.commands b/build/junit-buckminster.commands
index 1d1a7efd..1d1a7efd 100644..100755
--- a/build/gmc-junit-buckminster.commands
+++ b/build/junit-buckminster.commands
diff --git a/build/package-scripts.sh b/build/package-backend.sh
index c15cd68c..7f85b70c 100755
--- a/build/package-scripts.sh
+++ b/build/package-backend.sh
@@ -13,7 +13,8 @@ prepare-script-dir()
 get-scripts()
 {
 	cd ${DIR_NAME}
-	cp ../../src/com.gluster.storage.management.server.scripts/src/*.* .
+	cp ../../src/com.gluster.storage.management.gateway.scripts/src/*.* .
+	chmod +x *
 	cd -
 }
 
diff --git a/build/package-server.sh b/build/package-gateway.sh
index c5fa9127..1685d546 100755
--- a/build/package-server.sh
+++ b/build/package-gateway.sh
@@ -1,7 +1,7 @@
 WAR_NAME="glustermg.war"
 NEW_WAR_NAME="glustermg"
 TAR_NAME=${WAR_NAME}.tar
-SERVER_DIST_DIR="${WORKSPACE}/../../gmc-server/lastSuccessful"
+SERVER_DIST_DIR="${WORKSPACE}/../../glustermg/lastSuccessful"
 
 prepare-dist-dir()
 {
@@ -28,7 +28,7 @@ get-dist()
 	OS=${2}
 	WS=${3}
 
-	OUT_DIR="${WORKSPACE}/../../gmc-gui/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.gui.feature.webstart*.feature/glustermc"
+	OUT_DIR="${WORKSPACE}/../../glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.gui.feature.webstart*.feature/glustermc"
 	NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH}
 	cp -R ${OUT_DIR} ${NEW_DIR}
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
index 51b53241..cbc51b10 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
@@ -38,6 +38,8 @@ public class GlusterConstants {
 	
 	public static final String ON = "on";
 	public static final String OFF = "off";
+	public static final String NONE = "none";
+	
 	public static final String STATS_PERIOD_1DAY = "1d";
 	public static final String STATS_PERIOD_1WEEK = "1w";
 	public static final String STATS_PERIOD_1MONTH = "1m";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
index 7b1eec36..e5624954 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -97,18 +97,17 @@ public class GlusterCoreUtil {
 			boolean caseInsensitive) {
 		return getEntity(entityList, searchEntity.getName(), caseInsensitive) != null;
 	}
+	
+	public static <T extends Entity> boolean containsEntityWithName(List<T> entityList, String searchName,
+			boolean caseInsensitive) {
+		return getEntity(entityList, searchName, caseInsensitive) != null;
+	}
 
 	public static <T extends Entity> T getEntity(Collection<T> entityList, String searchEntityName, boolean caseInsensitive) {
-		if (caseInsensitive) {
-			searchEntityName = searchEntityName.toUpperCase();
-		}
-
 		for (T entity : entityList) {
 			String nextEntityName = entity.getName();
-			if (caseInsensitive) {
-				nextEntityName = nextEntityName.toUpperCase();
-			}
-			if (nextEntityName.equals(searchEntityName)) {
+			if (nextEntityName.equals(searchEntityName)
+					|| (caseInsensitive && nextEntityName.equalsIgnoreCase(searchEntityName))) {
 				return entity;
 			}
 		}
diff --git a/src/com.gluster.storage.management.server.scripts/.project b/src/com.gluster.storage.management.gateway.scripts/.project
index beda33b7..110db62b 100644
--- a/src/com.gluster.storage.management.server.scripts/.project
+++ b/src/com.gluster.storage.management.gateway.scripts/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.server.scripts</name>
+	<name>com.gluster.storage.management.gateway.scripts</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.server.scripts/.pydevproject b/src/com.gluster.storage.management.gateway.scripts/.pydevproject
index 0a912df5..c327cd69 100644
--- a/src/com.gluster.storage.management.server.scripts/.pydevproject
+++ b/src/com.gluster.storage.management.gateway.scripts/.pydevproject
@@ -5,6 +5,6 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/com.gluster.storage.management.server.scripts/src</path>
+<path>/com.gluster.storage.management.gateway.scripts/src</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/src/com.gluster.storage.management.server.scripts/src/Commands.py b/src/com.gluster.storage.management.gateway.scripts/src/Commands.py
index c728b565..c728b565 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Commands.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Commands.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/Common.py b/src/com.gluster.storage.management.gateway.scripts/src/Common.py
index c85e9a2b..c85e9a2b 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Common.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Common.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/Disk.py b/src/com.gluster.storage.management.gateway.scripts/src/Disk.py
index 2c47d396..2c47d396 100755
--- a/src/com.gluster.storage.management.server.scripts/src/Disk.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Disk.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/DiskUtils.py
index a0e5d802..a0e5d802 100644
--- a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/DiskUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/FsTabUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/FsTabUtils.py
index fcac4196..fcac4196 100644
--- a/src/com.gluster.storage.management.server.scripts/src/FsTabUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/FsTabUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/GetServerNetworkConfig.py b/src/com.gluster.storage.management.gateway.scripts/src/GetServerNetworkConfig.py
index 3311eb56..3311eb56 100644
--- a/src/com.gluster.storage.management.server.scripts/src/GetServerNetworkConfig.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/GetServerNetworkConfig.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/Globals.py b/src/com.gluster.storage.management.gateway.scripts/src/Globals.py
index f8a07c25..f8a07c25 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Globals.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Globals.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/GlusterdUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/GlusterdUtils.py
index 7c0e899c..7c0e899c 100644
--- a/src/com.gluster.storage.management.server.scripts/src/GlusterdUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/GlusterdUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/NetworkUtils.py
index 42e9892c..42e9892c 100755
--- a/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/NetworkUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/Protocol.py b/src/com.gluster.storage.management.gateway.scripts/src/Protocol.py
index ff073593..ff073593 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Protocol.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Protocol.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/RRDUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/RRDUtils.py
index 1ad0deee..1ad0deee 100644
--- a/src/com.gluster.storage.management.server.scripts/src/RRDUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/RRDUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/ServerUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/ServerUtils.py
index 1fec994c..1fec994c 100644
--- a/src/com.gluster.storage.management.server.scripts/src/ServerUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/ServerUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
index 3408c14a..3408c14a 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/VolumeUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/VolumeUtils.py
index b1031ccc..b1031ccc 100644
--- a/src/com.gluster.storage.management.server.scripts/src/VolumeUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/VolumeUtils.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/XmlHandler.py b/src/com.gluster.storage.management.gateway.scripts/src/XmlHandler.py
index 72164ffb..72164ffb 100644
--- a/src/com.gluster.storage.management.server.scripts/src/XmlHandler.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/XmlHandler.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/add_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py
index 7b9650d1..7b9650d1 100755
--- a/src/com.gluster.storage.management.server.scripts/src/add_user_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py
index 96677f56..96677f56 100755
--- a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/create_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py
index a81b165b..a81b165b 100755
--- a/src/com.gluster.storage.management.server.scripts/src/create_volume_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py
index 3e633697..3e633697 100755
--- a/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/delete_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py
index e5cda957..e5cda957 100755
--- a/src/com.gluster.storage.management.server.scripts/src/delete_user_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/delete_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py
index fd1febc9..fd1febc9 100755
--- a/src/com.gluster.storage.management.server.scripts/src/delete_volume_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/disable-ssh-password-auth.sh b/src/com.gluster.storage.management.gateway.scripts/src/disable-ssh-password-auth.sh
index 07ee1a3a..07ee1a3a 100755
--- a/src/com.gluster.storage.management.server.scripts/src/disable-ssh-password-auth.sh
+++ b/src/com.gluster.storage.management.gateway.scripts/src/disable-ssh-password-auth.sh
diff --git a/src/com.gluster.storage.management.server.scripts/src/format_device.py b/src/com.gluster.storage.management.gateway.scripts/src/format_device.py
index 3bc70532..3bc70532 100755
--- a/src/com.gluster.storage.management.server.scripts/src/format_device.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/format_device.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py b/src/com.gluster.storage.management.gateway.scripts/src/get_brick_status.py
index cf84080b..cf84080b 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_brick_status.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py b/src/com.gluster.storage.management.gateway.scripts/src/get_disk_mount_point.py
index 2f4a39c3..2f4a39c3 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_disk_mount_point.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py b/src/com.gluster.storage.management.gateway.scripts/src/get_disk_name_by_path.py
index 08e80b7e..08e80b7e 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_disk_name_by_path.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_file.py b/src/com.gluster.storage.management.gateway.scripts/src/get_file.py
index 61c33eba..61c33eba 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_file.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_file.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_format_device_status.py b/src/com.gluster.storage.management.gateway.scripts/src/get_format_device_status.py
index 57fc0455..57fc0455 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_format_device_status.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_format_device_status.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py
index 546aec31..546aec31 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_rrd_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py
index f7c3031b..f7c3031b 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_rrd_memory_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_rrd_net_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py
index 6a31cde8..6a31cde8 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_rrd_net_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py
index 9c3da741..9c3da741 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_server_status.py b/src/com.gluster.storage.management.gateway.scripts/src/get_server_status.py
index a57428b6..a57428b6 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_server_status.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_server_status.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_volume_brick_log.py b/src/com.gluster.storage.management.gateway.scripts/src/get_volume_brick_log.py
index fd7361da..fd7361da 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_volume_brick_log.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_volume_brick_log.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py b/src/com.gluster.storage.management.gateway.scripts/src/get_volume_log.py
index b906c002..b906c002 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_volume_log.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/gluster_provision_block_wrapper.py b/src/com.gluster.storage.management.gateway.scripts/src/gluster_provision_block_wrapper.py
index a3b2776d..a3b2776d 100755
--- a/src/com.gluster.storage.management.server.scripts/src/gluster_provision_block_wrapper.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/gluster_provision_block_wrapper.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/modify_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py
index f6bacfc4..f6bacfc4 100755
--- a/src/com.gluster.storage.management.server.scripts/src/modify_volume_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py b/src/com.gluster.storage.management.gateway.scripts/src/multicast_response.py
index 18cf89ae..18cf89ae 100644
--- a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/multicast_response.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_cpu.pl b/src/com.gluster.storage.management.gateway.scripts/src/rrd_cpu.pl
index 7b070812..7b070812 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_cpu.pl
+++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_cpu.pl
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_mem.pl b/src/com.gluster.storage.management.gateway.scripts/src/rrd_mem.pl
index 5c47cd81..5c47cd81 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_mem.pl
+++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_mem.pl
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_net.pl b/src/com.gluster.storage.management.gateway.scripts/src/rrd_net.pl
index 03f4f492..03f4f492 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_net.pl
+++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_net.pl
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py
index 73982971..73982971 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py
index fe4fcce6..fe4fcce6 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/setup_cifs_config.py b/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py
index 2cc35acc..2cc35acc 100755
--- a/src/com.gluster.storage.management.server.scripts/src/setup_cifs_config.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/start_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py
index 239216c3..239216c3 100755
--- a/src/com.gluster.storage.management.server.scripts/src/start_volume_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/stop_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py
index 99ac4750..99ac4750 100755
--- a/src/com.gluster.storage.management.server.scripts/src/stop_volume_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py
diff --git a/src/com.gluster.storage.management.server/.classpath b/src/com.gluster.storage.management.gateway/.classpath
index 107e139d..107e139d 100644
--- a/src/com.gluster.storage.management.server/.classpath
+++ b/src/com.gluster.storage.management.gateway/.classpath
diff --git a/src/com.gluster.storage.management.server/.project b/src/com.gluster.storage.management.gateway/.project
index 259b3726..3e4dc06a 100644
--- a/src/com.gluster.storage.management.server/.project
+++ b/src/com.gluster.storage.management.gateway/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.server</name>
+	<name>com.gluster.storage.management.gateway</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.server/.settings/.jsdtscope b/src/com.gluster.storage.management.gateway/.settings/.jsdtscope
index 3a28de0c..3a28de0c 100644
--- a/src/com.gluster.storage.management.server/.settings/.jsdtscope
+++ b/src/com.gluster.storage.management.gateway/.settings/.jsdtscope
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.jdt.core.prefs b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
index 476db350..476db350 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.jdt.core.prefs
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.ltk.core.refactoring.prefs b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5d9c71b6..5d9c71b6 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
index dbf56d1e..3d5a50bf 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="com.gluster.storage.management.server">
+    <wb-module deploy-name="com.gluster.storage.management.gateway">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/junit"/>
-        <property name="java-output-path" value="/com.gluster.storage.management.server/build/classes"/>
+        <property name="java-output-path" value="/com.gluster.storage.management.gateway/build/classes"/>
         <property name="context-root" value="glustermg"/>
     </wb-module>
 </project-modules>
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.project.facet.core.xml b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8f960f27..8f960f27 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.jsdt.ui.superType.container b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a4..3bd5d0a4 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.jsdt.ui.superType.name b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b6..05bd71b6 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.ws.service.policy.prefs b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
index e5ca6272..e5ca6272 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.ws.service.policy.prefs
+++ b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
diff --git a/src/com.gluster.storage.management.server/WebContent/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
index 5e949512..5e949512 100644
--- a/src/com.gluster.storage.management.server/WebContent/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/antlr-2.7.6.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
index 3702b645..3702b645 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/antlr-2.7.6.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
index 578b1a0c..578b1a0c 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/aopalliance-1.0.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/asm-3.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
index 8217cae0..8217cae0 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/asm-3.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-collections-3.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
index 41e230fe..41e230fe 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-collections-3.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
index 8758a96b..8758a96b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/derby.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
index dc8ae8df..dc8ae8df 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/derby.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/derbytools.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
index ca367aae..ca367aae 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/derbytools.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
index c8c4dbb9..c8c4dbb9 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
index 3eddd42f..3eddd42f 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
index c0a9ac7b..c0a9ac7b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
index 4c9ac4e9..4c9ac4e9 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate3.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
index c1c81141..c1c81141 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate3.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
index a3248188..a3248188 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
index faf12cf6..faf12cf6 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
index ca612580..ca612580 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
index 57c2c670..57c2c670 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
index 8f692f4f..8f692f4f 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-client-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
index 62f790fa..62f790fa 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-client-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-core-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
index 92b38466..92b38466 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-core-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-json-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
index 01d8c83b..01d8c83b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-json-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
index 1c134f05..1c134f05 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-server-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
index a29d7409..a29d7409 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-server-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-spring-1.5.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
index c79b4490..c79b4490 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jettison-1.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
index e4e9c8c3..e4e9c8c3 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jettison-1.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jnlp-servlet.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
index 23782c02..23782c02 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jnlp-servlet.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
index ec8bc818..ec8bc818 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jta-1.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
index 6d225b76..6d225b76 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jta-1.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/log4j-1.2.16.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
index 3f9d8476..3f9d8476 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/log4j-1.2.16.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/mimepull-1.3.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
index 48cc9295..48cc9295 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/mimepull-1.3.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
index a5d37aa1..a5d37aa1 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
index db6f529f..db6f529f 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
index 7cd3a626..7cd3a626 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
index 11fc11b9..11fc11b9 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
index f2e2e927..f2e2e927 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
index bd1367d8..bd1367d8 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
index e46f9eb8..e46f9eb8 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
index ea9500d6..ea9500d6 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
index 6ef99d8d..6ef99d8d 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
index e149290e..e149290e 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
index dcd1e4d9..dcd1e4d9 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
index f7a3b837..f7a3b837 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
index 9cea2aef..9cea2aef 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
index d0550ccd..d0550ccd 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
index 1688cf74..1688cf74 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
index b3aa6af8..b3aa6af8 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
index 237995c5..237995c5 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
index 2f52122b..2f52122b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
index 5a2381a0..5a2381a0 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
index 6ec9d681..6ec9d681 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
index 6d13bd40..6d13bd40 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
index e351ae7b..e351ae7b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.client_1.0.0.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.client_1.0.0.jar
index 56222cbf..56222cbf 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.client_1.0.0.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.client_1.0.0.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.core_1.0.0.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.core_1.0.0.jar
index d321e76c..d321e76c 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.core_1.0.0.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/plugins/com.gluster.storage.management.core_1.0.0.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
index e5bc672b..e5bc672b 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
index f1f4fdd2..f1f4fdd2 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
index 78818fc5..78818fc5 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
index a8077d5d..a8077d5d 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
index 26611b55..26611b55 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
new file mode 100644
index 00000000..631788ff
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+  <display-name>glustermg</display-name>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+			classpath:spring/gluster-server-security.xml
+			classpath:spring/gluster-server-base.xml
+		</param-value>
+  </context-param>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>gluster-resources-1.0</servlet-name>
+    <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
+    <init-param>
+      <param-name>com.sun.jersey.config.property.packages</param-name>
+      <param-value>com.gluster.storage.management.gateway.resources.v1_0</param-value>
+    </init-param>
+    <init-param>
+      <param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
+      <param-value>com.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>gluster-resources-1.0</servlet-name>
+    <url-pattern>/1.0/*</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <url-pattern>*.jnlp</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <url-pattern>*.jar</url-pattern>
+  </servlet-mapping>
+  <filter>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <filter-class>
+			org.springframework.web.filter.DelegatingFilterProxy
+		</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Gluster Management Gateway</web-resource-name>
+      <url-pattern>/*</url-pattern>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+</web-app>
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/0-version.sql b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
index 4c3d81d1..4c3d81d1 100644
--- a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/0-version.sql
+++ b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/1-security-schema.sql b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
index fdde5823..fdde5823 100644
--- a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/1-security-schema.sql
+++ b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
index 35ccf965..35ccf965 100644
--- a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
+++ b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/3-cluster-servers.sql b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
index 17ca62d2..17ca62d2 100644
--- a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
+++ b/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
diff --git a/src/com.gluster.storage.management.server/WebContent/index.html b/src/com.gluster.storage.management.gateway/WebContent/index.html
index 4c90162a..4c90162a 100644
--- a/src/com.gluster.storage.management.server/WebContent/index.html
+++ b/src/com.gluster.storage.management.gateway/WebContent/index.html
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
index f8a07c25..f8a07c25 100644
--- a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Protocol.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
index ff073593..ff073593 100644
--- a/src/com.gluster.storage.management.server/WebContent/scripts/Protocol.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
index 3408c14a..3408c14a 100644
--- a/src/com.gluster.storage.management.server/WebContent/scripts/Utils.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/XmlHandler.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
index 72164ffb..72164ffb 100644
--- a/src/com.gluster.storage.management.server/WebContent/scripts/XmlHandler.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
index e4b48658..e4b48658 100755
--- a/src/com.gluster.storage.management.server/WebContent/scripts/add_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/delete_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
index 38dd8109..38dd8109 100755
--- a/src/com.gluster.storage.management.server/WebContent/scripts/delete_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/grun.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
index ae93b7f2..ae93b7f2 100755
--- a/src/com.gluster.storage.management.server/WebContent/scripts/grun.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
index ac434827..ac434827 100755
--- a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
diff --git a/src/com.gluster.storage.management.server/WebContent/ssl/gmg-ssl.keystore b/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
index 2efe19b0..2efe19b0 100644
--- a/src/com.gluster.storage.management.server/WebContent/ssl/gmg-ssl.keystore
+++ b/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
diff --git a/src/com.gluster.storage.management.server/buckminster.cspex b/src/com.gluster.storage.management.gateway/buckminster.cspex
index 31eb9d67..31eb9d67 100644
--- a/src/com.gluster.storage.management.server/buckminster.cspex
+++ b/src/com.gluster.storage.management.gateway/buckminster.cspex
diff --git a/src/com.gluster.storage.management.server/build/glusterserver.ant b/src/com.gluster.storage.management.gateway/build/glusterserver.ant
index e9b5b650..68a5bc08 100644
--- a/src/com.gluster.storage.management.server/build/glusterserver.ant
+++ b/src/com.gluster.storage.management.gateway/build/glusterserver.ant
@@ -1,4 +1,4 @@
-<project name="com.gluster.storage.management.server" basedir="." default="archive">
+<project name="com.gluster.storage.management.gateway" basedir="." default="archive">
 	<echo message="basedir=${basedir}" />
 	<echo message="buckminster.output=${buckminster.output}" />
 	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
diff --git a/src/com.gluster.storage.management.server/src/META-INF/persistence.xml b/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml
index 36b252ea..36b252ea 100644
--- a/src/com.gluster.storage.management.server/src/META-INF/persistence.xml
+++ b/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/constants/VolumeOptionsDefaults.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
index 5c9a6505..1f577c89 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/constants/VolumeOptionsDefaults.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.constants;
+package com.gluster.storage.management.gateway.constants;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ClusterInfo.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
index 1c3cd347..3e5ea01a 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ClusterInfo.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/GlusterDataSource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
index e669a130..0802fe93 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/GlusterDataSource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import javax.servlet.ServletContext;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/PersistenceDao.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
index 85fefcdf..eb7d6514 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/PersistenceDao.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ServerInfo.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java
index 72818200..a3f8c920 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ServerInfo.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuditFilter.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
index daaf8f33..31810123 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuditFilter.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import com.sun.jersey.spi.container.ContainerRequest;
 import com.sun.jersey.spi.container.ContainerRequestFilter;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuthenticationFailureFilter.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
index 5f828f65..73a1085e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuthenticationFailureFilter.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/GlusterResourceFilterFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
index 899ba16e..1c480f3f 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/GlusterResourceFilterFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
index 21b95877..9fc4fceb 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
index 45125513..d0da6696 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
@@ -42,8 +42,8 @@ import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.response.ClusterNameListResponse;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/DiscoveredServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
index cb39746c..2d07bd24 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/DiscoveredServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
 import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
@@ -38,12 +38,21 @@ import org.springframework.stereotype.Component;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.response.ServerListResponse;
 import com.gluster.storage.management.core.response.ServerNameListResponse;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Component
 @Singleton
 @Path(RESOURCE_PATH_DISCOVERED_SERVERS)
-public class DiscoveredServersResource extends AbstractServersResource {
+public class DiscoveredServersResource extends AbstractResource {
+	@InjectParam
+	protected ServerUtil serverUtil;
+	
+	@InjectParam
+	protected GlusterUtil glusterUtil;
+	
 	private List<String> discoveredServerNames = new ArrayList<String>();
 	
 	public List<String> getDiscoveredServerNames() {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GenericExceptionMapper.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
index f9650902..3a316c0c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GenericExceptionMapper.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index 525f4132..e6e4f9d6 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
@@ -51,7 +51,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
@@ -60,27 +59,29 @@ import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.model.ServerStats;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.response.GlusterServerListResponse;
 import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.ServerInfo;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.tasks.InitializeDiskTask;
-import com.gluster.storage.management.server.utils.CpuStatsFactory;
-import com.gluster.storage.management.server.utils.MemoryStatsFactory;
-import com.gluster.storage.management.server.utils.NetworkStatsFactory;
-import com.gluster.storage.management.server.utils.SshUtil;
-import com.gluster.storage.management.server.utils.StatsFactory;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.services.GlusterServerService;
+import com.gluster.storage.management.gateway.tasks.InitializeDiskTask;
+import com.gluster.storage.management.gateway.utils.CpuStatsFactory;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.MemoryStatsFactory;
+import com.gluster.storage.management.gateway.utils.NetworkStatsFactory;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
+import com.gluster.storage.management.gateway.utils.StatsFactory;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Component
 @Singleton
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_SERVERS)
-public class GlusterServersResource extends AbstractServersResource {
+public class GlusterServersResource extends AbstractResource {
 
 	public static final String HOSTNAMETAG = "hostname:";
 
@@ -90,31 +91,30 @@ public class GlusterServersResource extends AbstractServersResource {
 	@InjectParam
 	private TasksResource taskResource;
 
-	@Autowired
+	@InjectParam
 	private ClusterService clusterService;
 
-	@Autowired
+	@InjectParam
 	private SshUtil sshUtil;
 	
-	@Autowired
+	@InjectParam
 	private CpuStatsFactory cpuStatsFactory;
 
-	@Autowired
+	@InjectParam
 	private MemoryStatsFactory memoryStatsFactory;
 	
-	@Autowired
+	@InjectParam
 	private NetworkStatsFactory networkStatsFactory;
 	
-	protected void fetchServerDetails(GlusterServer server) {
-		try {
-			server.setStatus(SERVER_STATUS.ONLINE);
-			serverUtil.fetchServerDetails(server);
-		} catch (ConnectionException e) {
-			server.setStatus(SERVER_STATUS.OFFLINE);
-		}
-	}
-
-
+	@InjectParam
+	private ServerUtil serverUtil;
+	
+	@InjectParam
+	private GlusterUtil glusterUtil;
+	
+	@InjectParam
+	private GlusterServerService glusterServerService;
+	
 	@GET
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getGlusterServersJSON(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
@@ -129,26 +129,6 @@ public class GlusterServersResource extends AbstractServersResource {
 		return getGlusterServers(clusterName, MediaType.APPLICATION_XML, details);
 	}
 	
-	private List<GlusterServer> getGlusterServers(String clusterName, boolean fetchDetails) {
-		List<GlusterServer> glusterServers;
-		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
-		if (onlineServer == null) {
-			throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
-		}
-
-		try {
-			glusterServers = getGlusterServers(clusterName, onlineServer, fetchDetails);
-		} catch (ConnectionException e) {
-			// online server has gone offline! try with a different one.
-			onlineServer = clusterService.getNewOnlineServer(clusterName);
-			if (onlineServer == null) {
-				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
-			}
-			glusterServers = getGlusterServers(clusterName, onlineServer, fetchDetails);
-		}
-		return glusterServers;
-	}
-
 	private Response getGlusterServers(String clusterName, String mediaType, Boolean fetchDetails) {
 		if(fetchDetails == null) {
 			// by default, fetch the server details
@@ -171,7 +151,7 @@ public class GlusterServersResource extends AbstractServersResource {
 		}
 
 		try {
-			glusterServers = getGlusterServers(clusterName, fetchDetails);
+			glusterServers = glusterServerService.getGlusterServers(clusterName, fetchDetails);
 		} catch (Exception e) {
 			return errorResponse(e.getMessage());
 		}
@@ -184,7 +164,6 @@ public class GlusterServersResource extends AbstractServersResource {
 		}
 	}
 
-
 	private List<String> getServerNames(List<GlusterServer> glusterServers) {
 		List<String> serverNames = new ArrayList<String>();
 		for(GlusterServer server : glusterServers) {
@@ -193,42 +172,6 @@ public class GlusterServersResource extends AbstractServersResource {
 		return serverNames;
 	}
 
-	private String fetchDetailsOfServers(List<GlusterServer> glusterServers, GlusterServer onlineServer) {
-		String errMsg = "";
-
-		for (GlusterServer server : glusterServers) {
-			try {
-				fetchServerDetails(server);
-			} catch (Exception e) {
-				errMsg += CoreConstants.NEWLINE + server.getName() + " : [" + e.getMessage() + "]";
-			}
-		}
-		return errMsg;
-	}
-
-	private List<GlusterServer> getGlusterServers(String clusterName, GlusterServer onlineServer, boolean fetchDetails) {
-		List<GlusterServer> glusterServers;
-		try {
-			glusterServers = glusterUtil.getGlusterServers(onlineServer);
-		} catch (ConnectionException e) {
-			// online server has gone offline! try with a different one.
-			onlineServer = clusterService.getNewOnlineServer(clusterName);
-			if (onlineServer == null) {
-				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
-			}
-
-			glusterServers = glusterUtil.getGlusterServers(onlineServer);
-		}
-		
-		if (fetchDetails) {
-			String errMsg = fetchDetailsOfServers(glusterServers, onlineServer);
-			if (!errMsg.isEmpty()) {
-				throw new GlusterRuntimeException("Couldn't fetch details for server(s): " + errMsg);
-			}
-		}
-		return glusterServers;
-	}
-
 	@GET
 	@Path("{" + PATH_PARAM_SERVER_NAME + "}")
 	@Produces(MediaType.APPLICATION_XML)
@@ -247,49 +190,12 @@ public class GlusterServersResource extends AbstractServersResource {
 
 	private Response getGlusterServerResponse(String clusterName, String serverName, String mediaType) {
 		try {
-			return okResponse(getGlusterServer(clusterName, serverName), mediaType);
+			return okResponse(glusterServerService.getGlusterServer(clusterName, serverName, true), mediaType);
 		} catch (Exception e) {
 			return errorResponse(e.getMessage());
 		}
 	}
 
-	private GlusterServer getGlusterServer(String clusterName, String serverName) {
-		if (clusterName == null || clusterName.isEmpty()) {
-			throw new GlusterRuntimeException("Cluster name must not be empty!");
-		}
-
-		if (serverName == null || serverName.isEmpty()) {
-			throw new GlusterRuntimeException("Server name must not be empty!");
-		}
-
-		ClusterInfo cluster = clusterService.getCluster(clusterName);
-		if (cluster == null) {
-			throw new GlusterRuntimeException("Cluster [" + clusterName + "] not found!");
-		}
-
-		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
-		if (onlineServer == null) {
-			throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
-		}
-
-		GlusterServer server = null;
-		try {
-			server = glusterUtil.getGlusterServer(onlineServer, serverName);
-		} catch (ConnectionException e) {
-			// online server has gone offline! try with a different one.
-			onlineServer = clusterService.getNewOnlineServer(clusterName);
-			if (onlineServer == null) {
-				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
-			}
-			server = glusterUtil.getGlusterServer(onlineServer, serverName);
-		}
-
-		if (server.isOnline()) {
-			fetchServerDetails(server);
-		}
-		return server;
-	}
-
 	private void performAddServer(String clusterName, String serverName) {
 		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
 		if (onlineServer == null) {
@@ -542,7 +448,7 @@ public class GlusterServersResource extends AbstractServersResource {
 			return okResponse(new ServerStats(), mediaType);
 		}
 
-		List<String> serverNames = getServerNames(getGlusterServers(clusterName, false));
+		List<String> serverNames = getServerNames(glusterServerService.getGlusterServers(clusterName, false));
 		return okResponse(getStatsFactory(type).fetchAggregatedStats(serverNames, period), mediaType);
 	}
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
index 807291be..34dad497 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
 
@@ -44,7 +44,7 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.utils.FileUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.multipart.FormDataParam;
 
 @Path(RESOURCE_PATH_KEYS)
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index 0fa49dc3..e5874f4b 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
@@ -50,7 +50,7 @@ import com.gluster.storage.management.core.exceptions.GlusterValidationException
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.response.TaskInfoListResponse;
-import com.gluster.storage.management.server.tasks.Task;
+import com.gluster.storage.management.gateway.tasks.Task;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/UsersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
index 1b5e8fad..4b2701f2 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/UsersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 1d0963eb..45df1ae7 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
@@ -84,6 +84,7 @@ import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Status;
@@ -97,13 +98,13 @@ import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse
 import com.gluster.storage.management.core.utils.DateUtil;
 import com.gluster.storage.management.core.utils.FileUtil;
 import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.server.constants.VolumeOptionsDefaults;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.tasks.MigrateBrickTask;
-import com.gluster.storage.management.server.tasks.RebalanceVolumeTask;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
+import com.gluster.storage.management.gateway.constants.VolumeOptionsDefaults;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.tasks.MigrateBrickTask;
+import com.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
@@ -368,13 +369,13 @@ public class VolumesResource extends AbstractResource {
 		}
 	}
 
-	private Status performOperation(String volumeName, String operation, GlusterServer onlineServer) {
+	private void performOperation(String volumeName, String operation, GlusterServer onlineServer) {
 		if (operation.equals(TASK_START)) {
-			return glusterUtil.startVolume(volumeName, onlineServer.getName());
+			glusterUtil.startVolume(volumeName, onlineServer.getName());
 		} else if (operation.equals(TASK_STOP)) {
-			return glusterUtil.stopVolume(volumeName, onlineServer.getName());
+			glusterUtil.stopVolume(volumeName, onlineServer.getName());
 		} else {
-			return new Status(Status.STATUS_CODE_FAILURE, "Invalid operation code [" + operation + "]");
+			throw new GlusterValidationException("Invalid operation code [" + operation + "]");
 		}
 	}
 
@@ -500,7 +501,7 @@ public class VolumesResource extends AbstractResource {
 			String brickDirectory = brickInfo[1];
 
 			String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
-			Object response = serverUtil.executeOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " "
+			Object response = serverUtil.executeScriptOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " "
 					+ mountPoint + " " + volumeName + " " + (deleteFlag ? "-d" : ""), GenericResponse.class);
 			if (response instanceof GenericResponse) {
 				result = ((GenericResponse) response).getStatus();
@@ -524,7 +525,7 @@ public class VolumesResource extends AbstractResource {
 			String brickDirectory = brick.getBrickDirectory();
 			String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
 
-			result = (Status) serverUtil.executeOnServer(true, brick.getServerName(), VOLUME_DIRECTORY_CLEANUP_SCRIPT
+			result = (Status) serverUtil.executeScriptOnServer(true, brick.getServerName(), VOLUME_DIRECTORY_CLEANUP_SCRIPT
 					+ " " + mountPoint + " " + volumeName + (deleteFlag ? " -d" : ""), Status.class);
 			if (!result.isSuccess()) {
 				throw new GlusterRuntimeException("Error in post-delete operation of volume [" + volumeName + "]: "
@@ -652,8 +653,8 @@ public class VolumesResource extends AbstractResource {
 		String logFilePath = logDir + CoreConstants.FILE_SEPARATOR + logFileName;
 
 		// Usage: get_volume_disk_log.py <volumeName> <diskName> <lineCount>
-		Object responseObj = serverUtil.executeOnServer(true, brick.getServerName(), VOLUME_BRICK_LOG_SCRIPT + " "
-				+ logFilePath + " " + lineCount, LogMessageListResponse.class);
+		Object responseObj = serverUtil.executeScriptOnServer(true, brick.getServerName(), VOLUME_BRICK_LOG_SCRIPT
+				+ " " + logFilePath + " " + lineCount, LogMessageListResponse.class);
 
 		LogMessageListResponse response = null;
 		if (responseObj instanceof LogMessageListResponse) {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/GlusterUserDetailsService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
index 21c13a03..e806051c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/GlusterUserDetailsService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.security;
+package com.gluster.storage.management.gateway.security;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/UserAuthDao.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
index cfc6e572..bdc3b19e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/UserAuthDao.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.security;
+package com.gluster.storage.management.gateway.security;
 
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
 
@@ -31,7 +31,7 @@ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsServic
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.server.security.GlusterUserDetailsService#changePassword(java.lang.String,
+	 * @see com.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
 	 * java.lang.String)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
index 47960827..e01c5096 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.services;
+package com.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,12 +34,12 @@ import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.utils.LRUCache;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
-import com.gluster.storage.management.server.data.ServerInfo;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  * Service class for functionality related to clusters
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
new file mode 100644
index 00000000..d1437cec
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *  
+ * Gluster Management Console is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package com.gluster.storage.management.gateway.services;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.gluster.storage.management.core.constants.CoreConstants;
+import com.gluster.storage.management.core.exceptions.ConnectionException;
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import com.gluster.storage.management.core.exceptions.GlusterValidationException;
+import com.gluster.storage.management.core.model.GlusterServer;
+import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+
+/**
+ *
+ */
+@Component
+public class GlusterServerService {
+	@Autowired
+	protected ServerUtil serverUtil;
+	
+	@Autowired
+	private ClusterService clusterService;
+
+	@Autowired
+	private GlusterUtil glusterUtil;
+	
+	public void fetchServerDetails(GlusterServer server) {
+		try {
+			server.setStatus(SERVER_STATUS.ONLINE);
+			serverUtil.fetchServerDetails(server);
+		} catch (ConnectionException e) {
+			server.setStatus(SERVER_STATUS.OFFLINE);
+		}
+	}
+	
+	public List<GlusterServer> getGlusterServers(String clusterName, boolean fetchDetails) {
+		List<GlusterServer> glusterServers;
+		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
+		if (onlineServer == null) {
+			throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
+		}
+
+		try {
+			glusterServers = getGlusterServers(clusterName, onlineServer, fetchDetails);
+		} catch (ConnectionException e) {
+			// online server has gone offline! try with a different one.
+			onlineServer = clusterService.getNewOnlineServer(clusterName);
+			if (onlineServer == null) {
+				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
+			}
+			glusterServers = getGlusterServers(clusterName, onlineServer, fetchDetails);
+		}
+		return glusterServers;
+	}
+	
+	private List<GlusterServer> getGlusterServers(String clusterName, GlusterServer onlineServer, boolean fetchDetails) {
+		List<GlusterServer> glusterServers;
+		try {
+			glusterServers = glusterUtil.getGlusterServers(onlineServer);
+		} catch (ConnectionException e) {
+			// online server has gone offline! try with a different one.
+			onlineServer = clusterService.getNewOnlineServer(clusterName);
+			if (onlineServer == null) {
+				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
+			}
+
+			glusterServers = glusterUtil.getGlusterServers(onlineServer);
+		}
+		
+		if (fetchDetails) {
+			String errMsg = fetchDetailsOfServers(glusterServers, onlineServer);
+			if (!errMsg.isEmpty()) {
+				throw new GlusterRuntimeException("Couldn't fetch details for server(s): " + errMsg);
+			}
+		}
+		return glusterServers;
+	}
+	
+	private String fetchDetailsOfServers(List<GlusterServer> glusterServers, GlusterServer onlineServer) {
+		String errMsg = "";
+
+		for (GlusterServer server : glusterServers) {
+			try {
+				fetchServerDetails(server);
+			} catch (Exception e) {
+				errMsg += CoreConstants.NEWLINE + server.getName() + " : [" + e.getMessage() + "]";
+			}
+		}
+		return errMsg;
+	}
+	
+	public GlusterServer getGlusterServer(String clusterName, String serverName, Boolean fetchDetails) {
+		if (clusterName == null || clusterName.isEmpty()) {
+			throw new GlusterValidationException("Cluster name must not be empty!");
+		}
+
+		if (serverName == null || serverName.isEmpty()) {
+			throw new GlusterValidationException("Server name must not be empty!");
+		}
+
+		ClusterInfo cluster = clusterService.getCluster(clusterName);
+		if (cluster == null) {
+			throw new GlusterRuntimeException("Cluster [" + clusterName + "] not found!");
+		}
+
+		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
+		if (onlineServer == null) {
+			throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
+		}
+
+		return getGlusterServer(clusterName, serverName, onlineServer, fetchDetails);
+	}
+	
+	private GlusterServer getGlusterServer(String clusterName, String serverName, GlusterServer onlineServer,
+			Boolean fetchDetails) {
+		GlusterServer server = null;
+		try {
+			server = glusterUtil.getGlusterServer(onlineServer, serverName);
+		} catch (ConnectionException e) {
+			// online server has gone offline! try with a different one.
+			onlineServer = clusterService.getNewOnlineServer(clusterName);
+			if (onlineServer == null) {
+				throw new GlusterRuntimeException("No online servers found in cluster [" + clusterName + "]");
+			}
+			server = glusterUtil.getGlusterServer(onlineServer, serverName);
+		}
+
+		if (fetchDetails && server.isOnline()) {
+			fetchServerDetails(server);
+		}
+		return server;
+	}
+	
+	public boolean isValidServer(String clusterName, String serverName) {
+		try {
+			GlusterServer server = getGlusterServer(clusterName, serverName, false);
+			return server != null;
+		} catch(Exception e) {
+			return false;
+		}
+	}
+}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
index 3fe794f5..6d525785 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,8 +39,8 @@ import org.springframework.security.authentication.encoding.PasswordEncoder;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
 
 /**
  * Initializes the Gluster Management Server.
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 4f168d66..e7da1de6 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -31,9 +31,10 @@ import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class InitializeDiskTask extends Task {
@@ -43,7 +44,7 @@ public class InitializeDiskTask extends Task {
 	private String serverName;
 	private String diskName;
 	private String fsType;
-	private SshUtil sshUtil;
+	private ServerUtil serverUtil;
 	private GlusterUtil glusterUtil;
 
 	public InitializeDiskTask(ClusterService clusterService, String clusterName, String serverName, String diskName, String fsType) {
@@ -65,7 +66,7 @@ public class InitializeDiskTask extends Task {
 	private void init() {
 		ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
 		glusterUtil = ctx.getBean(GlusterUtil.class);
-		sshUtil = ctx.getBean(SshUtil.class);
+		serverUtil = ctx.getBean(ServerUtil.class);
 	}
 	
 	@Override
@@ -118,17 +119,12 @@ public class InitializeDiskTask extends Task {
 
 	private void startInitializeDisk(String serverName) {
 		String fsTypeCommand = (getFsType().equals(GlusterConstants.FSTYPE_DEFAULT)) ? "" : " -t " + getFsType();
-		ProcessResult processResult = sshUtil.executeRemote(serverName, INITIALIZE_DISK_SCRIPT + fsTypeCommand + " "
-				+ getDiskName());
-		if (processResult.isSuccess()) {
-			TaskStatus taskStatus = new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, processResult.getOutput()));
-			taskStatus.setPercentageSupported((getFsType().equals(GlusterConstants.FSTYPE_XFS)) ? false : true);
-			getTaskInfo().setStatus(taskStatus);
-			return;
-		}
-
-		// if we reach here, it means Initialize disk start failed.
-		throw new GlusterRuntimeException(processResult.toString());
+		
+		String output = (String) serverUtil.executeScriptOnServer(true, serverName, INITIALIZE_DISK_SCRIPT
+				+ fsTypeCommand + " " + getDiskName(), String.class);
+		TaskStatus taskStatus = new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, output));
+		taskStatus.setPercentageSupported((getFsType().equals(GlusterConstants.FSTYPE_XFS)) ? false : true);
+		getTaskInfo().setStatus(taskStatus);
 	}
 
 	@Override
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
index 8ca15fc9..694067aa 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -28,8 +28,8 @@ import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class MigrateBrickTask extends Task {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
index 24c2f1b5..c53f0252 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -29,16 +29,17 @@ import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class RebalanceVolumeTask extends Task {
 
 	private String layout;
 	private String serverName;
-	private SshUtil sshUtil;
+	private ServerUtil serverUtil;
 	private GlusterUtil glusterUtil;
 
 	public RebalanceVolumeTask(ClusterService clusterService, String clusterName, String volumeName, String layout) {
@@ -51,7 +52,7 @@ public class RebalanceVolumeTask extends Task {
 	
 	private void init() {
 		ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
-		sshUtil = ctx.getBean(SshUtil.class);
+		serverUtil = ctx.getBean(ServerUtil.class);
 		glusterUtil = ctx.getBean(GlusterUtil.class);
 	}
 
@@ -74,14 +75,8 @@ public class RebalanceVolumeTask extends Task {
 
 	private void startRebalance(String serverName) {
 		String command = "gluster volume rebalance " + getTaskInfo().getReference() + " " + getLayout() + " start";
-		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
-		if (processResult.isSuccess()) {
-			getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, processResult.getOutput())));
-			return;
-		}
-
-		// if we reach here, it means rebalance start failed.
-		throw new GlusterRuntimeException(processResult.toString());
+		String output = (String)serverUtil.executeOnServer(true, serverName, command, String.class);
+		getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, output)));
 	}
 
 	@Override
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
new file mode 100644
index 00000000..94c743aa
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
@@ -0,0 +1,154 @@
+/**
+ * ServerDiscoveryTask.java
+ *
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package com.gluster.storage.management.gateway.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.model.GlusterServer;
+import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import com.gluster.storage.management.core.utils.ProcessResult;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.resources.v1_0.DiscoveredServersResource;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.services.GlusterServerService;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+
+/**
+ * Task for syncing server details. This performs two things: <br>
+ * 1. Auto-discovery of servers eligible to be added to the Gluster cluster. <br>
+ * 2. Syncing of cluster-server mapping with actual servers of the cluster. This mapping can go out of sync if user
+ * adds/removes servers manually using the CLI.
+ */
+@Component
+public class ServerSyncTask {
+	private static final String SCRIPT_NAME_SFX = "-discover-servers.py";
+	
+	@Autowired
+	private ServerUtil serverUtil;
+	
+	@Autowired
+	private DiscoveredServersResource discoveredServersResource;
+	
+	@Autowired
+	private GlusterServerService glusterServerService;
+
+	@Autowired
+	private String discoveryMechanism;
+	
+	@Autowired
+	private ClusterService clusterService;
+	
+	@Autowired
+	private PersistenceDao<ClusterInfo> clusterDao;
+
+	public void perform() {
+		discoverServers();
+		syncClusterServerMapping();
+	}
+	
+	private void syncClusterServerMapping() {
+		List<ClusterInfo> clusters = clusterService.getAllClusters();
+		for(ClusterInfo cluster : clusters) {
+			List<ServerInfo> servers = cluster.getServers();
+			List<GlusterServer> actualServers = glusterServerService.getGlusterServers(cluster.getName(), false);
+			updateRemovedServers(cluster, servers, actualServers);
+			updateAddedServers(cluster, servers, actualServers);
+		}
+	}
+
+	private void updateAddedServers(ClusterInfo cluster, List<ServerInfo> servers, List<GlusterServer> actualServers) {
+		List<String> addedServers = findAddedServers(cluster.getName(), servers, actualServers);
+		for(String addedServer : addedServers) {
+			clusterService.mapServerToCluster(cluster.getName(), addedServer);
+		}
+	}
+
+	private void updateRemovedServers(ClusterInfo cluster, List<ServerInfo> servers, List<GlusterServer> actualServers) {
+		List<String> removedServers = findRemovedServers(servers, actualServers);
+		for(String removedServer : removedServers) {
+			clusterService.unmapServerFromCluster(cluster.getName(), removedServer);
+		}
+	}
+	
+	private List<String> findRemovedServers(List<ServerInfo> servers, List<GlusterServer> actualServers) {
+		List<String> removedServers = new ArrayList<String>();
+		
+		for(ServerInfo server : servers) {
+			if (!GlusterCoreUtil.containsEntityWithName(actualServers, server.getName(), true)) {
+				removedServers.add(server.getName());
+			}
+		}
+		return removedServers;
+	}
+	
+	private List<String> findAddedServers(String clusterName, List<ServerInfo> servers, List<GlusterServer> actualServers) {
+		List<String> addedServers = new ArrayList<String>();
+		for(GlusterServer actualServer : actualServers) {
+			if(!serverExists(servers, actualServer.getName())) {
+				addedServers.add(actualServer.getName());
+			}
+		}
+		return addedServers;
+	}
+
+	private boolean serverExists(List<ServerInfo> servers, String name) {
+		for(ServerInfo server : servers) {
+			if(server.getName().equalsIgnoreCase(name)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@SuppressWarnings("unchecked")
+	private void discoverServers() {
+		if(discoveryMechanism.equals(GlusterConstants.NONE)) {
+			return;
+		}
+		
+		List<String> serverNameList = new ArrayList<String>();
+		
+		ProcessResult result = serverUtil.executeGlusterScript(true, discoveryMechanism + SCRIPT_NAME_SFX, new ArrayList<String>());
+		if(result.isSuccess()) {
+			List<String> existingServers = clusterDao.findBySQL("select name from server_info");
+			String serverNames = result.getOutput();
+			String[] parts = serverNames.split(CoreConstants.NEWLINE);
+			for(String serverName : parts) {
+				// The server discovery mechanism will return every server that has not been "peer probed". However we
+				// need to filter out those servers that are the "first" server of a new cluster, and hence are still
+				// not peer probed.
+				if(!existingServers.contains(serverName)) {
+					serverNameList.add(serverName);
+				}
+			}
+		}
+		
+		discoveredServersResource.setDiscoveredServerNames(serverNameList);
+	}
+}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java
index 119f6297..1ba360bc 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java
@@ -18,13 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.gateway.services.ClusterService;
 
 public abstract class Task {
 	public String[] TASK_TYPE_STR = { "Format Disk", "Migrate Brick", "Volume Rebalance" };
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/AbstractStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
index 6f1226aa..13a58729 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/AbstractStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
@@ -155,7 +155,8 @@ public abstract class AbstractStatsFactory implements StatsFactory {
 				argsStr += " " + arg;
 			}
 		}
-		Object output = serverUtil.executeOnServer(true, serverName, getStatsScriptName() + argsStr + " " + period, ServerStats.class);
+		Object output = serverUtil.executeScriptOnServer(true, serverName, getStatsScriptName() + argsStr + " "
+				+ period, ServerStats.class);
 		//String cpuUsageData = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> <xport> <meta> <start>1310468100</start> <step>300</step> <end>1310471700</end> <rows>13</rows> <columns>3</columns> <legend> <entry>user</entry> <entry>system</entry> <entry>total</entry> </legend> </meta> <data> <row><t>1310468100</t><v>2.23802952e-1</v><v>4.3747778209e-01</v><v>6.6128073384e-01</v></row> <row><t>1310468400</t><v>2.3387347338e-01</v><v>4.4642717442e-01</v><v>6.8030064780e-01</v></row> <row><t>1310468700</t><v>5.5043873220e+00</v><v>6.2462376636e+00</v><v>1.1750624986e+01</v></row> <row><t>1310469000</t><v>2.4350593653e+01</v><v>2.6214585217e+01</v><v>5.0565178869e+01</v></row> <row><t>1310469300</t><v>4.0786489953e+01</v><v>4.6784713828e+01</v><v>8.7571203781e+01</v></row> <row><t>1310469600</t><v>4.1459955508e+01</v><v>5.2546309044e+01</v><v>9.4006264551e+01</v></row> <row><t>1310469900</t><v>4.2312286165e+01</v><v>5.2390588332e+01</v><v>9.4702874497e+01</v></row> <row><t>1310470200</t><v>4.2603794982e+01</v><v>5.1598861493e+01</v><v>9.4202656475e+01</v></row> <row><t>1310470500</t><v>3.8238751290e+01</v><v>4.5312089966e+01</v><v>8.3550841256e+01</v></row> <row><t>1310470800</t><v>1.7949961224e+01</v><v>2.1282058418e+01</v><v>3.9232019642e+01</v></row> <row><t>1310471100</t><v>1.2330371421e-01</v><v>4.6347832868e-01</v><v>5.8678204289e-01</v></row> <row><t>1310471400</t><v>1.6313260492e-01</v><v>5.4088119561e-01</v><v>7.0401380052e-01</v></row> <row><t>1310471700</t><v>NaN</v><v>NaN</v><v>NaN</v></row> </data> </xport>";
 		//Object output = unmarshal(ServerStats.class, cpuUsageData, false);
 		if(output instanceof Status) {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/CpuStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
index 27e271e5..b6ef9ef2 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/CpuStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import org.springframework.stereotype.Component;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
index 642198df..55909d54 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -42,15 +42,13 @@ import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
 import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.server.resources.v1_0.TasksResource;
-import com.sun.jersey.api.core.InjectParam;
+import com.gluster.storage.management.gateway.resources.v1_0.TasksResource;
 
 @Component
 public class GlusterUtil {
@@ -84,7 +82,7 @@ public class GlusterUtil {
 	@Autowired
 	private ServerUtil serverUtil;
 	
-	@InjectParam
+	@Autowired
 	private TasksResource taskResource; 
 
 	public void setSshUtil(SshUtil sshUtil) {
@@ -617,8 +615,8 @@ public class GlusterUtil {
 	}
 	
 	public TaskStatus getInitializingDeviceStatus(String serverName, String diskName) {
-		Object response = serverUtil.executeOnServer(true, serverName, INITIALIZE_DISK_STATUS_SCRIPT + " " + diskName,
-				InitDiskStatusResponse.class);
+		Object response = serverUtil.executeScriptOnServer(true, serverName, INITIALIZE_DISK_STATUS_SCRIPT + " "
+				+ diskName, InitDiskStatusResponse.class);
 
 		TaskStatus taskStatus = new TaskStatus();
 		if (response instanceof Status) {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/MemoryStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
index fcbf43d5..dc88bf52 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/MemoryStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/NetworkStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
index 2a50d598..d3d47c58 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/NetworkStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
index f0aab567..91c7c81c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -18,10 +18,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -54,12 +55,17 @@ public class ServerUtil {
 	@Autowired
 	private SshUtil sshUtil;
 	
+	@Autowired
+	private String appVersion;
+	
 	private static final Logger logger = Logger.getLogger(ServerUtil.class);
 
 	private static final String SCRIPT_DIR = "scripts";
 	private static final String SCRIPT_COMMAND = "python";
 	private static final String REMOTE_SCRIPT_GET_DISK_FOR_DIR = "get_disk_for_dir.py";
 	private static final String REMOTE_SCRIPT_GET_SERVER_DETAILS = "get_server_details.py";
+	private static final String REMOTE_SCRIPT_BASE_DIR = "/opt/glustermg";
+	private static final String REMOTE_SCRIPT_DIR_NAME = "backend";
 
 	public void setSshUtil(SshUtil sshUtil) {
 		this.sshUtil = sshUtil;
@@ -75,8 +81,11 @@ public class ServerUtil {
 	}
 
 	private String getScriptPath(String scriptName) {
-		String scriptPath = servletContext.getRealPath(SCRIPT_DIR) + CoreConstants.FILE_SEPARATOR + scriptName;
-		return scriptPath;
+		return servletContext.getRealPath(SCRIPT_DIR) + CoreConstants.FILE_SEPARATOR + scriptName;
+	}
+	
+	private String getRemoteScriptDir() {
+		return REMOTE_SCRIPT_BASE_DIR + File.separator + appVersion + File.separator + REMOTE_SCRIPT_DIR_NAME;
 	}
 	
 	/**
@@ -98,12 +107,31 @@ public class ServerUtil {
 
 	private Object fetchServerDetails(String serverName) {
 		// fetch standard server details like cpu, disk, memory details
-		Object response = executeOnServer(true, serverName, REMOTE_SCRIPT_GET_SERVER_DETAILS, Server.class);
+		Object response = executeScriptOnServer(true, serverName, REMOTE_SCRIPT_GET_SERVER_DETAILS, Server.class);
 		if (response instanceof Status) {
 			throw new GlusterRuntimeException(((Status) response).getMessage());
 		}
 		return response;
 	}
+
+	/**
+	 * Executes given script on given server. Since the remote server may contain multiple versions of backend, this
+	 * method will invoke the script present in directory of same version as the gateway.
+	 * 
+	 * @param runInForeground
+	 * @param serverName
+	 * @param scriptWithArgs
+	 *            The script name followed by arguments to be passed. Note that the script name should not contain path
+	 *            as it will be automatically identified by the method.
+	 * @param expectedClass
+	 *            Class of the object expected from script execution
+	 * @return Object of the expected class from remote execution of the command. In case the remote execution fails
+	 *         ungracefully, an object of class {@link Status} will be returned.
+	 */
+	public Object executeScriptOnServer(boolean runInForeground, String serverName, String scriptWithArgs,
+			@SuppressWarnings("rawtypes") Class expectedClass) {
+		return executeOnServer(runInForeground, serverName, getRemoteScriptDir() + File.separator + scriptWithArgs, expectedClass);
+	}
 	
 	/**
 	 * Executes given command on given server
@@ -232,7 +260,7 @@ public class ServerUtil {
 	 * @return Status object containing the disk name, or error message in case the remote script fails.
 	 */
 	public Status getDiskForDir(String serverName, String brickDir) {
-		return (Status) executeOnServer(true, serverName, REMOTE_SCRIPT_GET_DISK_FOR_DIR + " " + brickDir, Status.class);
+		return (Status) executeScriptOnServer(true, serverName, REMOTE_SCRIPT_GET_DISK_FOR_DIR + " " + brickDir, Status.class);
 	}
 
 	public static void main(String[] args) {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
index bf82bc6c..39dd42f9 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/StatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
index 85487602..09851367 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/StatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/log4j.properties b/src/com.gluster.storage.management.gateway/src/log4j.properties
index 18e2e8b1..18e2e8b1 100644
--- a/src/com.gluster.storage.management.server/src/log4j.properties
+++ b/src/com.gluster.storage.management.gateway/src/log4j.properties
diff --git a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml b/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
index 76cd3082..c89eb2f0 100644
--- a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
+++ b/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
@@ -7,24 +7,25 @@
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd 
    http://www.springframework.org/schema/tx  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-	<context:component-scan base-package="com.gluster.storage.management.server" />
+	<context:component-scan base-package="com.gluster.storage.management.gateway" />
 	<task:scheduler id="taskScheduler" />
 	<task:executor id="taskExecutor" pool-size="1" />
 	<task:annotation-driven executor="taskExecutor" scheduler="taskScheduler" />
 
+	<!-- Syncs discovered servers and cluster-server mapping. -->
 	<task:scheduled-tasks>
-		<task:scheduled ref="serverDiscoveryTask" method="discoverServers" fixed-delay="60000" />
+		<task:scheduled ref="serverSyncTask" method="perform" fixed-delay="60000" />
 	</task:scheduled-tasks>
 
 	<!-- This task keeps checking status of disk migration tasks (wherever auto-commit is set to true)
 	so that auto-commit can be performed as soon as the migration is complete -->
-	<task:scheduled-tasks>
+	<!-- task:scheduled-tasks>
 		<task:scheduled ref="brickMigrationStatusTask" method="checkMigrationStatus" fixed-delay="60000" />
-	</task:scheduled-tasks>
+	</task:scheduled-tasks-->
 
 	<!-- Cluster environment. Valid values: vmware, aws, baremetal -->
-	<bean id="environment" class="java.lang.String">
-		<constructor-arg value="vmware" />
+	<bean id="discoveryMechanism" class="java.lang.String">
+		<constructor-arg value="multicast" />
 	</bean>
 
 	<!-- SSH timeouts - all in milliseconds. zero means no timeout. -->
@@ -68,19 +69,19 @@
 	<bean
         class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
 
-	<bean id="clusterDao" class="com.gluster.storage.management.server.data.PersistenceDao">
+	<bean id="clusterDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.server.data.ClusterInfo</value>
+			<value>com.gluster.storage.management.gateway.data.ClusterInfo</value>
 		</constructor-arg>
 	</bean>
 
-	<bean id="serverDao" class="com.gluster.storage.management.server.data.PersistenceDao">
+	<bean id="serverDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.server.data.ServerInfo</value>
+			<value>com.gluster.storage.management.gateway.data.ServerInfo</value>
 		</constructor-arg>
 	</bean>
 	
-	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.server.data.GlusterDataSource" />
+	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.gateway.data.GlusterDataSource" />
 		<bean id="dataSource" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject">
 		<ref local="dataSourceFactory" />
@@ -90,10 +91,10 @@
 		</property>
 		</bean -->
 
-	<!-- bean id="dataSource" class="com.gluster.storage.management.server.data.GlusterDataSource"
+	<!-- bean id="dataSource" class="com.gluster.storage.management.gateway.data.GlusterDataSource"
 		lazy-init="false" autowire="byType" / -->
 
-	<bean class="com.gluster.storage.management.server.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
+	<bean class="com.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml b/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
index abcd8c05..abcd8c05 100644
--- a/src/com.gluster.storage.management.server/src/spring/gluster-server-security.xml
+++ b/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
index 346b39bf..1f663cbe 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery
+++ b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.server" componentType="unknown"/>
+    <cq:rootRequest name="com.gluster.storage.management.gateway" componentType="unknown"/>
 </cq:componentQuery>
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
deleted file mode 100644
index e810c2ed..00000000
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
-	<display-name>glustermg</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-
-	<!-- Spring context loaded -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath:spring/gluster-server-security.xml
-			classpath:spring/gluster-server-base.xml
-		</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
-	</listener>
-
-	<!-- Jersey REST servlet -->
-	<servlet>
-		<servlet-name>gluster-resources-1.0</servlet-name>
-		<!-- servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class -->
-		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
-		<init-param>
-			<param-name>com.sun.jersey.config.property.packages</param-name>
-			<param-value>com.gluster.storage.management.server.resources.v1_0</param-value>
-		</init-param>
-		<init-param>
-			<param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
-			<param-value>com.gluster.storage.management.server.filters.GlusterResourceFilterFactory</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>gluster-resources-1.0</servlet-name>
-		<url-pattern>/1.0/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- JNLP download servlet -->
-	<servlet>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jnlp</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jar</url-pattern>
-	</servlet-mapping>
-
-	<!--  Spring Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>
-			org.springframework.web.filter.DelegatingFilterProxy
-		</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Gluster Management Gateway</web-resource-name>
-			<url-pattern>/*</url-pattern>
-		</web-resource-collection>
-		<user-data-constraint>
-			<transport-guarantee>CONFIDENTIAL</transport-guarantee>
-		</user-data-constraint>
-	</security-constraint>
-</web-app>
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractServersResource.java
deleted file mode 100644
index 8b4b6d99..00000000
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractServersResource.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * AbstractServersResource.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.server.resources.v1_0;
-
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
-import com.sun.jersey.api.core.InjectParam;
-
-/**
- * Abstract resource class for servers. Abstracts basic server related functionality like "get server details".
- */
-public class AbstractServersResource extends AbstractResource {
-	@InjectParam
-	protected ServerUtil serverUtil;
-	
-	@InjectParam
-	protected GlusterUtil glusterUtil;
-
-	// TODO: Remove this class!
-}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java
deleted file mode 100644
index e5b8d726..00000000
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * ServerDiscoveryTask.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.server.tasks;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
-import com.gluster.storage.management.server.resources.v1_0.DiscoveredServersResource;
-import com.gluster.storage.management.server.utils.ServerUtil;
-
-/**
- * Task for auto-discovery of servers eligible to be added to the Gluster cluster. This task runs periodically and keeps
- * the discovered server list at a common place. The server resource can then pick it and send to client whenever
- * demanded.
- */
-@Component
-public class ServerDiscoveryTask {
-	private static final String SCRIPT_NAME_SFX = "-discover-servers.py";
-	
-	@Autowired
-	private ServerUtil serverUtil;
-	
-	@Autowired
-	private DiscoveredServersResource discoveredServersResource;
-
-	@Autowired
-	private String environment;
-	
-	@Autowired
-	private PersistenceDao<ClusterInfo> clusterDao;
-
-	public void discoverServers() {
-		List<String> serverNameList = new ArrayList<String>();
-		
-		ProcessResult result = serverUtil.executeGlusterScript(true, environment + SCRIPT_NAME_SFX, new ArrayList<String>());
-		if(result.isSuccess()) {
-			List<String> existingServers = clusterDao.findBySQL("select name from server_info");
-			String serverNames = result.getOutput();
-			String[] parts = serverNames.split(CoreConstants.NEWLINE);
-			for(String serverName : parts) {
-				// The server discovery mechanism will return every server that has not been "peer probed". However we
-				// need to filter out those servers that are the "first" server of a new cluster, and hence are still
-				// not peer probed.
-				if(!existingServers.contains(serverName)) {
-					serverNameList.add(serverName);
-				}
-			}
-		}
-		
-		discoveredServersResource.setDiscoveredServerNames(serverNameList);
-	}
-}
\ No newline at end of file