#221 Protected paths and query rolesets are now in default set of commands

Author: rjrudin

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

@@ -114,7 +114,7 @@ public File getUsersDir() {
 
 	public File getProtectedPathsDir() { return new File(getSecurityDir(), "protected-paths"); }
 
-	public File getQueryRoleSetsDir() { return new File(getSecurityDir(), "query-rolesets"); }
+	public File getQueryRolesetsDir() { return new File(getSecurityDir(), "query-rolesets"); }
 
 	public File getServersDir() {
 		return new File(baseDir, "servers");

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

@@ -55,6 +55,8 @@ protected File[] findResourceDirs(AppConfig appConfig, ResourceDirFinder resourc
 				File dir = resourceDirFinder.getResourceDir(configDir);
 				if (dir != null && dir.exists()) {
 					list.add(dir);
+				} else if (dir != null && logger.isInfoEnabled()) {
+					logger.info("No resource directory found at: " + dir.getAbsolutePath());
 				}
 			}
 		}
@@ -71,13 +73,13 @@ protected void processExecuteOnResourceDir(CommandContext context, File resource
                 logger.info("Processing files in directory: " + resourceDir.getAbsolutePath());
             }
             for (File f : listFilesInDirectory(resourceDir, context)) {
-                if (logger.isInfoEnabled()) {
-                    logger.info("Processing file: " + f.getAbsolutePath());
-                }
-                SaveReceipt receipt = saveResource(mgr, context, f);
-                afterResourceSaved(mgr, context, f, receipt);
+		            if (logger.isInfoEnabled()) {
+			            logger.info("Processing file: " + f.getAbsolutePath());
+		            }
+		            SaveReceipt receipt = saveResource(mgr, context, f);
+		            afterResourceSaved(mgr, context, f, receipt);
+	            }
             }
