Author: glorieux Date: 2009-10-12 17:20:59 +0200 (Mon, 12 Oct 2009) New Revision: 284 Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java nuiton-rstedit/src/main/webapp/ModificationViewer.jsp Log: Version qui modifie le nom du file_name de .html en .rst si besoin est. Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-11 13:07:44 UTC (rev 283) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-12 15:20:59 UTC (rev 284) @@ -95,13 +95,13 @@ if (svnSess == null || (svnSess.getLogin() == null && svnSess.getPassword() == null)){ svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), - request.getParameter("file_name"), request.getParameter("project_url"), + (request.getParameter("file_name").endsWith(".html") == true ? request.getParameter("file_name").replace(".html", ".rst") : request.getParameter("file_name")), request.getParameter("project_url"), null, null, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); } else if (svnSess.getLogin() != null && svnSess.getPassword() != null){ String tmp_log = svnSess.getLogin(); String tmp_pass = svnSess.getPassword(); svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), - request.getParameter("file_name"), request.getParameter("project_url"), + (request.getParameter("file_name").endsWith(".html") == true ? request.getParameter("file_name").replace(".html", ".rst") : request.getParameter("file_name")), request.getParameter("project_url"), tmp_log, tmp_pass, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); } Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-11 13:07:44 UTC (rev 283) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-12 15:20:59 UTC (rev 284) @@ -79,7 +79,7 @@ copy.delete(); // Sending html content to pop-up preview page response.setContentType("text/html"); - response.setContentType("text/html;charset=utf-8"); + response.setContentType("text/html;charset=UTF-8"); PrintWriter ret = response.getWriter(); ret.print(FileUtils.readFileToString(http_file)); Modified: nuiton-rstedit/src/main/webapp/ModificationViewer.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/ModificationViewer.jsp 2009-10-11 13:07:44 UTC (rev 283) +++ nuiton-rstedit/src/main/webapp/ModificationViewer.jsp 2009-10-12 15:20:59 UTC (rev 284) @@ -11,7 +11,7 @@ <head> <title>SCMWebEditor</title> - + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body onload="cleanForm(); geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" />