Author: glorieux Date: 2009-10-09 16:34:06 +0200 (Fri, 09 Oct 2009) New Revision: 281 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/java/org/nuiton/jrst/PrivateSvnServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp nuiton-rstedit/src/main/webapp/ModificationViewer.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/Saver.js nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js Log: Derniere Version avec enfin le probleme d'encoding de regle Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-09 14:34:06 UTC (rev 281) @@ -189,11 +189,11 @@ SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); FileUtils.writeStringToFile(pathToFile, request.getParameter("Mytext")); -// List<File> list = new java.util.ArrayList<File>(1); -// list.add(0, pathToFile); -// -// list = convertToUnicode(list); + List<File> list = new java.util.ArrayList<File>(1); + list.add(0, pathToFile); + list = convertToUnicode(list); + File[] tabFile = new File[1]; tabFile[0] = pathToFile; // Sending Data to SVN Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-09 14:34:06 UTC (rev 281) @@ -79,7 +79,9 @@ copy.delete(); // Sending html content to pop-up preview page response.setContentType("text/html"); + response.setContentType("text/html;charset=utf-8"); PrintWriter ret = response.getWriter(); + ret.print(FileUtils.readFileToString(http_file)); http_file.delete(); } Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-09 14:34:06 UTC (rev 281) @@ -37,7 +37,7 @@ httpSession.setAttribute("myInfo", svnSess); // Recalling helloservlet with user information stock on session request.setAttribute("Redirect_url", - "http://localhost:8081/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); + "http://localhost:8082/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Recall.jsp"); requestDispacher.forward(request, response); Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-09 14:34:06 UTC (rev 281) @@ -113,7 +113,6 @@ SVNClientManager manager; SvnSession(String svnPath, String fileName, String projectUrl, String login, String password, File tmpDir, String id) throws SVNException { - super(); this.svnPath = svnPath; this.fileName = fileName; this.projectUrl = projectUrl; Modified: nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-09 14:34:06 UTC (rev 281) @@ -12,12 +12,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error...</title> - <meta http-equiv="Refresh" content="3; url=http://localhost:9000/nuiton-rstedit/hello"> + <meta http-equiv="Refresh" content="3; url=http://localhost:8082/nuiton-rstedit/hello"> </head> <body> <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> <p>Bad SCM path or file name! Please correct it.</p> <p>You should be transferred automatically to the form page. If -not please <a href="http://localhost:8080/nuiton-rstedit/hello">click this link</a>.</p> +not please <a href="http://localhost:8082/nuiton-rstedit/hello">click this link</a>.</p> </body> </html> Modified: nuiton-rstedit/src/main/webapp/ModificationViewer.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/ModificationViewer.jsp 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/webapp/ModificationViewer.jsp 2009-10-09 14:34:06 UTC (rev 281) @@ -3,16 +3,15 @@ Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page contentType="text/html; charset=UTF-8"%> -<?xml version='1.0' encoding='utf-8'?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>SCMWebEditor</title> + <title>SCMWebEditor</title> + </head> <body onload="cleanForm(); geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> Modified: nuiton-rstedit/src/main/webapp/Preview.js =================================================================== --- nuiton-rstedit/src/main/webapp/Preview.js 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/webapp/Preview.js 2009-10-09 14:34:06 UTC (rev 281) @@ -51,6 +51,6 @@ function preview(my_text) { - sendRequest("POST", "http://localhost:8081/nuiton-rstedit/previewservlet", my_text); + sendRequest("POST", "http://localhost:8082/nuiton-rstedit/previewservlet", my_text); } Modified: nuiton-rstedit/src/main/webapp/Saver.js =================================================================== --- nuiton-rstedit/src/main/webapp/Saver.js 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/webapp/Saver.js 2009-10-09 14:34:06 UTC (rev 281) @@ -37,7 +37,7 @@ function handleResp() { if(http.readyState == 4 && http.status != 401){ - alert("Save Ok."); + alert("Save Ok. Page will be reload shortly please wait."); window.location.reload(true); } else if (http.readyState == 4 && http.status == 401){ alert("Bad login or password please recheck."); @@ -48,7 +48,7 @@ { if (my_text.value != orig_text.value){ if (confirm("Do you really want to save?")){ - sendReq("POST", "http://localhost:8081/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); + sendReq("POST", "http://localhost:8082/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); } } else{ alert("File don't need to be save."); Modified: nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-09 12:43:09 UTC (rev 280) +++ nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-09 14:34:06 UTC (rev 281) @@ -38,7 +38,7 @@ function cancelRedirectDelete(orig_text, login, pass, message) { if (confirm("Exit SCMWebEditor ?")){ - sendRe("POST", "http://localhost:8081/nuiton-rstedit/hello", orig_text, login, pass, message); + sendRe("POST", "http://localhost:8082/nuiton-rstedit/hello", orig_text, login, pass, message); window.history.go(-1); } } \ No newline at end of file