#130 Module timestamps path can be overriden now

Author: Rob Rudin

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

@@ -86,6 +86,7 @@ public class AppConfig {
 	private boolean staticCheckAssets = false;
 	private boolean staticCheckLibraryAssets = false;
 	private boolean bulkLoadAssets = true;
+	private String moduleTimestampsPath;
 
     private String schemasPath;
     private ConfigDir configDir;
@@ -688,4 +689,11 @@ public boolean isGenerateSearchOptions() {
 		return generateSearchOptions;
 	}
 
+	public String getModuleTimestampsPath() {
+		return moduleTimestampsPath;
+	}
+
+	public void setModuleTimestampsPath(String moduleTimestampsPath) {
+		this.moduleTimestampsPath = moduleTimestampsPath;
+	}
 }

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

@@ -246,6 +246,12 @@ public AppConfig newAppConfig() {
 			c.setModulePaths(list);
 		}
 
+		prop = getProperty("mlModuleTimestampsPath");
+		if (prop != null) {
+			logger.info("Module timestamps path: " + prop);
+			c.setModuleTimestampsPath(prop);
+		}
+
 		/**
 		 * Whether or not to load asset modules in bulk - i.e. in one transaction. Defaults to true.
 		 */

src/main/java/com/marklogic/appdeployer/command/modules/LoadModulesCommand.java

@@ -5,6 +5,7 @@
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.modulesloader.ModulesLoader;
 import com.marklogic.client.modulesloader.impl.DefaultModulesLoader;
+import com.marklogic.client.modulesloader.impl.PropertiesModuleManager;
 import com.marklogic.client.modulesloader.impl.TestServerModulesFinder;
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.command.AbstractCommand;
@@ -32,6 +33,10 @@ public LoadModulesCommand() {
     public void initializeDefaultModulesLoader(CommandContext context) {
         logger.info("Initializing instance of DefaultModulesLoader");
 		DefaultModulesLoader l = new DefaultModulesLoader(context.getAppConfig().newXccAssetLoader());
+		String path = context.getAppConfig().getModuleTimestampsPath();
+		if (path != null) {
+			l.setModulesManager(new PropertiesModuleManager(new File(path)));
+		}
 		l.setStaticChecker(context.getAppConfig().newStaticChecker());
         this.modulesLoader = l;
     }

src/main/java/com/marklogic/appdeployer/util/ModulesWatcher.java

@@ -6,9 +6,9 @@
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.helper.LoggingObject;
 import com.marklogic.client.modulesloader.ModulesFinder;
-import com.marklogic.client.modulesloader.ModulesLoader;
 import com.marklogic.client.modulesloader.impl.DefaultModulesFinder;
 import com.marklogic.client.modulesloader.impl.DefaultModulesLoader;
+import com.marklogic.client.modulesloader.impl.PropertiesModuleManager;
 import com.marklogic.client.modulesloader.impl.XccAssetLoader;
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.DefaultAppConfigFactory;
@@ -39,13 +39,17 @@ public static void startFromSystemProps() {
     public void run() {
         XccAssetLoader xal = appConfig.newXccAssetLoader();
         DefaultModulesLoader loader = new DefaultModulesLoader(xal);
+        String path = appConfig.getModuleTimestampsPath();
+        if (path != null) {
+        	loader.setModulesManager(new PropertiesModuleManager(new File(path)));
+        }
 		loader.setStaticChecker(appConfig.newStaticChecker());
         DatabaseClient client = appConfig.newDatabaseClient();
         List<String> paths = appConfig.getModulePaths();
         ModulesFinder finder = new DefaultModulesFinder();
         while (true) {
-            for (String path : paths) {
-                loader.loadModules(new File(path), finder, client);
+            for (String modulesPath : paths) {
+                loader.loadModules(new File(modulesPath), finder, client);
             }
             try {
                 Thread.sleep(sleepTime);

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

@@ -63,6 +63,7 @@ public void allProperties() {
         p.setProperty("mlReplaceTokensInModules", "false");
         p.setProperty("mlUseRoxyTokenPrefix", "false");
         p.setProperty("mlModulePaths", "path1,path2,path3");
+        p.setProperty("mlModuleTimestampsPath", "custom/timestamps/path.properties");
 
         p.setProperty("mlModelsPath", "ml/models");
         p.setProperty("mlInstanceConverterPath", "ext/my/path");
@@ -108,6 +109,8 @@ public void allProperties() {
         assertEquals("path1", paths.get(0));
         assertEquals("path2", paths.get(1));
         assertEquals("path3", paths.get(2));
+
+        assertEquals("custom/timestamps/path.properties", config.getModuleTimestampsPath());
     }
 
 	/**

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -2,6 +2,8 @@
 
 import java.io.File;
 
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.client.modulesloader.impl.DefaultModulesLoader;
 import com.marklogic.junit.Fragment;
 import org.junit.After;
 import org.junit.Before;
@@ -52,6 +54,21 @@ public void loadModulesWithStaticCheck() {
 		}
 	}
 
+	@Test
+	public void customModuleTimestampsPath() {
+    	String path = "build/custom-path.properties";
+    	File customFile = new File(path);
+    	customFile.mkdirs();
+    	if (customFile.exists()) {
+    		customFile.delete();
+	    }
+
+    	appConfig.setModuleTimestampsPath("build/custom-path.properties");
+		initializeAppDeployer(new DeployRestApiServersCommand(true), new LoadModulesCommand());
+		appDeployer.deploy(appConfig);
+		assertTrue("The custom file should have been created when the modules were loaded", customFile.exists());
+	}
+
     @Test
     public void loadModulesFromMultiplePaths() {
         appConfig.getModulePaths().add("src/test/resources/sample-app/build/mlRestApi/some-library/ml-modules");