[tomee] 01/11: TOMEE-2736 - Explicitly override cached system properties in RemoteServer for Maven TomEE Plugin

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 522959cf1a23a959238eb51311756b0145b0de6e
Author: Richard Zowalla <ri...@zowalla.com>
AuthorDate: Wed Nov 13 11:15:17 2019 +0100

    TOMEE-2736 - Explicitly override cached system properties in RemoteServer for Maven TomEE Plugin
---
 .../apache/openejb/maven/plugin/AbstractTomEEMojo.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 7a6741d..c04c261 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -82,6 +82,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Properties;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.SimpleFormatter;
@@ -1296,7 +1297,18 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
         System.setProperty("server.shutdown.port", String.valueOf(tomeeShutdownPort));
         System.setProperty("server.shutdown.command", tomeeShutdownCommand);
 
-        server = new RemoteServer(getConnectAttempts(), debug);
+        // We might need to override static cached env vars in RemoteServer
+        // Reason: Multiple execution in same JVM, i.e. in Maven Integration Tests
+        Properties override = new Properties();
+        override.setProperty("openejb.home", System.getProperty("openejb.home"));
+        if (debug) {
+            override.setProperty("openejb.server.debug", System.getProperty("openejb.server.debug"));
+            override.setProperty("server.debug.port", System.getProperty("server.debug.port"));
+        }
+        override.setProperty("server.shutdown.port", System.getProperty("server.shutdown.port"));
+        override.setProperty("server.shutdown.command", System.getProperty("server.shutdown.command"));
+
+        server = new RemoteServer(override, getConnectAttempts(), debug);
         server.setAdditionalClasspath(getAdditionalClasspath());
 
         addShutdownHooks(server); // some shutdown hooks are always added (see UpdatableTomEEMojo)
@@ -1315,7 +1327,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
             getLog().info("Running '" + getClass().getSimpleName().replace("TomEEMojo", "").toLowerCase(Locale.ENGLISH));
         }
 
-        final InputStream originalIn = System.in; // piped when starting resmote server so saving it
+        final InputStream originalIn = System.in; // piped when starting remote server so saving it
 
         serverCmd(server, strings);