Merge branch 'import-keys'

6 files changed, 8 insertions, 15 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index c083d298..92037741 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -22,6 +22,8 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;

 import javax.ws.rs.core.Response;

 

+import org.apache.log4j.Logger;

+

 import com.gluster.storage.management.client.utils.ClientUtil;

 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;

 import com.sun.jersey.api.client.Client;

@@ -32,14 +34,13 @@ import com.sun.jersey.api.client.WebResource.Builder;
 import com.sun.jersey.api.client.config.DefaultClientConfig;

 import com.sun.jersey.api.representation.Form;

 import com.sun.jersey.client.urlconnection.HTTPSProperties;

-import com.sun.jersey.core.header.FormDataContentDisposition;

 import com.sun.jersey.core.util.MultivaluedMapImpl;

 

 

 public abstract class AbstractClient {

 	private static final String HTTP_HEADER_AUTH = "Authorization";

 	protected static final MultivaluedMap<String, String> NO_PARAMS = new MultivaluedMapImpl();

-

+	private static final Logger logger = Logger.getLogger(AbstractClient.class);

 	protected String clusterName;

 	protected WebResource resource;

 	private String securityToken;

@@ -136,7 +137,7 @@ public abstract class AbstractClient {
 			return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML)

 					.get(responseClass);

 		} catch (Exception e1) {

-			e1.printStackTrace();

+			logger.error("Error in fetching response", e1);

 			throw createGlusterException(e1);

 		}

 	}

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java
index 15c70146..dfadd67c 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java
@@ -22,9 +22,9 @@ package com.gluster.storage.management.client;
 
 import java.io.File;
 
+import com.gluster.storage.management.core.constants.RESTConstants;
+
 public class KeysClient extends AbstractClient {
-	// Resource path: /glustermg/1.0/keys
-	private static final String RESOURCE_NAME = "keys";
 
 	public KeysClient() {
 		super();
@@ -36,7 +36,7 @@ public class KeysClient extends AbstractClient {
 
 	@Override
 	public String getResourcePath() {
-		return RESOURCE_NAME;
+		return RESTConstants.RESOURCE_KEYS;
 	}
 
 	public void exportSshKeys(String filePath) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index f9ab7e2f..455ecc11 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -41,6 +41,7 @@ public class RESTConstants {
 	public static final String RESOURCE_ALERTS = "alerts";
 	public static final String RESOURCE_SERVERS = "servers";
 	public static final String RESOURCE_TASKS = "tasks";
+	public static final String RESOURCE_KEYS = "keys";
 	
 	public static final String TASK_START = "start";
 	public static final String TASK_PAUSE = "pause";
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png
deleted file mode 100644
index 16d47578..00000000
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png
+++ /dev/null
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png
deleted file mode 100644
index d7f0d0c3..00000000
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png
+++ /dev/null
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.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java
index 169d41b0..a589c2a2 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.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java
@@ -86,13 +86,4 @@ public class KeysResource extends AbstractResource {
 
 		return zipFile;
 	}
-	
-	
-	
-
-	public static void main(String[] args) {
-		KeysResource key = new KeysResource();
-		// key.exportSshkeys();
-		System.out.println(System.getProperty("java.io.tmpdir"));
-	}
 }