#161 Can now export amps; added ResourceMapper too

Author: rjrudin

src/main/java/com/marklogic/appdeployer/ConfigDir.java

@@ -7,9 +7,9 @@
 import java.util.List;
 
 /**
- * Defines all of the directories where configuration files can be found. This is decoupled from the NounManager
- * classes, who don't need to care where to look for configuration files, they just need to care about how to load the
- * data in those files.
+ * Defines all of the directories where configuration files can be found.
+ *
+ * TODO Eventually turn this into an interface. 
  */
 public class ConfigDir {
 
@@ -76,10 +76,22 @@ public File getSecurityDir() {
 		return new File(baseDir, "security");
 	}
 
+	public File getAmpsDir() {
+		return new File(getSecurityDir(), "amps");
+	}
+
+	public File getPrivilegesDir() {
+		return new File(getSecurityDir(), "privileges");
+	}
+
 	public File getRolesDir() {
 		return new File(getSecurityDir(), "roles");
 	}
 
+	public File getUsersDir() {
+		return new File(getSecurityDir(), "users");
+	}
+
 	public File getServersDir() {
 		return new File(baseDir, "servers");
 	}

src/main/java/com/marklogic/appdeployer/command/security/DeployAmpsCommand.java

@@ -1,13 +1,13 @@
 package com.marklogic.appdeployer.command.security;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.ResourceManager;
 import com.marklogic.mgmt.security.AmpManager;
 
+import java.io.File;
+
 public class DeployAmpsCommand extends AbstractResourceCommand {
 
     public DeployAmpsCommand() {
@@ -17,7 +17,7 @@ public DeployAmpsCommand() {
 
     @Override
     protected File[] getResourceDirs(CommandContext context) {
-        return new File[] { new File(context.getAppConfig().getConfigDir().getSecurityDir(), "amps") };
+        return new File[] { context.getAppConfig().getConfigDir().getAmpsDir() };
     }
 
     @Override

src/main/java/com/marklogic/appdeployer/command/security/DeployPrivilegesCommand.java

@@ -1,13 +1,13 @@
 package com.marklogic.appdeployer.command.security;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.ResourceManager;
 import com.marklogic.mgmt.security.PrivilegeManager;
 
+import java.io.File;
+
 public class DeployPrivilegesCommand extends AbstractResourceCommand {
 
     public DeployPrivilegesCommand() {
@@ -17,7 +17,7 @@ public DeployPrivilegesCommand() {
 
     @Override
     protected File[] getResourceDirs(CommandContext context) {
-        return new File[] { new File(context.getAppConfig().getConfigDir().getSecurityDir(), "privileges") };
+        return new File[] { context.getAppConfig().getConfigDir().getPrivilegesDir() };
     }
 
     @Override

src/main/java/com/marklogic/appdeployer/command/security/DeployUsersCommand.java

@@ -1,13 +1,13 @@
 package com.marklogic.appdeployer.command.security;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.ResourceManager;
 import com.marklogic.mgmt.security.UserManager;
 
+import java.io.File;
+
 public class DeployUsersCommand extends AbstractResourceCommand {
 
     public DeployUsersCommand() {
@@ -16,7 +16,7 @@ public DeployUsersCommand() {
     }
 
     protected File[] getResourceDirs(CommandContext context) {
-        return new File[] { new File(context.getAppConfig().getConfigDir().getSecurityDir(), "users") };
+        return new File[] { context.getAppConfig().getConfigDir().getUsersDir() };
     }
 
     @Override

src/main/java/com/marklogic/appdeployer/export/AbstractNamedResourceExporter.java

@@ -5,6 +5,12 @@
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * Captures the results of exporting one or more resources.
+ *
+ * The list of messages contains messages pertaining to the resources that were exported. These messages are
+ * typically used to provide warnings or an explanation of how a particular resource or resource type was exported.
+ */
 public class ExportedResources {
 
 	private List<File> files;

src/main/java/com/marklogic/appdeployer/export/AbstractResourceExporter.java

@@ -2,6 +2,8 @@
 
 import com.marklogic.appdeployer.export.appservers.ServerExporter;
 import com.marklogic.appdeployer.export.databases.DatabaseExporter;
+import com.marklogic.appdeployer.export.impl.CompositeResourceExporter;
+import com.marklogic.appdeployer.export.security.AmpExporter;
 import com.marklogic.appdeployer.export.security.PrivilegeExporter;
 import com.marklogic.appdeployer.export.security.RoleExporter;
 import com.marklogic.appdeployer.export.security.UserExporter;
@@ -27,11 +29,12 @@ public static Exporter client(ManageClient manageClient) {
 
 	public Exporter(ManageClient manageClient) {
 		this.manageClient = manageClient;
-		compositeExporter = new CompositeResourceExporter(manageClient);
+		compositeExporter = new CompositeResourceExporter();
 	}
 
 	public Exporter select(ResourceSelector selector) {
 		ResourceSelection selection = selector.selectResources(manageClient);
+		amps(selection.getAmpUriRefs());
 		databases(selection.getDatabaseNames());
 		privilegesExecute(selection.getPrivilegeExecuteNames());
 		privilegesUri(selection.getPrivilegeUriNames());
@@ -56,6 +59,10 @@ public Exporter add(ResourceExporter resourceExporter) {
 		return this;
 	}
 
+	public Exporter amps(String... ampUriRefs) {
+		return add(new AmpExporter(manageClient, ampUriRefs));
+	}
+
 	public Exporter databases(String... databaseNames) {
 		return add(new DatabaseExporter(manageClient, databaseNames));
 	}

src/main/java/com/marklogic/appdeployer/export/ExportedResources.java

@@ -4,6 +4,9 @@
 
 /**
  * Interface for exporting one or more MarkLogic resources via the Management API to disk.
+ *
+ * This is located in the appdeployer package because of an assumed dependency on the ConfigDir class, which defines
+ * where resources should be exported to.
  */
 public interface ResourceExporter {
 

src/main/java/com/marklogic/appdeployer/export/Exporter.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.appdeployer.ConfigDir;
-import com.marklogic.appdeployer.export.AbstractNamedResourceExporter;
+import com.marklogic.appdeployer.export.impl.AbstractNamedResourceExporter;
 import com.marklogic.appdeployer.export.ExportedResources;
 import com.marklogic.appdeployer.export.databases.DatabaseExporter;
 import com.marklogic.mgmt.ManageClient;