From d4776431b2681fc8692fd74644e255883b17dc0e Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Tue, 26 Jul 2011 16:51:05 +0530
Subject: Export key errors - bug fix

---
 .../gluster/storage/management/core/utils/FileUtil.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/com.gluster.storage.management.core')

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
index d10dfee5..a0d90634 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
@@ -39,12 +39,17 @@ public class FileUtil {
 		}
 	}
 
-	public static byte[] readFileAsByteArray(File file) throws FileNotFoundException, IOException {
-		FileInputStream fileInputStream = new FileInputStream(file);
-		byte[] data = new byte[fileInputStream.available()];
-		fileInputStream.read(data);
-		fileInputStream.close();
-		return data;
+	public static byte[] readFileAsByteArray(File file) {
+		try {
+			FileInputStream fileInputStream = new FileInputStream(file);
+			byte[] data = new byte[fileInputStream.available()];
+			fileInputStream.read(data);
+			fileInputStream.close();
+			return data;
+		} catch (Exception e) {
+			throw new GlusterRuntimeException("Exception while reading file [" + file.getName() + "]: "
+					+ e.getMessage(), e);
+		}
 	}
 	
 	public static void createTextFile(String fileName, String contents) {
-- 
cgit 


From f6108ac5ebbb956e7a7ed5736a6755bbc843ee4b Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Tue, 26 Jul 2011 17:32:51 +0530
Subject: Volume download logs REST services enhanced

---
 .../src/com/gluster/storage/management/core/model/Volume.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/com.gluster.storage.management.core')

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 9255414c..f224bd5a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -189,6 +189,16 @@ public class Volume extends Entity {
 	public void setAccessControlList(String accessControlList) {
 		setOption(OPTION_AUTH_ALLOW, accessControlList);
 	}
+	
+	@XmlTransient
+	public boolean isNfsEnabled() {
+		String nfsDisabled = options.get(OPTION_NFS_DISABLE);
+		if(nfsDisabled == null || nfsDisabled.equalsIgnoreCase(GlusterConstants.ON)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
 	@XmlElement(name="options")
 	public VolumeOptions getOptions() {
-- 
cgit 


From 6038c29da2928448bfe30a6ac6f35f89c7be42ff Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Tue, 26 Jul 2011 12:48:55 +0530
Subject: Story #38 - CPU Usage graph

---
 .../com/gluster/storage/management/core/model/ClusterListener.java   | 2 ++
 .../storage/management/core/model/DefaultClusterListener.java        | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'src/com.gluster.storage.management.core')

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
index 2a4a9920..355483e7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
@@ -52,4 +52,6 @@ public interface ClusterListener {
 	public void alertRemoved(Alert alert);
 	
 	public void alertUpdated(Alert alert);
+	
+	public void aggregatedStatsChanged();
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
index e72ff3e5..6a3c5dae 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
@@ -110,4 +110,9 @@ public class DefaultClusterListener implements ClusterListener {
 	public void alertUpdated(Alert alert) {
 		modelChanged();
 	}
+
+	@Override
+	public void aggregatedStatsChanged() {
+		modelChanged();
+	}
 }
-- 
cgit