Java agent download dir fix (#940)

* Java agent download dir fix * Fix * Clean up * Fix
wttech · Dec 20, 2022 · cab63ac · cab63ac
1 parent 49bd5c2
commit cab63ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstance.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstance.kt
@@ -45,7 +45,7 @@ class LocalInstance(aem: AemExtension, name: String) : Instance(aem, name) {
         prop.strings("jvmOpts")?.let { set(it) }
     }
 
-    val jvmAgents = JavaAgentResolver(aem).apply {
+    val jvmAgents = JavaAgentResolver(localManager).apply {
         prop.strings("jvmAgents")?.let { files(it) }
     }
 

diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt
@@ -7,7 +7,6 @@ import com.cognifide.gradle.aem.common.instance.action.AwaitDownAction
 import com.cognifide.gradle.aem.common.instance.action.AwaitUpAction
 import com.cognifide.gradle.aem.common.instance.local.BackupManager
 import com.cognifide.gradle.aem.common.instance.local.InstallResolver
-import com.cognifide.gradle.aem.common.instance.local.JavaAgentResolver
 import com.cognifide.gradle.aem.common.instance.local.OpenMode
 import com.cognifide.gradle.aem.common.instance.local.QuickstartResolver
 import com.cognifide.gradle.aem.common.instance.local.Source
@@ -739,13 +738,6 @@ class LocalInstanceManager(internal val aem: AemExtension) : Serializable {
         }
     }
 
-    val javaAgent by lazy { JavaAgentResolver(aem) }
-
-    /**
-     * Configure Java agents for instrumenting AEM instances.
-     */
-    fun javaAgent(options: JavaAgentResolver.() -> Unit) = javaAgent.using(options)
-
     /**
      * Hook for additional configuration for defined instances.
      */

diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/local/JavaAgentResolver.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/local/JavaAgentResolver.kt
@@ -1,15 +1,17 @@
 package com.cognifide.gradle.aem.common.instance.local
 
-import com.cognifide.gradle.aem.AemExtension
+import com.cognifide.gradle.aem.common.instance.LocalInstanceManager
 import com.cognifide.gradle.common.file.resolver.FileResolver
 import com.cognifide.gradle.common.utils.using
 
-class JavaAgentResolver(private val aem: AemExtension) {
+class JavaAgentResolver(private val manager: LocalInstanceManager) {
 
-    private val common = aem.common
+    private val aem = manager.aem
+
+    private val common = manager.aem.common
 
     private val fileResolver = FileResolver(common).apply {
-        downloadDir.convention(aem.obj.buildDir("localInstance/javaAgent"))
+        downloadDir.convention(manager.rootDir.dir("javaAgent"))
         aem.prop.file("localInstance.javaAgent.downloadDir")?.let { downloadDir.set(it) }
         aem.prop.list("localInstance.javaAgent.urls")?.forEachIndexed { index, url ->
             val no = index + 1