Author: crossley
Date: Mon Jan 23 00:28:55 2012
New Revision: 1234657
URL: http://svn.apache.org/viewvc?rev=1234657&view=rev
Log:
Use JAVA_TOOL_OPTIONS to ensure UTF-8 everywhere.
Contributed by: Karl Wright
Issue: FOR-1231
Modified:
forrest/trunk/bin/forrest
forrest/trunk/bin/forrest.bat
forrest/trunk/main/webapp/WEB-INF/jtidy.properties
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/bin/forrest
URL:
http://svn.apache.org/viewvc/forrest/trunk/bin/forrest?rev=1234657&r1=1234656&r2=1234657&view=diff
==============================================================================
--- forrest/trunk/bin/forrest (original)
+++ forrest/trunk/bin/forrest Mon Jan 23 00:28:55 2012
@@ -60,6 +60,11 @@ if [ -z "$FORREST_HOME" ] ; then
FORREST_HOME=`cd "$FORREST_HOME" && pwd`
fi
+# Save old JAVA_TOOL_OPTIONS
+OLD_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS"
+unset OLD_TOOL_OPTIONS
+JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+
# Save old ANT_HOME
OLD_ANT_HOME="$ANT_HOME"
unset ANT_HOME
@@ -112,4 +117,8 @@ export CLASSPATH
ANT_HOME="$OLD_ANT_HOME"
export ANT_HOME
+# ---- Restore JAVA_TOOL_OPTIONS
+JAVA_TOOL_OPTIONS="$OLD_TOOL_OPTIONS"
+export JAVA_TOOL_OPTIONS
+
exit $RESULT
Modified: forrest/trunk/bin/forrest.bat
URL:
http://svn.apache.org/viewvc/forrest/trunk/bin/forrest.bat?rev=1234657&r1=1234656&r2=1234657&view=diff
==============================================================================
--- forrest/trunk/bin/forrest.bat (original)
+++ forrest/trunk/bin/forrest.bat Mon Jan 23 00:28:55 2012
@@ -32,6 +32,10 @@ set PROJECT_HOME=%PWD%
rem ----- set the ant file to use --------------------------------------
set ANTFILE=%FORREST_HOME%\main\forrest.build.xml
+rem ----- Save old JAVA_TOOL_OPTIONS -----------------------------
+set OLD_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%
+set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
rem ----- Save old ANT_HOME --------------------------------------------
set OLD_ANT_HOME=%ANT_HOME%
set ANT_HOME=%FORREST_HOME%\tools\ant
@@ -53,3 +57,4 @@ call "%ANT_HOME%\bin\forrestant" -buildf
rem ---- Restore old ANT_HOME
set ANT_HOME=%OLD_ANT_HOME%
set CLASSPATH=%OLD_CLASSPATH%
+set JAVA_TOOL_OPTIONS=%OLD_TOOL_OPTIONS%
Modified: forrest/trunk/main/webapp/WEB-INF/jtidy.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/jtidy.properties?rev=1234657&r1=1234656&r2=1234657&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/jtidy.properties (original)
+++ forrest/trunk/main/webapp/WEB-INF/jtidy.properties Mon Jan 23 00:28:55 2012
@@ -27,7 +27,7 @@ quote-ampersand=yes
break-before-br=yes
uppercase-tags=no
uppercase-attributes=no
-char-encoding=latin1
+char-encoding=utf-8
# Suppress Tidy-Header in files generated from HTML-Sources
tidy-mark=no
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1234657&r1=1234656&r2=1234657&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Mon Jan 23 00:28:55 2012
@@ -154,6 +154,9 @@
<link href="site:upgrading_010">upgrading to v0.10-dev</link>
</action>
<!-- 2012-01 -->
+ <action context="code" type="update" dev="DC" importance="high"
due-to="Karl Wright" fixes-bug="FOR-1231">
+ Use JAVA_TOOL_OPTIONS to ensure UTF-8 everywhere.
+ </action>
<action dev="DC" type="update" context="docs">
Remove the link to the demonstration of processing JIRA issues via RSS.
As a demo, it was causing too many "errors" when network not available.
