Move applicationMonitor gen to StartDebugMojo:copyConfigFiles to supp…

…ort more goals
OpenLiberty · Aug 10, 2023 · b5757c6 · b5757c6
1 parent 3db9505
commit b5757c6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojo.java
@@ -109,9 +109,6 @@ private void doDeploy() throws IOException, MojoExecutionException, TransformerE
             getLog().warn(messages.getString("warn.install.app.add.configuration"));
             applicationXml.writeApplicationXmlDocument(serverDirectory);
         }
-
-        // create applicationMonitor configuration in configDropins/defaults
-        appMonXml.writeAppMonitorConfigXmlDocument(serverDirectory, appMonitorTrigger);
     }
 
     private void installSpringBootApp() throws MojoExecutionException, IOException {

diff --git a/...maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojoSupport.java b/...maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojoSupport.java
@@ -64,7 +64,6 @@ public abstract class DeployMojoSupport extends LooseAppSupport {
     protected File copyLibsDirectory;
 
     protected ApplicationXmlDocument applicationXml = new ApplicationXmlDocument();
-    protected ApplicationMonitorConfigXmlDocument appMonXml = new ApplicationMonitorConfigXmlDocument("maven");
 
     protected void installApp(Artifact artifact) throws MojoExecutionException, IOException {
 

diff --git a/...y-maven-plugin/src/main/java/io/openliberty/tools/maven/server/StartDebugMojoSupport.java b/...y-maven-plugin/src/main/java/io/openliberty/tools/maven/server/StartDebugMojoSupport.java
@@ -67,9 +67,12 @@
 import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
 
 import io.openliberty.tools.ant.ServerTask;
+import io.openliberty.tools.common.plugins.config.ApplicationMonitorConfigXmlDocument;
 import io.openliberty.tools.common.plugins.config.ServerConfigXmlDocument;
+import io.openliberty.tools.common.plugins.util.PluginExecutionException;
 import io.openliberty.tools.maven.ServerFeatureSupport;
 import io.openliberty.tools.maven.applications.LooseWarApplication;
+import io.openliberty.tools.maven.utils.CommonLogger;
 import io.openliberty.tools.maven.utils.ExecuteMojoUtil;
 
 /**
@@ -97,6 +100,8 @@ public abstract class StartDebugMojoSupport extends ServerFeatureSupport {
     protected Map<String,String> combinedBootstrapProperties = null;
     protected List<String> combinedJvmOptions = null;
 
+    protected ApplicationMonitorConfigXmlDocument appMonXml = new ApplicationMonitorConfigXmlDocument("maven");
+
     @Component
     protected BuildPluginManager pluginManager;
 
@@ -661,6 +666,15 @@ protected void copyConfigFiles() throws IOException, MojoExecutionException {
 
         configFilesCopied = true;
 
+        // create applicationMonitor configuration in configDropins/defaults
+        try {
+            // TODO: do proper logging for writing/deleting the config file (but logic is in ci.common)
+            getLog().debug("Writing or deleting configDropins applicationMonitor config file based on `appMonitorTrigger`: " + appMonitorTrigger);
+            appMonXml.writeAppMonitorConfigXmlDocument(serverDirectory, appMonitorTrigger);
+        } catch (TransformerException | ParserConfigurationException | PluginExecutionException e) {
+            throw new MojoExecutionException("Error writing configDropins applicationMonitor file", e);
+        }
+
         // Now process the copyDependencies configuration
         copyDependencies();
     }