December 2009 - Scmwebeditor-commits - mailman.cloud.codelutin.com

r68 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp
by glorieux＠users.nuiton.org 24 Dec '09

24 Dec '09

Author: glorieux Date: 2009-12-24 11:17:02 +0100 (Thu, 24 Dec 2009) New Revision: 68 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Preview.js Log: Preview is now directly on the edition page. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2009-12-22 15:43:27 UTC (rev 67) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2009-12-24 10:17:02 UTC (rev 68) @@ -79,8 +79,8 @@ } copy.delete(); // Sending html content to pop-up preview page + response.setCharacterEncoding("UTF-8"); response.setContentType("text/html"); - response.setContentType("text/html;charset=UTF-8"); PrintWriter ret = response.getWriter(); ret.print(FileUtils.readFileToString(http_file)); Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2009-12-22 15:43:27 UTC (rev 67) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-12-24 10:17:02 UTC (rev 68) @@ -1,5 +1,5 @@ -<%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> -<%@page contentType="text/html charset=UTF-8"%> + <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -11,7 +11,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> - <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> + <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> <center><h2>Welcome on SCMWebEditor</h2> <%if (request.getAttribute("format").equals("rst") == true){ %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4></center><%}%> @@ -46,6 +46,9 @@ <input type="hidden" value="<%=request.getAttribute("Project_url")%>" name="Project_url"> <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/> </form></center> + <%--Title and div for rst preview--%> + <h4 id="prevtitle" ></h4> + <div id="prev" title="Preview"></div> <p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/Preview.js =================================================================== --- trunk/src/main/webapp/Preview.js 2009-12-22 15:43:27 UTC (rev 67) +++ trunk/src/main/webapp/Preview.js 2009-12-24 10:17:02 UTC (rev 68) @@ -40,8 +40,8 @@ if(http.readyState == 4 && http.status != 406) { var response = http.responseText; - var wind = window.open("", "Preview", "scrollbars=yes,resizable=yes,status=yes"); - wind.document.body.innerHTML = response; + document.getElementById("prevtitle").innerHTML = "Preview : "; + document.getElementById("prev").innerHTML = response; } else if (http.readyState == 4 && http.status == 406) {

1 0

r67 - trunk/src/main/webapp
by glorieux＠users.nuiton.org 22 Dec '09

22 Dec '09

