#428 Now setting the Gradle projectDir on the AppConfig object

This allows ml-gradle to work with Java 11 and the Gradle daemon, as paths in AppConfig are now constructed relative to the projectDir.

While testing CreateResource/CreateTransform, also made a little fix so that the last module path is used when writing out a file. This avoids a problem where the files could be written to e.g. mlRestApi paths.

Author: rjrudin

examples/sample-project/build.gradle

@@ -58,6 +58,11 @@ dependencies {
 	testCompile "com.marklogic:ml-junit:3.0.0"
 	testCompile "com.jayway.restassured:rest-assured:2.4.1"
 
+	// Required for Java 11
+	testRuntime "javax.xml.bind:jaxb-api:2.3.1"
+	testRuntime "com.sun.xml.bind:jaxb-core:2.3.0.1"
+	testRuntime "com.sun.xml.bind:jaxb-impl:2.3.2"
+
 	// corb jar available from jcenter
 	corb "com.marklogic:marklogic-corb:2.3.2"
 }

gradle.properties

@@ -1,8 +1,8 @@
 group=com.marklogic
-version=3.11.0
+version=3.12.dev
 javadocsDir=../gh-pages-marklogic-java/javadocs
 
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.11.0
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.12.dev
 mlcpUtilDependency=com.marklogic:mlcp-util:0.9.0
 mlDataMovementDependency=com.marklogic:marklogic-data-movement-components:1.1
 mlUnitTestDependency=com.marklogic:marklogic-unit-test-client:0.12.0

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -345,8 +345,17 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.extensions.add("mlAdminConfig", adminConfig)
 
 		ProjectPropertySource propertySource = new ProjectPropertySource(project);
+
 		DefaultAppConfigFactory appConfigFactory = new DefaultAppConfigFactory(propertySource)
+		// The ConfigDir objects constructed by AppConfig must all be relative to the project directory
+		// when using Java 11. In case this causes problems, a user can disable this via the below property
+		if ("true".equals(project.property("mlIgnoreProjectDir"))) {
+			println "The Gradle projectDir will not be used to resolve file paths"
+		} else {
+			appConfigFactory.setProjectDir(project.getProjectDir())
+		}
 		project.extensions.add("mlAppConfigFactory", appConfigFactory)
+
 		AppConfig appConfig = appConfigFactory.newAppConfig()
 		project.extensions.add("mlAppConfig", appConfig)
 

src/main/groovy/com/marklogic/gradle/task/client/CreateResourceTask.groovy

@@ -90,8 +90,15 @@ declare function delete(
     void createResource() {
         String propName = "resourceName"
         if (getProject().hasProperty(propName)) {
-            servicesDir = servicesDir ? servicesDir : getAppConfig().getModulePaths().get(0) + "/services"
-            
+	        String servicesPath = servicesDir
+	        if (!servicesPath) {
+		        List<String> modulePaths = getAppConfig().getModulePaths()
+		        if (modulePaths != null && !modulePaths.isEmpty()) {
+			        // Use the last path so modules aren't written to e.g. mlRestApi paths
+			        servicesPath = modulePaths.get(modulePaths.size() - 1) + "/services"
+		        }
+	        }
+
             String name = getProject().getProperties().get(propName)
 
             String template = RESOURCE_TEMPLATE
@@ -102,12 +109,12 @@ declare function delete(
             }
 
             String resource = template.replace("%%RESOURCE_NAME%%", name)
-            new File(servicesDir).mkdirs()
-            def resourceFile = new File(servicesDir, name + fileExtension)
+            new File(servicesPath).mkdirs()
+            def resourceFile = new File(servicesPath, name + fileExtension)
             println "Creating new resource at " + resourceFile.getAbsolutePath()
             resourceFile.write(resource)
 
-            def metadataDir = new File(servicesDir, "metadata")
+            def metadataDir = new File(servicesPath, "metadata")
             metadataDir.mkdirs()
             String metadata = METADATA_TEMPLATE.replace("%%RESOURCE_NAME%%", name)
             def metadataFile = new File(metadataDir, name + ".xml")

src/main/groovy/com/marklogic/gradle/task/client/CreateTransformTask.groovy

@@ -1,9 +1,7 @@
 package com.marklogic.gradle.task.client
 
-import org.gradle.api.DefaultTask;
-import org.gradle.api.tasks.TaskAction;
-
-import com.marklogic.gradle.task.MarkLogicTask;
+import com.marklogic.gradle.task.MarkLogicTask
+import org.gradle.api.tasks.TaskAction
 
 class CreateTransformTask extends MarkLogicTask {
 
@@ -54,7 +52,14 @@ exports.transform = transform;
     void createResource() {
         String propName = "transformName"
         if (getProject().hasProperty(propName)) {
-            transformsDir = transformsDir ? transformsDir : getAppConfig().getModulePaths().get(0) + "/transforms"
+	        String transformsPath = transformsDir
+	        if (!transformsPath) {
+		        List<String> modulePaths = getAppConfig().getModulePaths()
+		        if (modulePaths != null && !modulePaths.isEmpty()) {
+			        // Use the last path so modules aren't written to e.g. mlRestApi paths
+			        transformsPath = modulePaths.get(modulePaths.size() - 1) + "/transforms"
+		        }
+	        }
 
             String name = getProject().getProperties().get(propName)
 
@@ -76,12 +81,12 @@ exports.transform = transform;
 
             String transform = template.replace("%%TRANSFORM_NAME%%", name)
 
-            new File(transformsDir).mkdirs()
-            def transformFile = new File(transformsDir, name + fileExtension)
+            new File(transformsPath).mkdirs()
+            def transformFile = new File(transformsPath, name + fileExtension)
             println "Creating new transform at " + transformFile.getAbsolutePath()
             transformFile.write(transform)
 
-			def metadataDir = new File(transformsDir, "metadata")
+			def metadataDir = new File(transformsPath, "metadata")
 			metadataDir.mkdirs()
 			String metadata = METADATA_TEMPLATE.replace("%%TRANSFORM_NAME%%", name)
 			def metadataFile = new File(metadataDir, name + ".xml")

src/main/groovy/com/marklogic/gradle/task/export/ExportResourcesTask.groovy

@@ -52,6 +52,11 @@ class ExportResourcesTask extends MarkLogicTask {
 	void export(ResourceSelector selector) {
 		def path = getAppConfig().getConfigDir().getBaseDir()
 		if (getProject().hasProperty("exportPath")) {
+			/**
+			 * Note that if a user provides a path and they're using Java 11 and the Gradle daemon, then the path
+			 * should be absolute. Otherwise, it will be resolved from the directory that the daemon was launched
+			 * from, which is likely not desirable.
+			 */
 			path = new File(getProject().property("exportPath"))
 		}
 		println "Exporting resources to: " + path