SCMWebEditor

From kcardineaud@users.nuiton.org Fri Jul 8 12:23:16 2011 From: kcardineaud@users.nuiton.org To: scmwebeditor-commits@list.nuiton.org Subject: [Scmwebeditor-commits] r170 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp Date: Fri, 08 Jul 2011 12:23:16 +0200 Message-ID: <20110708102316.5D95B1591C@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6534838875278411904==" --===============6534838875278411904== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: kcardineaud Date: 2011-07-08 12:23:16 +0200 (Fri, 08 Jul 2011) New Revision: 170 Url: http://nuiton.org/repositories/revision/scmwebeditor/170 Log: Fix a problem with encoding of preview Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Preview.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 20= 11-07-08 07:40:02 UTC (rev 169) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 20= 11-07-08 10:23:16 UTC (rev 170) @@ -59,24 +59,23 @@ if(log.isDebugEnabled()) { log.debug(newText); =20 } - =20 + XMLResponse=3D""; //Using jrst for generate html document try { XMLResponse =3D JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { log.debug("RST generate"); } + =20 } catch (Exception eee) { if(log.isWarnEnabled()) { log.warn("RST generate fail",eee); } - XMLResponse =3D "

Parsing error, please read RST specificatio= n

"; + XMLResponse =3D "

Parsing =C3=A9rror, please read RST specifi= cation

"; return; } =20 - =20 - =20 } =20 static public PreviewAction getAction() { Modified: trunk/src/main/webapp/ModificationViewer.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/ModificationViewer.jsp 2011-07-08 07:40:02 UTC (rev= 169) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-08 10:23:16 UTC (rev= 170) @@ -10,7 +10,7 @@ SCMWebEditor - + =20 =20 @@ -41,7 +41,7 @@ =20 - =20 + =20 =20 Modified: trunk/src/main/webapp/Preview.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/Preview.jsp 2011-07-08 07:40:02 UTC (rev 169) +++ trunk/src/main/webapp/Preview.jsp 2011-07-08 10:23:16 UTC (rev 170) @@ -1,5 +1,5 @@ <%@ taglib prefix=3D"s" uri=3D"/struts-tags"%> -=09 + <%@page contentType=3D"text/html" pageEncoding=3D"UTF-8"%> <%--Title and div for rst preview--%>

Preview :

=20 --===============6534838875278411904==--