svn commit: r1583458 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Mar 31 20:55:36 2014
New Revision: 1583458

URL: http://svn.apache.org/r1583458
Log:
forcing encoding for tomee jvm to be able to read config files

Modified:
    tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java

Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java?rev=1583458&r1=1583457&r2=1583458&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java Mon Mar 31 20:55:36 2014
@@ -101,7 +101,9 @@ public class ExecMojo extends BuildTomEE
         config.put("workingDir", runtimeWorkingDir);
         config.put("command", script);
         final List<String> jvmArgs = generateJVMArgs();
-        config.put("catalinaOpts", toString(jvmArgs));
+
+        final String catalinaOpts = toString(jvmArgs);
+        config.put("catalinaOpts", catalinaOpts);
         config.put("timestamp", Long.toString(System.currentTimeMillis()));
         // java only
         final String cp = getAdditionalClasspath();
@@ -110,8 +112,13 @@ public class ExecMojo extends BuildTomEE
         }
         config.put("shutdownCommand", tomeeShutdownCommand);
         int i = 0;
+        boolean encodingSet = catalinaOpts.contains("-Dfile.encoding");
         for (final String jvmArg : jvmArgs) {
             config.put("jvmArg." + i++, jvmArg);
+            encodingSet = encodingSet || jvmArg.contains("-Dfile.encoding");
+        }
+        if (!encodingSet) { // forcing encoding for launched process to be able to read conf files
+            config.put("jvmArg." + i, "-Dfile.encoding=UTF-8");
         }
 
         // create an executable jar with main runner and zipFile