Author: glorieux Date: 2009-12-22 16:43:27 +0100 (Tue, 22 Dec 2009) New Revision: 67 Modified: trunk/src/main/webapp/BadFileRedirect.jsp trunk/src/main/webapp/BadUseRedirect.jsp trunk/src/main/webapp/Error.jsp trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/PrivateSvnRedirect.jsp trunk/src/main/webapp/Redirect.jsp Log: Cleaning interface. Modified: trunk/src/main/webapp/BadFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadFileRedirect.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/BadFileRedirect.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -14,7 +14,7 @@ <%=request.getAttribute("scmEditorUrl")%>"> </head> <body> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <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="<%=request.getAttribute("scmEditorUrl")%>">click Modified: trunk/src/main/webapp/BadUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadUseRedirect.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/BadUseRedirect.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -14,7 +14,7 @@ <%=request.getAttribute("scmEditorUrl")%>"> </head> <body> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p>Bad Use of ScmWebEditor! Please try again.</p> <p>You should be transferred automatically to the previous page. If not please <a href="<%=request.getAttribute("scmEditorUrl")%>">click Modified: trunk/src/main/webapp/Error.jsp =================================================================== --- trunk/src/main/webapp/Error.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/Error.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -15,7 +15,7 @@ <%--%=request.getAttribute("scmEditorUrl")%>?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>&lang=<%=request.getAttribute("Lang")%>&format=<%=request.getAttribute("Format")%>"--%> </head> <body> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p>Bad Login or Password. Please Wait.</p> <p>©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -1,36 +1,35 @@ -<%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 -Author : glorieux --%> <%@page contentType="text/html charset=UTF-8"%> +<%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> +<%@page contentType="text/html charset=UTF-8"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - -<title>SCMWebEditor</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>SCMWebEditor</title> + <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="stylesheet" type="text/css" href="css/main.css"> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> - <img src="img/ScmWebEditor_main.png" alt="$alt" /> - <center><h2><p>Welcome on SCMWebEditor</p></h2> + <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> + <center><h2>Welcome on SCMWebEditor</h2> <%if (request.getAttribute("format").equals("rst") == true){ - %><h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center><%}%> + %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4></center><%}%> <center><form method="post" action=<%=request.getAttribute("scmEditorUri")%>> - <script src="GereFormSize.js"></script> + <script src="GereFormSize.js" type="text/javascript"></script> <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> - <script src="Preview.js"></script> - <script src="Saver.js"></script> - <script src="GereSession.js"></script> - <script src="cancelRedirectDelete.js"></script> - <script src="pictureUpload.js"></script> - <noscript><h4><p>Javascript is not activated. You can't only use Save and Quit or Reset button.</p></h4></noscript> - <noscript><h4><p> For a better use of SCMWebEditor please activate JavaScript.</p></h4></noscript> - <p>Commit Message: <input type="text" name="Commit_message"/></p> + <script src="Preview.js" type="text/javascript"></script> + <script src="Saver.js" type="text/javascript"></script> + <script src="GereSession.js" type="text/javascript"></script> + <script src="cancelRedirectDelete.js" type="text/javascript"></script> + <script src="pictureUpload.js" type="text/javascript"></script> + <noscript><h4>Javascript is not activated. You can't only use Save and Quit or Reset button.</h4></noscript> + <noscript><h4>For a better use of SCMWebEditor please activate JavaScript.</h4></noscript> + <p>Commit Message: <input type="text" name="Commit_message" title="Let a commit message with this file."/></p> <%if (request.getAttribute("IsLogin").equals(false) == true){ - %><p><label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12 /></label> - <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12 /></label> </p><% + %><p><label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12 title="Commit Username."/></label> + <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12 title="Commit Password."/></label> </p><% } else { %><p>You are log as: <%=request.getAttribute("Login")%></p> <input type="hidden" NAME=username /> @@ -39,13 +38,13 @@ <input type="hidden" name="Orig_text" value=<%=request.getAttribute("OrigText")%>/> <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"/> - <input type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.Mytext, this.form.username, this.form.pw, this.form.Commit_message, this.form.Orig_text, this.form.scmEditorUrl);"/> - <input type="submit" value="Save and Quit" name="Save"/> + <input title="Save your work and continue editing this file." type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.Mytext, this.form.username, this.form.pw, this.form.Commit_message, this.form.Orig_text, this.form.scmEditorUrl);"/> + <input title="Save this file and go back to previous page." type="submit" value="Save and Quit" name="Save"/> <%if (request.getAttribute("format").equals("rst") == true){ - %><input type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext, this.form.previewServletUrl);"/><%}%> - <input type="reset" value="Reset" name="Reset" /> + %><input title="html preview of the curretn rst file state." type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext, this.form.previewServletUrl);"/><%}%> + <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" alt="Test plop plop plop"/> <input type="hidden" value="<%=request.getAttribute("Project_url")%>" name="Project_url"> - <input type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/> + <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/> </form></center> <p align="right">©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/OutConnection.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -1,5 +1,5 @@ -<%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author -: glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author: glorieux --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -11,16 +11,13 @@ <title>SCM Web Editor</title> </head> <body> - <img align="top"></img> -<script src="fileSearch.js"></script> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<script src="fileSearch.js" type="text/javascript"></script> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <center> -<h2> -<p>Welcome on SCMWebEditor</p> -</h2> -<noscript><h4><p>Javascript is not activated. Please activate it for a fully use of ScmWebEditor.</p></h4></noscript> +<h2>Welcome on SCMWebEditor</h2> +<noscript><h4>Javascript is not activated. Please activate it for a fully use of ScmWebEditor.</h4></noscript> <h4> -<p>Please complete this form for application using.</p> +Please complete this form for application using. </h4> </center> <center> Modified: trunk/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/PrivateSvnRedirect.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/PrivateSvnRedirect.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -12,7 +12,7 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <form method="post" action=<%=request.getAttribute("privateServletUri")%>> <script src="cancelRedirect.js"></script> <p>You try to access a Private SCM. Please login</p> Modified: trunk/src/main/webapp/Redirect.jsp =================================================================== --- trunk/src/main/webapp/Redirect.jsp 2009-12-22 15:12:01 UTC (rev 66) +++ trunk/src/main/webapp/Redirect.jsp 2009-12-22 15:43:27 UTC (rev 67) @@ -13,7 +13,7 @@ <%=request.getAttribute("Redirection_url")%>"> </head> <body> -<img src="img/ScmWebEditor_main.png" alt="$alt" /> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p>Thank you using RSTEditor</p> <p>You should be transferred automatically to the new page. If not please <a href="<%=request.getAttribute("Redirection_url")%>">click

