You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/03/31 22:32:19 UTC
svn commit: r1583448 - in
/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin:
ExecMojo.java runner/ExecRunner.java
Author: rmannibucau
Date: Mon Mar 31 20:32:19 2014
New Revision: 1583448
URL: http://svn.apache.org/r1583448
Log:
forcing utf8 encoding for configuration.properties
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.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=1583448&r1=1583447&r2=1583448&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:32:19 2014
@@ -133,7 +133,7 @@ public class ExecMojo extends BuildTomEE
os.putArchiveEntry(new JarArchiveEntry("configuration.properties"));
final StringWriter writer = new StringWriter();
config.store(writer, "");
- IOUtils.copy(new ByteArrayInputStream(writer.toString().getBytes()), os);
+ IOUtils.copy(new ByteArrayInputStream(writer.toString().getBytes("UTF-8")), os);
os.closeArchiveEntry();
}
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java?rev=1583448&r1=1583447&r2=1583448&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java Mon Mar 31 20:32:19 2014
@@ -25,6 +25,7 @@ import org.apache.tomee.util.QuickServer
import java.io.File;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
@@ -50,7 +51,7 @@ public class ExecRunner {
final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
final InputStream is = contextClassLoader.getResourceAsStream("configuration.properties");
if (is != null) {
- config.load(is);
+ config.load(new InputStreamReader(is, "UTF-8"));
is.close();
} else {
throw new IllegalArgumentException("Config not found");