#395 moduleTimestampsPath now accounts for projectDir

Author: rjrudin

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.16.3
-mlJavaclientUtilVersion=3.13.4
+version=3.17.0-develop
+mlJavaclientUtilVersion=3.14.0-develop
 mlJunitVersion=3.2.0
 

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

@@ -124,7 +124,7 @@ public class AppConfig {
 	private boolean staticCheckAssets = false;
 	private boolean staticCheckLibraryAssets = false;
 	private boolean bulkLoadAssets = true;
-	private String moduleTimestampsPath = PropertiesModuleManager.DEFAULT_FILE_PATH;
+	private String moduleTimestampsPath;
 	private boolean moduleTimestampsUseHost = true;
 	private boolean deleteTestModules = false;
 	private String deleteTestModulesPattern = "/test/**";
@@ -266,6 +266,9 @@ public AppConfig(File projectDir) {
 
 	    configDirs = new ArrayList<>();
 	    configDirs.add(ConfigDir.withProjectDir(projectDir));
+
+	    moduleTimestampsPath = projectDir != null ? new File(projectDir, PropertiesModuleManager.DEFAULT_FILE_PATH).getAbsolutePath()
+		    : PropertiesModuleManager.DEFAULT_FILE_PATH;
     }
 
 	public void populateCustomTokens(PropertiesSource propertiesSource) {

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

@@ -3,6 +3,7 @@
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.ext.SecurityContextType;
+import com.marklogic.client.ext.modulesloader.impl.PropertiesModuleManager;
 import com.marklogic.mgmt.util.SimplePropertySource;
 import org.junit.Assert;
 import org.junit.Test;
@@ -46,6 +47,8 @@ public void withProjectDir() {
 		assertEquals(projectPath + "/path1", appConfig.getConfigDirs().get(0).getBaseDir().getAbsolutePath());
 		assertEquals(projectPath + "/path2", appConfig.getConfigDirs().get(1).getBaseDir().getAbsolutePath());
 		assertEquals(projectPath + "/schemasPath", appConfig.getSchemaPaths().get(0));
+
+		assertEquals(projectPath + "/" + PropertiesModuleManager.DEFAULT_FILE_PATH, appConfig.getModuleTimestampsPath());
 	}
 
 	/**