#174 Handling role with permission referring to itself

Merged from 2.x

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java

@@ -115,7 +115,7 @@ protected SaveReceipt saveResource(ResourceManager mgr, CommandContext context,
      * @param context
      */
     protected void storeTokenForResourceId(SaveReceipt receipt, CommandContext context) {
-        URI location = receipt.getResponse().getHeaders().getLocation();
+        URI location = receipt.getResponse() != null ? receipt.getResponse().getHeaders().getLocation() : null;
 
         String idValue = null;
         String resourceName = null;

src/main/java/com/marklogic/mgmt/api/API.java

@@ -64,11 +64,13 @@ public API(ManageClient client, ObjectMapper mapper) {
     }
 
     protected void initializeAdminManager() {
-        ManageConfig mc = manageClient.getManageConfig();
-        if (mc.getAdminUsername() != null && mc.getAdminPassword() != null) {
-            AdminConfig ac = new AdminConfig(mc.getHost(), 8001, mc.getAdminUsername(), mc.getAdminPassword());
-            this.adminManager = new AdminManager(ac);
-        }
+    	if (manageClient != null) {
+		    ManageConfig mc = manageClient.getManageConfig();
+		    if (mc.getAdminUsername() != null && mc.getAdminPassword() != null) {
+			    AdminConfig ac = new AdminConfig(mc.getHost(), 8001, mc.getAdminUsername(), mc.getAdminPassword());
+			    this.adminManager = new AdminManager(ac);
+		    }
+	    }
     }
 
     protected ObjectMapper buildDefaultObjectMapper() {

src/main/java/com/marklogic/mgmt/api/Resource.java

@@ -42,7 +42,7 @@ public String save() {
             logger.info(format("Saved %s %s", name, label));
         }
         return format("[Path: %s; Resource ID: %s; HTTP status: %s]", receipt.getPath(), receipt.getResourceId(),
-                receipt.getResponse().getStatusCode());
+                receipt.getResponse() != null ? receipt.getResponse().getStatusCode() : "(none)");
     }
 
     /**

src/main/java/com/marklogic/mgmt/api/security/Permission.java

@@ -1,24 +1,33 @@
 package com.marklogic.mgmt.api.security;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
 public class Permission {
 
-    private String roleName;
-    private String capability;
+	@JsonProperty("role-name")
+	@XmlElement(name = "role-name")
+	private String roleName;
+	private String capability;
 
-    public String getRoleName() {
-        return roleName;
-    }
+	public String getRoleName() {
+		return roleName;
+	}
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
 
-    public String getCapability() {
-        return capability;
-    }
+	public String getCapability() {
+		return capability;
+	}
 
-    public void setCapability(String capability) {
-        this.capability = capability;
-    }
+	public void setCapability(String capability) {
+		this.capability = capability;
+	}
 
 }