Author: mfortun Date: 2011-08-26 17:56:00 +0200 (Fri, 26 Aug 2011) New Revision: 1190 Url: http://nuiton.org/repositories/revision/wikitty/1190 Log: *correct encoding issue, due to FileUtils and static encoding param Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-26 15:11:47 UTC (rev 1189) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-26 15:56:00 UTC (rev 1190) @@ -102,9 +102,7 @@ List<URL> urlsRessourceFilters = Resource.getResources( filtersOptionDirName + FILTERS_FILE_NAME_REGEX, Thread .currentThread().getContextClassLoader()); - // /"+filtersOptionDirName+"/filters-\\w*\\.properties" - System.out.println(urlsRessourceFilters); for (URL propFil : urlsRessourceFilters) { Properties props = new Properties(); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-26 15:11:47 UTC (rev 1189) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-26 15:56:00 UTC (rev 1190) @@ -62,9 +62,17 @@ static public String PATH_SEPARATOR_PROPERTIE_KEY = "path.separator"; /* - * Class don't have to be instantiate + * needed to ensure that fileUtils used inside execution is set with the + * correct encoding */ + static { + FileUtil.ENCODING = "UTF-8"; + } + + /* Class don't have to be instantiate + */ private WikittyPublicationExternalize() { + } static public void main(String[] args) throws ArgumentsParserException, Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-26 15:11:47 UTC (rev 1189) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-26 15:56:00 UTC (rev 1190) @@ -137,6 +137,12 @@ applicationConfig = new ApplicationConfig(); /* + * needed to ensure that fileUtils used inside execution is set with the + * correct encoding + */ + FileUtil.ENCODING = "UTF-8"; + + /* * TODO mfortun-2011-04-14 construct option def instance to initialize * correctly application config */ Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-26 15:11:47 UTC (rev 1189) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-26 15:56:00 UTC (rev 1190) @@ -10,6 +10,7 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.I18nInitializer; +import org.nuiton.util.FileUtil; public class ApplicationListener implements ServletContextListener { @@ -18,6 +19,11 @@ @Override public void contextInitialized(ServletContextEvent sce) { + /* + * needed to ensure that fileUtils used inside execution is set with the + * correct encoding + */ + FileUtil.ENCODING = "UTF-8"; if (log.isInfoEnabled()) { log.info("Initializing I18n...");