r3717 - in trunk: . src/main/java/fr/ifremer/isisfish/util
Author: echatellier Date: 2012-08-10 11:24:11 +0200 (Fri, 10 Aug 2012) New Revision: 3717 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3717 Log: fixes : #1395 Script are compiled using default encoding Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer</groupId> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -239,6 +239,8 @@ args.add("-g"); // Show a description of each use or override of a deprecated member or class. args.add("-deprecation"); + args.add("-encoding"); + args.add("utf-8"); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -94,9 +95,9 @@ Method interfaceMethod = methods[0]; String content = generateContent(packageName, className, interfaceMethod, script); - - FileUtil.writeString(src, content); + FileUtils.writeStringToFile(src, content, "utf-8"); + int compileResult = CompileHelper.compile(src.getParentFile(), src, src.getParentFile(), out); File dest = new File(src.getParentFile(), className + ".class"); dest.deleteOnExit();
participants (1)
-
echatellier@users.forge.codelutin.com