1 0

r66 - trunk/src/site
by glorieux＠users.nuiton.org 22 Dec '09

22 Dec '09

Author: glorieux Date: 2009-12-22 16:12:01 +0100 (Tue, 22 Dec 2009) New Revision: 66 Modified: trunk/src/site/site_fr.xml Log: Test of xml edition Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-12-18 13:37:44 UTC (rev 65) +++ trunk/src/site/site_fr.xml 2009-12-22 15:12:01 UTC (rev 66) @@ -1,59 +1,59 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/scmwebeditor/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/scmwebeditor/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/scmwebeditor/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> - - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="${project.url}/index.html" /> - <item name="en]" href="/en/index.html" /> - </links> - - - <menu name ="Documentation"> - <item name="Utilisateur" href="user.html"> - <item name="Installation" href="install.html"/> - <item name="Tutorial" href="tutoriel.html"/> - </item> - - </menu> - - - <menu name ="Téléchargement"> - <item name="Téléchargement" href="http://www.nuiton.org/projects/list_files/scmwebeditor"/> - </menu> - - <menu name="Demo"> - <item name="Demo" href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor" /> - </menu> - </body> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${skin.version}</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/scmwebeditor/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/scmwebeditor/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/scmwebeditor/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> + <item name="[fr" href="${project.url}/index.html" /> + <item name="en]" href="/en/index.html" /> + </links> + + + <menu name ="Documentation"> + <item name="Utilisateur" href="user.html"> + <item name="Installation" href="install.html"/> + <item name="Tutorial" href="tutoriel.html"/> + </item> + + </menu> + + + <menu name ="Téléchargement"> + <item name="Téléchargement" href="http://www.nuiton.org/projects/list_files/scmwebeditor"/> + </menu> + + <menu name="Demo"> + <item name="Demo" href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor"/> + </menu> + </body> + +</project>

1 0

r65 - trunk
by tchemit＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:37:44 +0100 (Fri, 18 Dec 2009) New Revision: 65 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 10:40:49 UTC (rev 64) +++ trunk/pom.xml 2009-12-18 13:37:44 UTC (rev 65) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.3</version> </parent> <groupId>org.nuiton</groupId>

1 0

r64 - trunk
by glorieux＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: glorieux Date: 2009-12-18 11:40:49 +0100 (Fri, 18 Dec 2009) New Revision: 64 Added: trunk/changelog.txt Log:

1 0

r63 - trunk
by glorieux＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: glorieux Date: 2009-12-18 11:38:49 +0100 (Fri, 18 Dec 2009) New Revision: 63 Modified: trunk/pom.xml Log: maven-nuiton-skin version update. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 10:37:40 UTC (rev 62) +++ trunk/pom.xml 2009-12-18 10:38:49 UTC (rev 63) @@ -163,12 +163,12 @@  <maven.site.locales>fr,en</maven.site.locales> - <defaultLocale>fr</defaultLocale> + <defaultLocale>fr</defaultLocale>  <sourcesType>rst</sourcesType> - <skin.version>1.0.1-SNAPSHOT</skin.version> + <skin.version>1.0.2-SNAPSHOT</skin.version> </properties> <build>

1 0

r62 - trunk
by glorieux＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: glorieux Date: 2009-12-18 11:37:40 +0100 (Fri, 18 Dec 2009) New Revision: 62 Removed: trunk/changelog.txt Log:

1 0