-        }
     }
 
 	/**

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

@@ -61,6 +61,8 @@ public Map<String, List<Command>> buildCommandMap() {
 		securityCommands.add(new DeployExternalSecurityCommand());
 		securityCommands.add(new DeployPrivilegesCommand());
 		securityCommands.add(new DeployProtectedCollectionsCommand());
+		securityCommands.add(new DeployProtectedPathsCommand());
+		securityCommands.add(new DeployQueryRolesetsCommand());
 		map.put("mlSecurityCommands", securityCommands);
 
 		// Cluster

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

@@ -14,7 +14,7 @@ public abstract class SortOrderConstants {
     public static Integer DEPLOY_PROTECTED_COLLECTIONS = 80;
     public static Integer DEPLOY_MIMETYPES = 90;
 	public static Integer DEPLOY_PROTECTED_PATHS = 95;
-	public static Integer DEPLOY_QUERY_ROLE_SETS = 97;
+	public static Integer DEPLOY_QUERY_ROLESETS = 97;
 
     public static Integer DEPLOY_TRIGGERS_DATABASE = 100;
     public static Integer DEPLOY_SCHEMAS_DATABASE = 100;
@@ -74,7 +74,7 @@ public abstract class SortOrderConstants {
     public static Integer DELETE_CERTIFICATE_AUTHORITIES = 9020;
     public static Integer DELETE_EXTERNAL_SECURITY = 9030;
     public static Integer DELETE_PROTECTED_COLLECTIONS = 9040;
-	public static Integer DELETE_QUERY_ROLE_SETS = 9050;
+	public static Integer DELETE_QUERY_ROLESETS = 9050;
 
     // Roles can reference privileges, so must delete roles first
     public static Integer DELETE_ROLES = 9060;

src/main/java/com/marklogic/appdeployer/command/security/DeployProtectedPathCommand.java renamed to src/main/java/com/marklogic/appdeployer/command/security/DeployProtectedPathsCommand.java

@@ -9,9 +9,9 @@
 
 import java.io.File;
 
-public class DeployProtectedPathCommand extends AbstractResourceCommand {
+public class DeployProtectedPathsCommand extends AbstractResourceCommand {
 
-	public DeployProtectedPathCommand() {
+	public DeployProtectedPathsCommand() {
 		setExecuteSortOrder(SortOrderConstants.DEPLOY_PROTECTED_PATHS);
 		setUndoSortOrder(SortOrderConstants.DELETE_PROTECTED_PATHS);
 	}

src/main/java/com/marklogic/appdeployer/command/security/DeployQueryRoleSetsCommand.java renamed to src/main/java/com/marklogic/appdeployer/command/security/DeployQueryRolesetsCommand.java

@@ -4,24 +4,24 @@
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.resource.ResourceManager;
-import com.marklogic.mgmt.resource.security.QueryRoleSetsManager;
+import com.marklogic.mgmt.resource.security.QueryRolesetsManager;
 
 import java.io.File;
 
-public class DeployQueryRoleSetsCommand extends AbstractResourceCommand {
+public class DeployQueryRolesetsCommand extends AbstractResourceCommand {
 
-	public DeployQueryRoleSetsCommand() {
-		setExecuteSortOrder(SortOrderConstants.DEPLOY_QUERY_ROLE_SETS);
-		setUndoSortOrder(SortOrderConstants.DELETE_QUERY_ROLE_SETS);
+	public DeployQueryRolesetsCommand() {
+		setExecuteSortOrder(SortOrderConstants.DEPLOY_QUERY_ROLESETS);
+		setUndoSortOrder(SortOrderConstants.DELETE_QUERY_ROLESETS);
 	}
-	
+
 	@Override
 	protected File[] getResourceDirs(CommandContext context) {
-		return findResourceDirs(context, configDir -> configDir.getQueryRoleSetsDir());
+		return findResourceDirs(context, configDir -> configDir.getQueryRolesetsDir());
 	}
 
 	@Override
 	protected ResourceManager getResourceManager(CommandContext context) {
-		return new QueryRoleSetsManager(context.getManageClient());
+		return new QueryRolesetsManager(context.getManageClient());
 	}
 }

src/main/java/com/marklogic/mgmt/resource/security/QueryRoleSetsManager.java renamed to src/main/java/com/marklogic/mgmt/resource/security/QueryRolesetsManager.java

@@ -8,11 +8,11 @@
 
 import java.util.List;
 
-public class QueryRoleSetsManager extends AbstractResourceManager {
+public class QueryRolesetsManager extends AbstractResourceManager {
 
 	private boolean updateAllowed = false;
 
-	public QueryRoleSetsManager(ManageClient client) {
+	public QueryRolesetsManager(ManageClient client) {
 		super(client);
 	}
 

src/test/java/com/marklogic/appdeployer/command/security/ManageProtectedPathsTest.java

@@ -13,7 +13,7 @@ protected ResourceManager newResourceManager() {
 
 	@Override
 	protected Command newCommand() {
-		return new DeployProtectedPathCommand();
+		return new DeployProtectedPathsCommand();
 	}
 
 	@Override

src/test/java/com/marklogic/appdeployer/command/security/ManageQueryRoleSetsTest.java renamed to src/test/java/com/marklogic/appdeployer/command/security/ManageQueryRolesetsTest.java

@@ -3,17 +3,18 @@
 import com.marklogic.appdeployer.command.AbstractManageResourceTest;
 import com.marklogic.appdeployer.command.Command;
 import com.marklogic.mgmt.resource.ResourceManager;
-import com.marklogic.mgmt.resource.security.QueryRoleSetsManager;
+import com.marklogic.mgmt.resource.security.QueryRolesetsManager;
+
+public class ManageQueryRolesetsTest extends AbstractManageResourceTest {
 
-public class ManageQueryRoleSetsTest extends AbstractManageResourceTest {
     @Override
     protected ResourceManager newResourceManager() {
-        return new QueryRoleSetsManager(manageClient);
+        return new QueryRolesetsManager(manageClient);
     }
 
     @Override
     protected Command newCommand() {
-        return new DeployQueryRoleSetsCommand();
+        return new DeployQueryRolesetsCommand();
     }
 
 	@Override