[tomee] branch master updated: Force local to en_US because the watch is looking for the english version of the Tomcat log so it may fail for some people.

[jl...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e492305  Force local to en_US because the watch is looking for the english version of the Tomcat log so it may fail for some people.
e492305 is described below

commit e492305c0367882fae4557aa2f838279a70acb64
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Tue Aug 20 11:50:03 2019 +0200

    Force local to en_US because the watch is looking for the english version of the Tomcat log so it may fail for some people.
---
 .../src/main/java/org/apache/tomee/server/composer/TomEE.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java b/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
index 6196ad1..b230099 100644
--- a/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
+++ b/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
@@ -231,6 +231,15 @@ public class TomEE {
                     .directory(home)
                     .command(catalinaSh.getAbsolutePath(), "run");
 
+            // make sure to configure the Locale to english otherwise the watch bellow will fail on other countries
+            if (env.containsKey("JAVA_OPTS")) {
+                env.put("JAVA_OPTS", "-Duser.language=en -Duser.country=US " + env.get("JAVA_OPTS"));
+
+            } else {
+                env.put("JAVA_OPTS", "-Duser.language=en -Duser.country=US");
+
+            }
+
             builder.environment().putAll(env);
 
             if (list) Files.visit(tmpdir, TomEE::print);