Audo discovery changes

6 files changed, 101 insertions, 26 deletions

diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
index 55812ba3..abd8ba4b 100644
--- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
@@ -18,10 +18,14 @@
  *******************************************************************************/
 package com.gluster.storage.management.core.constants;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  *
  */
 public class CoreConstants {
     public static final String NEWLINE = System.getProperty("line.separator");
+    public static final String FILE_SEPARATOR = System.getProperty("file.separator");
     public static final String ENCODING_UTF8 = "UTF-8";
 }
diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AbstractServerResponse.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AbstractResponse.java
index c03194dd..be552bdc 100644
--- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AbstractServerResponse.java
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AbstractResponse.java
@@ -18,7 +18,7 @@
  *******************************************************************************/
 package com.gluster.storage.management.core.model;

 

-public abstract class AbstractServerResponse implements Response {

+public abstract class AbstractResponse implements Response {

 	private Status status;

 

 	@Override

diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GenericResponse.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GenericResponse.java
index 3e1e86db..efeed34b 100644
--- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GenericResponse.java
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GenericResponse.java
@@ -23,13 +23,10 @@ package com.gluster.storage.management.core.model;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "response")
-public class GenericResponse<T> implements Response<T> {
+public class GenericResponse<T> extends AbstractResponse {
 	private T data;
 	private Status status;
 
-	public GenericResponse() {
-	}
-
 	@Override
 	public Status getStatus() {
 		return status;
@@ -44,13 +41,16 @@ public class GenericResponse<T> implements Response<T> {
 		this.data = data;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.gluster.storage.management.core.model.ServerResponse#getData()
-	 */
+	public GenericResponse() {
+	}
+
 	@Override
 	public T getData() {
 		return data;
 	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
 }
diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerListResponse.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerListResponse.java
index 6899f67d..6a8397a6 100644
--- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerListResponse.java
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerListResponse.java
@@ -16,24 +16,50 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;

-

+package com.gluster.storage.management.core.model;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-

-@XmlRootElement(name="response")

-public class ServerListResponse<T extends Server> extends GenericResponse {

+import javax.xml.bind.annotation.XmlTransient;
+
+@XmlRootElement(name = "response")
+public class ServerListResponse<T extends Server> extends AbstractResponse {
+	private List<T> servers = new ArrayList<T>();
+
+	public ServerListResponse() {
+	}
+
 	public ServerListResponse(Status status, List<T> servers) {
-		super(status, servers);
-	}

-	

-	@SuppressWarnings("unchecked")
-	@XmlElementWrapper(name="servers")

-	@XmlElement(name="server", type=Server.class)

-	public List<T> getServers() {

-		return (List<T>)getData();

-	}

-}

+		setStatus(status);
+		setServers(servers);
+	}
+
+	@XmlElementWrapper(name = "servers")
+	@XmlElement(name = "server", type = Server.class)
+	public List<T> getServers() {
+		return servers;
+	}
+
+	/**
+	 * @param servers
+	 *            the servers to set
+	 */
+	public void setServers(List<T> servers) {
+		this.servers = servers;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see com.gluster.storage.management.core.model.Response#getData()
+	 */
+	@Override
+	@XmlTransient
+	public List<T> getData() {
+		return getServers();
+	}
+}
diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StringListResponse.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StringListResponse.java
new file mode 100644
index 00000000..3304692d
--- /dev/null
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StringListResponse.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.core.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "response")
+public class StringListResponse extends AbstractResponse {
+	private List<String> data = new ArrayList<String>();
+	
+	public StringListResponse() {
+	}
+	
+	public StringListResponse(List<String> data) {
+		this.data = data;
+	}
+	
+	@Override
+	@XmlElementWrapper(name = "list")
+	@XmlElement(name = "value", type = String.class)
+	public List<String> getData() {
+		return data;
+	}
+}
\ No newline at end of file
diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
index e8f193ce..507c6d95 100644
--- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
+++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
@@ -55,9 +55,9 @@ public class ProcessUtil {
 
     /**
      * Executes given command in foreground/background
-     * @param command
      * @param runInForeground Boolean flag indicating whether the command should
      * be executed in foreground
+     * @param command
      * @return {@link ProcessResult} object
      */
     public ProcessResult executeCommand(boolean runInForeground, List<String> command) {