r61 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp
by glorieux＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: glorieux Date: 2009-12-18 11:32:59 +0100 (Fri, 18 Dec 2009) New Revision: 61 Added: trunk/src/main/webapp/pictureUpload.js Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java trunk/src/main/webapp/GereSession.js trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Saver.js trunk/src/main/webapp/cancelRedirectDelete.js trunk/src/main/webapp/fileSearch.js Log: Add menu(xml) editon support from maven site. Change ScmWebEditor look. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-12-18 10:32:59 UTC (rev 61) @@ -37,6 +37,8 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.lang.StringEscapeUtils; +import org.jdom.output.EscapeStrategy; /** * @author geoffroy lorieux @@ -110,12 +112,12 @@ String paramLang = request.getParameter(PARAMETER_LANG); String paramDefaultLang = request.getParameter(PARAMETER_DEFAULT_LANG); - String paramFormat = request.getParameter(PARAMETER_FORMAT); + String paramFormat = request.getParameter(PARAMETER_FORMAT) != null ? request.getParameter(PARAMETER_FORMAT) : ""; - String relativePath = "/src/site/" + paramLang + "/" + paramFormat + "/"; + String relativePath = "/src/site/" + paramLang + "/" +( paramFormat.equals("") ? "" : paramFormat+"/"); if (paramLang.equals(paramDefaultLang)) { // on a maven site, default locale is on root - relativePath = "/src/site/" + paramFormat + "/"; + relativePath = "/src/site/" +( paramFormat.equals("") ? "" : paramFormat+"/"); paramProjectUrl = paramProjectUrl.replace("/"+paramDefaultLang+"/", "/"); } @@ -172,7 +174,8 @@ File file_in_dir = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); try { String original_text = FileUtils.readFileToString(file_in_dir); - request.setAttribute(ATTRIBUTE_ORIG_TEXT, original_text); + request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(original_text)); request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null)); request.setAttribute(ATTRIBUTE_IS_LOGIN, (svnSess.getLogin() != null && svnSess.getPassword() != null && !svnSess.getLogin().equalsIgnoreCase("") && !svnSess.getPassword().equalsIgnoreCase(""))); @@ -231,6 +234,9 @@ svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : request.getParameter(PARAMETER_USERNAME), svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : request.getParameter(PARAMETER_PW)); + String originalText = StringEscapeUtils.unescapeHtml(request.getParameter(PARAMETER_ORIG_TEXT)); + String myText = StringEscapeUtils.unescapeHtml(request.getParameter(PARAMETER_MYTEXT)); + File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); @@ -241,8 +247,8 @@ File[] tabFile = new File[1]; tabFile[0] = pathToFile; // Sending Data to SVN - - if (!request.getParameter(PARAMETER_MYTEXT).equals(request.getParameter(PARAMETER_ORIG_TEXT))) { + + if (!myText.equals(originalText)) { try { log.debug("Je commit"); //TODO-TC20091124 Should add a prefix to the commit file ? something like from scmwebeditor -- Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2009-12-18 10:32:59 UTC (rev 61) @@ -17,6 +17,9 @@ package org.nuiton.scmwebeditor; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; @@ -24,15 +27,24 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.ISVNCanceller; import org.tmatesoft.svn.core.ISVNDirEntryHandler; import org.tmatesoft.svn.core.SVNDirEntry; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; +import org.tmatesoft.svn.core.internal.io.svn.ISVNConnector; +import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryImpl; import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; +import org.tmatesoft.svn.core.io.ISVNTunnelProvider; +import org.tmatesoft.svn.core.io.SVNRepository; +import org.tmatesoft.svn.core.wc.DefaultSVNRepositoryPool; +import org.tmatesoft.svn.core.wc.ISVNRepositoryPool; +import org.tmatesoft.svn.core.wc.SVNClientManager; import org.tmatesoft.svn.core.wc.SVNLogClient; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNWCUtil; +import org.tmatesoft.svn.util.ISVNDebugLog; public class SearchServlet extends AbstractScmWebEditorServlet { @@ -47,7 +59,7 @@ * @throws ServletException if a servlet-specific error occurs */ @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException{ + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException { try { String adresse = request.getParameter(PARAMETER_ADRESSE); if (log.isDebugEnabled()) { @@ -56,21 +68,28 @@ //Create default access DefaultSVNOptions svnOption = SVNWCUtil.createDefaultOptions(false); ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(); + log.debug("Authentication manager and svnOption created"); //Convert url to SVNUrl - SVNURL svnUrl; - svnUrl = SVNURL.parseURIEncoded(adresse); + SVNURL svnUrl = SVNURL.parseURIEncoded(adresse); + log.debug("Svn url created"); + // create a SVNRepositoryPool + SVNClientManager plop = SVNClientManager.newInstance(svnOption, authManager); + ISVNRepositoryPool pool = plop.getRepositoryPool(); //get a SVNLogClient - SVNLogClient logClient = new SVNLogClient(authManager, svnOption); + SVNLogClient logClient = new SVNLogClient(pool, svnOption); + log.debug("LogClient Created"); //recup info about svn repository ISVNDirEntryHandler dirEntryHandler = new ISVNDirEntryHandler() { - @Override - public void handleDirEntry(SVNDirEntry arg0) throws SVNException { - log.debug("le fichier est: " + arg0.getName()); + public void handleDirEntry(SVNDirEntry dirEntry) throws SVNException { + log.debug("Handle dirEntries"); + log.debug("le fichier est: " + dirEntry.getName()); throw new UnsupportedOperationException("Not supported yet."); } }; + log.debug("Begin handle listEntries"); logClient.doList(svnUrl, SVNRevision.WORKING, SVNRevision.HEAD, true, true, dirEntryHandler); + log.debug("List handle"); } catch (SVNException ex) { response.setStatus(401); Logger.getLogger(SearchServlet.class.getName()).log(Level.SEVERE, null, ex); Modified: trunk/src/main/webapp/GereSession.js =================================================================== --- trunk/src/main/webapp/GereSession.js 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/webapp/GereSession.js 2009-12-18 10:32:59 UTC (rev 61) @@ -9,7 +9,7 @@ { msg+='s'; } - msg+='.\nDo you want to reload this page ?'; + msg+='.\nDo you want to reload this page ?(You will not lose your data)'; if(confirm(msg)) { Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-12-18 10:32:59 UTC (rev 61) @@ -14,8 +14,8 @@ <body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> <img src="img/ScmWebEditor_main.png" alt="$alt" /> <center><h2><p>Welcome on SCMWebEditor</p></h2> - <h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center> - + <%if (request.getAttribute("format").equals("rst") == true){ + %><h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center><%}%> <center><form method="post" action=<%=request.getAttribute("scmEditorUri")%>> <script src="GereFormSize.js"></script> <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> @@ -29,30 +29,24 @@ <p>Commit Message: <input type="text" name="Commit_message"/></p> <%if (request.getAttribute("IsLogin").equals(false) == true){ - %><p><label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12></label> - <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12></label> </p><% + %><p><label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12 /></label> + <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12 /></label> </p><% } else { %><p>You are log as: <%=request.getAttribute("Login")%></p> - <input type="hidden" NAME=username> - <input type="hidden" NAME=pw><% + <input type="hidden" NAME=username /> + <input type="hidden" NAME=pw /><% }%> - <input type="hidden" name="Orig_text" value="<%=request.getAttribute("OrigText")%>"/> - <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"> - <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"> + <input type="hidden" name="Orig_text" value=<%=request.getAttribute("OrigText")%>/> + <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> + <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"/> <input type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.Mytext, this.form.username, this.form.pw, this.form.Commit_message, this.form.Orig_text, this.form.scmEditorUrl);"/> <input type="submit" value="Save and Quit" name="Save"/> - <input type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext, this.form.previewServletUrl);"/> + <%if (request.getAttribute("format").equals("rst") == true){ + %><input type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext, this.form.previewServletUrl);"/><%}%> <input type="reset" value="Reset" name="Reset" /> <input type="hidden" value="<%=request.getAttribute("Project_url")%>" name="Project_url"> <input type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/> - </form></center> - <center><form action="/nuiton-rstedit/pictureUpload" enctype="multipart/form-data" method="post" id="form1" onsubmit="this.target = 'UploadTarget1'"> - - <iframe id="UploadTarget1" name="UploadTarget1" src="" style="width:0px;height:0px;border:0"></iframe> - - <p>Upload a picture: <input id="newPic" type="file" name="newPic" size="30"> - <input type="submit" value="Upload" name="upPic"/></p> - </form></center> + </form></center> <p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/Saver.js =================================================================== --- trunk/src/main/webapp/Saver.js 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/webapp/Saver.js 2009-12-18 10:32:59 UTC (rev 61) @@ -48,7 +48,12 @@ { if (my_text.value != orig_text.value){ if (confirm("Do you really want to save?")){ - sendReq("POST", scmEditorUrl, my_text, login, pass, message, orig_text); + if (message.value == ""){ + alert("You must enter a Commit message!!!", ""); + } + else { + sendReq("POST", scmEditorUrl, my_text, login, pass, message, orig_text); + } } } else{ alert("File don't need to be save."); Modified: trunk/src/main/webapp/cancelRedirectDelete.js =================================================================== --- trunk/src/main/webapp/cancelRedirectDelete.js 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/webapp/cancelRedirectDelete.js 2009-12-18 10:32:59 UTC (rev 61) @@ -1,9 +1,9 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. +/** + * @author geoffroy lorieux */ + function createRequestObjec() { var req; Modified: trunk/src/main/webapp/fileSearch.js =================================================================== --- trunk/src/main/webapp/fileSearch.js 2009-12-18 10:25:03 UTC (rev 60) +++ trunk/src/main/webapp/fileSearch.js 2009-12-18 10:32:59 UTC (rev 61) @@ -44,4 +44,4 @@ alert(scmPath.value); alert(scmEditorUrl.value); sendRequestToFileSearchServlet(scmPath, scmEditorUrl); -} \ No newline at end of file +}

1 0

r60 - trunk/src/site
by glorieux＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: glorieux Date: 2009-12-18 11:25:03 +0100 (Fri, 18 Dec 2009) New Revision: 60 Modified: trunk/src/site/site_en.xml Log: Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-12-15 09:53:57 UTC (rev 59) +++ trunk/src/site/site_en.xml 2009-12-18 10:25:03 UTC (rev 60) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> -  <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> <version>${skin.version}</version> - </skin--> + </skin> <bannerLeft> <name>${project.name}</name>

1 0

r59 - trunk/src/main/webapp
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:53:57 +0100 (Tue, 15 Dec 2009) New Revision: 59 Added: trunk/src/main/webapp/fileSearch.js Log: Add File Search JavaScript Added: trunk/src/main/webapp/fileSearch.js =================================================================== --- trunk/src/main/webapp/fileSearch.js (rev 0) +++ trunk/src/main/webapp/fileSearch.js 2009-12-15 09:53:57 UTC (rev 59) @@ -0,0 +1,47 @@ +function createRequestObject() +{ + var req; + if(window.XMLHttpRequest) + { + //For Firefox, Safari, Opera + req = new XMLHttpRequest(); + } + else if(window.ActiveXObject) + { + //For IE 5+ + req = new ActiveXObject("Microsoft.XMLHTTP"); + } + else + { + //Error for an old browser + alert('Your browser is not IE 5 or higher, or Firefox or Safari or Opera'); + } + return req; +} + +//Make the XMLHttpRequest Object +var http= createRequestObject(); + +function sendRequestToFileSearchServlet(scmPath, scmEditorUrl) +{ + http.open("POST", scmEditorUrl.value, true); + http.onreadystatechange = handleResponseFromFileSearchServlet; + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("adresse="+scmPath.value); +} + +function handleResponseFromFileSearchServlet() +{ + if(http.readyState == 4 && http.status != 401){ + alert("Can find file Continue"); + } else if (http.readyState == 4 && http.status == 401){ + alert("Cannot find files please recheck Scm path."); + } +} + +function fileSearch(scmPath, scmEditorUrl) +{ + alert(scmPath.value); + alert(scmEditorUrl.value); + sendRequestToFileSearchServlet(scmPath, scmEditorUrl); +} \ No newline at end of file

1 0