#133 Added support for mlResourceFilenamesToIgnore

Author: Rob Rudin

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

@@ -133,6 +133,8 @@ public class AppConfig {
 	private boolean generateExtractionTemplate = true;
 	private boolean generateSearchOptions = true;
 
+	private String[] resourceFilenamesToIgnore;
+
 	public AppConfig() {
         this(DEFAULT_MODULES_PATH, DEFAULT_SCHEMAS_PATH);
     }
@@ -696,4 +698,12 @@ public String getModuleTimestampsPath() {
 	public void setModuleTimestampsPath(String moduleTimestampsPath) {
 		this.moduleTimestampsPath = moduleTimestampsPath;
 	}
+
+	public String[] getResourceFilenamesToIgnore() {
+		return resourceFilenamesToIgnore;
+	}
+
+	public void setResourceFilenamesToIgnore(String... resourceFilenamesToIgnore) {
+		this.resourceFilenamesToIgnore = resourceFilenamesToIgnore;
+	}
 }

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

@@ -281,47 +281,60 @@ public AppConfig newAppConfig() {
 			c.setStaticCheckLibraryAssets(Boolean.parseBoolean(prop));
 		}
 
+		/**
+		 * The following properties are all for generating Entity Services artifacts.
+		 */
 		prop = getProperty("mlModelsPath");
 		if (prop != null) {
 			logger.info("Entity Services models path: " + prop);
 			c.setModelsPath(prop);
 		}
-
 		prop = getProperty("mlInstanceConverterPath");
 		if (prop != null) {
 			logger.info("Entity Services instance converter path: " + prop);
 			c.setInstanceConverterPath(prop);
 		}
-
 		prop = getProperty("mlGenerateInstanceConverter");
 		if (prop != null) {
 			logger.info("Entity Services generate instance converter: " + prop);
 			c.setGenerateInstanceConverter(Boolean.parseBoolean(prop));
 		}
-
 		prop = getProperty("mlGenerateSchema");
 		if (prop != null) {
 			logger.info("Entity Services generate schema: " + prop);
 			c.setGenerateSchema(Boolean.parseBoolean(prop));
 		}
-
 		prop = getProperty("mlGenerateSearchOptions");
 		if (prop != null) {
 			logger.info("Entity Services generate search options: " + prop);
 			c.setGenerateSearchOptions(Boolean.parseBoolean(prop));
 		}
-
 		prop = getProperty("mlGenerateDatabaseProperties");
 		if (prop != null) {
 			logger.info("Entity Services generate database properties: " + prop);
 			c.setGenerateDatabaseProperties(Boolean.parseBoolean(prop));
 		}
-
 		prop = getProperty("mlGenerateExtractionTemplate");
 		if (prop != null) {
 			logger.info("Entity Services generate extraction template: " + prop);
 			c.setGenerateExtractionTemplate(Boolean.parseBoolean(prop));
 		}
+		// End Entity Services properties
+
+		/**
+		 * Sets resource filenames to ignore on ALL commands. Be careful here, in case you have files for different kinds
+		 * of resources, but with the same filename (this should be very rare and easily avoided).
+		 *
+		 * Also that as of version 2.6.0 of ml-app-deployer, this property is processed by AbstractAppDeployer, NOT by
+		 * the Command itself. So in order for this property to be applied, you must execute a Command via a subclass of
+		 * AbstractAppDeployer (most commonly SimpleAppDeployer).
+		 */
+		prop = getProperty("mlResourceFilenamesToIgnore");
+		if (prop != null) {
+			String[] values = prop.split(",");
+			logger.info("Ignoring resource filenames: " + Arrays.asList(values));
+			c.setResourceFilenamesToIgnore(values);
+		}
 
 		return c;
 	}

src/main/java/com/marklogic/appdeployer/impl/AbstractAppDeployer.java

@@ -5,6 +5,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.client.helper.LoggingObject;
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.AppDeployer;
@@ -52,9 +53,13 @@ public void deploy(AppConfig appConfig) {
 
         CommandContext context = new CommandContext(appConfig, manageClient, adminManager);
 
+        String[] filenamesToIgnore = appConfig.getResourceFilenamesToIgnore();
         for (Command command : commands) {
             String name = command.getClass().getName();
             logger.info(format("Executing command [%s] with sort order [%d]", name, command.getExecuteSortOrder()));
+            if (command instanceof AbstractCommand) {
+	            ((AbstractCommand)command).setFilenamesToIgnore(filenamesToIgnore);
+            }
             command.execute(context);
             logger.info(format("Finished executing command [%s]\n", name));
         }

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -72,6 +72,7 @@ public void allProperties() {
 	    p.setProperty("mlGenerateSchema", "false");
 	    p.setProperty("mlGenerateSearchOptions", "false");
 	    p.setProperty("mlGenerateExtractionTemplate", "false");
+	    p.setProperty("mlResourceFilenamesToIgnore", "role1.json,role2.xml");
 
 	    sut = new DefaultAppConfigFactory(new SimplePropertySource(p));
         AppConfig config = sut.newAppConfig();
@@ -111,6 +112,9 @@ public void allProperties() {
         assertEquals("path3", paths.get(2));
 
         assertEquals("custom/timestamps/path.properties", config.getModuleTimestampsPath());
+
+        assertEquals("role1.json", config.getResourceFilenamesToIgnore()[0]);
+	    assertEquals("role2.xml", config.getResourceFilenamesToIgnore()[1]);
     }
 
 	/**

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

@@ -8,9 +8,8 @@ public class IgnoreRoleTest extends AbstractAppDeployerTest {
 
 	@Test
 	public void test() {
-		DeployRolesCommand command = new DeployRolesCommand();
-		command.setFilenamesToIgnore("sample-app-role2.xml");
-		initializeAppDeployer(command);
+		appConfig.setResourceFilenamesToIgnore("sample-app-role2.xml");
+		initializeAppDeployer(new DeployRolesCommand());
 		appDeployer.deploy(appConfig);
 
 		try {