Merge pull request #5 from Cognifide/vlt-subproject-fix

Fixing aemSync for subprojects

Author: pun-ky

src/main/kotlin/com/cognifide/gradle/aem/vlt/VltApp.kt

@@ -14,18 +14,22 @@ class VltApp(val instance: AemInstance, val project: Project) : VaultFsApp() {
     companion object {
 
         fun checkout(project: Project, config: AemConfig) {
+            val contentDir = File(config.determineContentPath(project))
+            if (!contentDir.exists()) {
+                project.logger.info("JCR content directory to be checked out does not exist: ${contentDir.absolutePath}")
+            }
+
             val instance = AemInstance.filter(project, config, AemInstance.FILTER_AUTHOR).first()
             val vltApp = VltApp(instance, project)
-            val cmdArgs = config.vaultCheckoutArgs + listOf(instance.url, "/", config.determineContentPath(project))
+            val cmdArgs = config.vaultCheckoutArgs + listOf(instance.url, "/", contentDir.absolutePath)
 
             val filter = File(config.vaultFilterPath)
             if (filter.exists()) {
                 vltApp.executeCommand(listOf(CheckoutTask.COMMAND, "-f", filter.absolutePath) + cmdArgs)
             } else {
-                vltApp.executeCommand(listOf(CheckoutTask.COMMAND + cmdArgs))
+                vltApp.executeCommand(listOf(CheckoutTask.COMMAND) + cmdArgs)
             }
         }
-
     }
 
     init {

src/main/kotlin/com/cognifide/gradle/aem/vlt/VltCleaner.kt

@@ -12,30 +12,35 @@ import java.io.File
 import java.io.IOException
 import java.util.*
 
-class VltCleaner(val root: String, val logger: Logger) {
+class VltCleaner(val root: File, val logger: Logger) {
 
     companion object {
         val VLT_FILE = ".vlt"
 
         val JCR_CONTENT_FILE = ".content.xml"
 
         fun clean(project : Project, config : AemConfig) {
-            val cleaner = VltCleaner(config.contentPath, project.logger)
+            val contentDir = File(config.determineContentPath(project))
+            if (!contentDir.exists()) {
+                project.logger.warn("JCR content directory to be cleaned does not exist: ${contentDir.absolutePath}")
+                return
+            }
 
+            val cleaner = VltCleaner(contentDir, project.logger)
             cleaner.removeVltFiles()
             cleaner.cleanupDotContent(config.vaultSkipProperties, config.vaultLineSeparator)
         }
     }
 
     fun removeVltFiles() {
-        for (file in FileUtils.listFiles(File(root), NameFileFilter(VLT_FILE), TrueFileFilter.INSTANCE)) {
+        for (file in FileUtils.listFiles(root, NameFileFilter(VLT_FILE), TrueFileFilter.INSTANCE)) {
             logger.info("Deleting {}", file.path)
             FileUtils.deleteQuietly(file)
         }
     }
 
     fun cleanupDotContent(contentProperties: List<String>, lineEnding : String) {
-        for (file in FileUtils.listFiles(File(root), NameFileFilter(JCR_CONTENT_FILE), TrueFileFilter.INSTANCE)) {
+        for (file in FileUtils.listFiles(root, NameFileFilter(JCR_CONTENT_FILE), TrueFileFilter.INSTANCE)) {
             try {
                 logger.info("Cleaning up {}", file.path)