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

r149 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org 30 Jun '11

30 Jun '11

Author: kcardineaud Date: 2011-06-30 12:05:45 +0200 (Thu, 30 Jun 2011) New Revision: 149 Url: http://nuiton.org/repositories/revision/scmwebeditor/149 Log: Fix a auth problem with svn repository with read/write protection Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-30 08:45:44 UTC (rev 148) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-30 10:05:45 UTC (rev 149) @@ -56,8 +56,8 @@ log.debug("Enter in preview action"); } - if(log.isInfoEnabled()) { - log.info(newText); + if(log.isDebugEnabled()) { + log.debug(newText); } //Using jrst for generate html document Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-30 08:45:44 UTC (rev 148) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-30 10:05:45 UTC (rev 149) @@ -119,6 +119,7 @@ address = address.substring(0, address.length()-1); } + SVNRepository repository = null; try { @@ -148,6 +149,7 @@ Collections.sort(files); } catch (SVNAuthenticationException authexep) { + log.error("Can't access to the repository : Auth Problem"); return "authError"; } catch ( SVNException svne ) { Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-30 08:45:44 UTC (rev 148) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-30 10:05:45 UTC (rev 149) @@ -168,7 +168,7 @@ <script type="text/javascript"> var textarea = document.getElementById('newTextId'); - var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'popup' } + var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } var codeMirrorOptions = { mode: "<%=typeEditor%>" } var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); </script> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-30 08:45:44 UTC (rev 148) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-30 10:05:45 UTC (rev 149) @@ -23,8 +23,9 @@ Please complete this form for application using. </h4> </center> + +<form id="configForm" method="get" action="checkout.action"> <center> -<form id="configForm" method="get" action="checkout.action"> <p><label>SCM path: <input TYPE=text name="address" SIZE=100></label> <s:url id="ajaxSearch" value="search.action" /> @@ -43,11 +44,11 @@ <input type="submit" name="Save" /> </p> +</center> +<div id="htmlcontentSearch" ></div> +</form> -</form> -</center> -<div id="htmlcontentSearch" ></div> <p align="right">©2004-2009 CodeLutin</p> </body> </html>

1 0

r148 - in trunk/src/main/webapp: . codemirror-ui/lib css
by kcardineaud＠users.nuiton.org 30 Jun '11

30 Jun '11

Author: kcardineaud Date: 2011-06-30 10:45:44 +0200 (Thu, 30 Jun 2011) New Revision: 148 Url: http://nuiton.org/repositories/revision/scmwebeditor/148 Log: Modify some style properties Removed: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/ Modified: trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 16:06:17 UTC (rev 147) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-30 08:45:44 UTC (rev 148) @@ -10,9 +10,7 @@ <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"> +   @@ -37,6 +35,12 @@ <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> <link rel="stylesheet" href="codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen" /> + + + <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="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> @@ -69,7 +73,7 @@ %> <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> - <textarea id="newTextId" rows="20" cols="80" name="newText"><%=valueTextarea%></textarea> + <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> <label>Language : <select id="language" name="langageSelection" onchange="changeModeBy(this)"> @@ -190,7 +194,7 @@ <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> - <div id="formulaire"> + <div id="form"> <div id="htmlcontentCommit"></div> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-29 16:06:17 UTC (rev 147) +++ trunk/src/main/webapp/css/main.css 2011-06-30 08:45:44 UTC (rev 148) @@ -7,15 +7,18 @@ } - -#formulaire { - width:70%; +#form { + width:70%; margin:auto; display:block; padding:1%; text-align:center; } +.CodeMirror-scroll { + height:500px; +} + #prevtitle { margin-left:13%; } @@ -29,7 +32,7 @@ } #search { - margin:auto; + margin:auto; display:block; - border : solid 2px black; + border : solid 2px black; }

1 0

r147 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 18:06:17 +0200 (Wed, 29 Jun 2011) New Revision: 147 Url: http://nuiton.org/repositories/revision/scmwebeditor/147 Log: Remove some useless files Removed: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java trunk/src/main/webapp/GereFormSize.js trunk/src/main/webapp/fileSearch.js Modified: trunk/src/main/webapp/OutConnection.jsp Deleted: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2011-06-29 16:05:03 UTC (rev 146) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2011-06-29 16:06:17 UTC (rev 147) @@ -1,96 +0,0 @@ -/* - * #%L - * Nuiton-ScmWebEditor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.scmwebeditor; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jrst.JRST; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; - -/** - * @author geoffroy lorieux - */ -public class PreviewServlet extends ScmWebEditorBaseAction { - - private static final long serialVersionUID = 1L; - - private static final Log log = LogFactory.getLog(PreviewServlet.class); - - /** - * Processes requests for <code>POST</code> method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - log.debug("je suis dans la previewservlet"); - HttpSession httpSession = request.getSession(true); - File tmp_dir = getTempDir(httpSession); - log.debug("Le tmp dir est :" + tmp_dir); - log.debug("Le content type est : " + request.getContentType()); -// Text recuperation - String myData = request.getParameter(PARAMETER_TEXT); -// Text formating and tempfile creating - String myDataWithoutcrlf = myData.replace("\r", ""); - File file_in_dir_copy = new File(tmp_dir, "copy" + httpSession.getId() + ".rst"); - File http_file = new File(tmp_dir, "preview" + httpSession.getId() + ".html"); - file_in_dir_copy.createNewFile(); - http_file.createNewFile(); - FileUtils.writeStringToFile(file_in_dir_copy, myDataWithoutcrlf); - - convertToUnicode(file_in_dir_copy); - - File copy = new File(tmp_dir, "copy" + httpSession.getId() + ".rst"); -// Using jrst for generate html document - try { - JRST.generate(JRST.TYPE_HTML, copy, http_file, JRST.Overwrite.ALLTIME); - log.debug("generate okai"); - } catch (Exception eee) { - log.debug("Bad RST file"); - response.setStatus(406); - return; - } - copy.delete(); -// Sending html content to pop-up preview page - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html"); - PrintWriter ret = response.getWriter(); - - ret.print(FileUtils.readFileToString(http_file)); - http_file.delete(); - } -} - Deleted: trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java 2011-06-29 16:05:03 UTC (rev 146) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java 2011-06-29 16:06:17 UTC (rev 147) @@ -1,73 +0,0 @@ -/* - * #%L - * Nuiton-ScmWebEditor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.scmwebeditor; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.io.PrintWriter; - -/** - * @author geoffroy lorieux - */ -public class PrivateSvnServlet extends ScmWebEditorBaseAction { - - private static final long serialVersionUID = 1L; - - private static final Log log = LogFactory.getLog(PrivateSvnServlet.class); - - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if (log.isDebugEnabled()) { - log.debug("New Log setting"); - } - HttpSession httpSession = request.getSession(true); - //FIXME-TC20091124 why doing this at each request ?, this is weird :) - System.setProperty("file.encoding", "UTF-8"); - PrintWriter out = response.getWriter(); - SvnSession svnSess = getSvnSession(httpSession); - - // Resetting User Information - svnSess.updateAuthentication(request.getParameter(PARAMETER_USERNAME), request.getParameter(PARAMETER_PW)); - //FIXME-TC20091124 : why repush the object already in session, I don't see the point... - setSvnSession(httpSession, svnSess); - // Recalling helloservlet with user information stock on session - String url = getRedirectUrl(svnSess); - if (log.isDebugEnabled()) { - log.debug("redirect url = " + url); - } - request.setAttribute(ATTRIBUTE_REDIRECT_URL, url); - //redirect(request, response, "/Recall.jsp"); - - out.close(); - } - - -} Deleted: trunk/src/main/webapp/GereFormSize.js =================================================================== --- trunk/src/main/webapp/GereFormSize.js 2011-06-29 16:05:03 UTC (rev 146) +++ trunk/src/main/webapp/GereFormSize.js 2011-06-29 16:06:17 UTC (rev 147) @@ -1,43 +0,0 @@ -/** - * @author geoffroy lorieux - */ - - -function countLines(strtocount, cols) - { - var hard_lines = 1; - var last = 0; - while ( true ) - { - last = strtocount.indexOf("\n", last+1); - hard_lines ++; - if ( last == -1 ) - { - break; - } - } - var soft_lines = Math.round(strtocount.length / (cols-1)); - var hard = eval("hard_lines " + unescape("%3e") + "soft_lines;"); - if ( hard ) - { - soft_lines = hard_lines; - } - return soft_lines; - } -function cleanForm() - { - var the_form = document.forms[0]; - for ( var x in the_form ) - { - if ( ! the_form[x] ) - { - continue; - } - if( typeof the_form[x].rows != "number" ) - { - continue; - } - the_form[x].rows = countLines(the_form[x].value,the_form[x].cols) +1; - } - setTimeout("cleanForm();", 300); - } \ No newline at end of file Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-29 16:05:03 UTC (rev 146) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-29 16:06:17 UTC (rev 147) @@ -15,7 +15,6 @@ <title>SCM Web Editor</title> </head> <body> -<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>Welcome on SCMWebEditor</h2> Deleted: trunk/src/main/webapp/fileSearch.js =================================================================== --- trunk/src/main/webapp/fileSearch.js 2011-06-29 16:05:03 UTC (rev 146) +++ trunk/src/main/webapp/fileSearch.js 2011-06-29 16:06:17 UTC (rev 147) @@ -1,50 +0,0 @@ -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 sendRequestToFileSearchAction(scmPath, searchUrl) -{ - http.open("POST", searchUrl, true); - http.onreadystatechange = handleResponseFromFileSearchAction; - http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.send("address="+scmPath.value); -} - -function handleResponseFromFileSearchAction() -{ - if(http.readyState == 4 && http.status != 401){ - alert("Can find file Continue"); - var response = http.responseText; - alert(response); - - - } else if (http.readyState == 4 && http.status == 401){ - alert("Cannot find files please recheck Scm path."); - } -} - -function fileSearch(scmPath) -{ - alert(scmPath.value); - sendRequestToFileSearchAction(scmPath, "search.action"); -}

1 0

r146 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 18:05:03 +0200 (Wed, 29 Jun 2011) New Revision: 146 Url: http://nuiton.org/repositories/revision/scmwebeditor/146 Log: Fix a bug in PreviewAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-29 15:48:15 UTC (rev 145) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-29 16:05:03 UTC (rev 146) @@ -22,16 +22,16 @@ HttpServletRequest request; String XMLResponse; - String newTextId; + String newText; - public String getNewTextId() { - return newTextId; + public String getNewText() { + return newText; } - public void setNewTextId(String newTextId) { - this.newTextId = newTextId; + public void setNewText(String newText) { + this.newText = newText; } public String getXMLResponse() { @@ -56,11 +56,13 @@ log.debug("Enter in preview action"); } + if(log.isInfoEnabled()) { + log.info(newText); + } - //Using jrst for generate html document try { - XMLResponse = JRST.generate(JRST.TYPE_HTML, newTextId); + XMLResponse = JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { log.debug("RST generate"); }

1 0

r145 - trunk/src/main/webapp
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 17:48:15 +0200 (Wed, 29 Jun 2011) New Revision: 145 Url: http://nuiton.org/repositories/revision/scmwebeditor/145 Log: Simplify javascript for the exit button Removed: trunk/src/main/webapp/cancelRedirectDelete.js Modified: trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 15:34:45 UTC (rev 144) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 15:48:15 UTC (rev 145) @@ -185,7 +185,7 @@ <script src="GereSession.js" type="text/javascript"></script> - <script src="cancelRedirectDelete.js" type="text/javascript"></script> + <script src="cancelRedirect.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> @@ -257,7 +257,7 @@ <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" /> <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> - <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> + <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirect(this.form.ProjectUrl);"/> <br/> Deleted: trunk/src/main/webapp/cancelRedirectDelete.js =================================================================== --- trunk/src/main/webapp/cancelRedirectDelete.js 2011-06-29 15:34:45 UTC (rev 144) +++ trunk/src/main/webapp/cancelRedirectDelete.js 2011-06-29 15:48:15 UTC (rev 145) @@ -1,44 +0,0 @@ -/** - * @author geoffroy lorieux - */ - - - -function createRequestObjec() -{ - 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= createRequestObjec(); - -function sendRe(method, url, text, login, pass, message) -{ - http.open(method, url.value, true); - http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+text.value); -} - -function cancelRedirectDelete(orig_text, login, pass, message, url_return, scmEditorUrl) - { - if (confirm("Exit SCMWebEditor ?")){ - sendRe("POST", scmEditorUrl, orig_text, login, pass, message); - window.location.replace(url_return.value); - } - } \ No newline at end of file

1 0

r144 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 17:34:45 +0200 (Wed, 29 Jun 2011) New Revision: 144 Url: http://nuiton.org/repositories/revision/scmwebeditor/144 Log: Fix a bug with rst preview Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-29 15:24:58 UTC (rev 143) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-29 15:34:45 UTC (rev 144) @@ -22,16 +22,16 @@ HttpServletRequest request; String XMLResponse; - String newText; + String newTextId; - public String getNewText() { - return newText; + public String getNewTextId() { + return newTextId; } - public void setNewText(String newText) { - this.newText = newText; + public void setNewTextId(String newTextId) { + this.newTextId = newTextId; } public String getXMLResponse() { @@ -60,7 +60,7 @@ //Using jrst for generate html document try { - XMLResponse = JRST.generate(JRST.TYPE_HTML, newText); + XMLResponse = JRST.generate(JRST.TYPE_HTML, newTextId); if(log.isDebugEnabled()) { log.debug("RST generate"); } Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 15:24:58 UTC (rev 143) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 15:34:45 UTC (rev 144) @@ -241,7 +241,7 @@ %> <s:url id="ajaxPreview" value="preview.action" /> - <sj:submit + <sj:submit onclick="loadChange()" id="ajaxPreviewButton" formIds="editForm" targets="htmlcontentPreview"

1 0

r143 - trunk/src/main/webapp
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 17:24:58 +0200 (Wed, 29 Jun 2011) New Revision: 143 Url: http://nuiton.org/repositories/revision/scmwebeditor/143 Log: Add a message when search address is not a repository Modified: trunk/src/main/webapp/Search.jsp Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-06-29 15:16:59 UTC (rev 142) +++ trunk/src/main/webapp/Search.jsp 2011-06-29 15:24:58 UTC (rev 143) @@ -9,24 +9,37 @@ <sj:head jquerytheme="default"/> <div id="search"> -<p>Files in the SVN repository : </p> - <table> - <% - SearchAction action = SearchAction.getAction(); - - LinkedList<UrlSvnFile> files = action.getFiles(); - - Iterator<UrlSvnFile> it = files.iterator(); - - while(it.hasNext()) { - UrlSvnFile file = it.next(); - - %> - <tr><td> - <a href="checkout.action?address=<%=file%>" ><%=file+" "+file.getLevel()%></a> - - </td></tr> - <% } %> - - </table> + + <% + SearchAction action = SearchAction.getAction(); + + LinkedList<UrlSvnFile> files = action.getFiles(); + + Iterator<UrlSvnFile> it = files.iterator(); + + if(!files.isEmpty()) { + %> + <p>Files in the SVN repository : </p> + <% + while(it.hasNext()) { + UrlSvnFile file = it.next(); + %> + + <table> + <tr><td> + <a href="checkout.action?address=<%=file%>" ><%=file+" "+file.getLevel()%></a> + + </td></tr> + </table> + <% } + } + + else { + %> + + <p>This is not a repository.</p> + <% + } + %> + </div> \ No newline at end of file

1 0

r142 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 17:16:59 +0200 (Wed, 29 Jun 2011) New Revision: 142 Url: http://nuiton.org/repositories/revision/scmwebeditor/142 Log: #140 Clients ip are now log Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-29 14:57:03 UTC (rev 141) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-29 15:16:59 UTC (rev 142) @@ -104,11 +104,13 @@ public String execute() { + if(log.isDebugEnabled()) { + log.debug("--------------------------\n" + + "Connection to SCMWebEditor\n" + + "--------------------------"); + } + - log.debug("--------------------------"); - log.debug("Connection to SCMWebEditor"); - log.debug("--------------------------"); - /* Si il n'y a pas de parametre, l'utilisateur est renvoyé * vers la page de configuration (OutConnection) @@ -124,7 +126,10 @@ HttpSession httpSession = request.getSession(true); - + if(log.isInfoEnabled()) { + log.info("IP client : "+request.getRemoteAddr()); + } + //SvnSession object creation if doesn't already exist SvnSession svnSess = getSvnSession(httpSession);

1 0

r141 - trunk/src/main/webapp
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 16:57:03 +0200 (Wed, 29 Jun 2011) New Revision: 141 Url: http://nuiton.org/repositories/revision/scmwebeditor/141 Log: Fix a bug with the selection of the type of file Modified: trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 14:07:46 UTC (rev 140) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 14:57:03 UTC (rev 141) @@ -47,12 +47,9 @@ <% String typeEditor="null"; if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ - typeEditor="rst"; - %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { - typeEditor="text/html"; - } - %> + %> + <h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> + <% } %> </center> @@ -86,82 +83,85 @@ </label> <% + if(typeEditor.equals("null") && request.getAttribute("minetype")!=null) { + + if(( (String) request.getAttribute("minetype")).contains("rst") ) { + typeEditor="rst"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("javascript")) { + typeEditor="javascript"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("html") ) { + typeEditor="text/html"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("xml") ) { + typeEditor="xml"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } + } - if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("rst") ) { + if (typeEditor.equals("null") && request.getAttribute("format")!=null){ + + + if (request.getAttribute("format").equals("rst")) { typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("javascript")) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% } else if(request.getAttribute("format").equals("javascript")) { typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("html") ) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% } else if(request.getAttribute("format").equals("html")) { typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("xml") ) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } else if(request.getAttribute("format").equals("xml")) { typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } - - else { - if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ - typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("javascript")) { - typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { - typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("xml")) { - typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("java")) { - typeEditor="text/x-java"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=5 - </script> - <% - } + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } else if(request.getAttribute("format").equals("java")) { + typeEditor="text/x-java"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=5 + </script> + <% + } } +%> - %> - <script type="text/javascript"> var textarea = document.getElementById('newTextId'); var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'popup' }

1 0

r140 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 29 Jun '11

29 Jun '11

Author: kcardineaud Date: 2011-06-29 16:07:46 +0200 (Wed, 29 Jun 2011) New Revision: 140 Url: http://nuiton.org/repositories/revision/scmwebeditor/140 Log: Upload files can now be place at a specific directory in the svn (but only children directory for the moment) Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-28 15:36:36 UTC (rev 139) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-29 14:07:46 UTC (rev 140) @@ -78,6 +78,7 @@ public String execute() { + if(log.isInfoEnabled()) { log.info("PictureName : "+uploadFileName); @@ -110,7 +111,7 @@ log.debug("Do Checkout of " + svnSess.getRemoteUrl()); } upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), - SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.INFINITY, false); } catch (SVNAuthenticationException authexep) { // if svn authentication failed user is redirected on login page @@ -131,16 +132,24 @@ File checkoutDir = svnSess.getCheckoutdir(); + + + //On test si le chemin commence par un / si non, on l'ajoute + if(!svnPath.startsWith("/")) { + svnPath="/"+svnPath; + } + //On test si le chemin se termine par un / si non, on l'ajoute + if(!svnPath.endsWith("/")) { + svnPath+=("/"); + } + //Copy file in checkourdir - - String checkoutPath = checkoutDir.getAbsolutePath(); - File file = new File(checkoutPath,uploadFileName); + File file = new File(checkoutPath+svnPath,uploadFileName); - try { FileUtils.copyFile(upload, file); } catch (IOException e) { @@ -151,39 +160,70 @@ //Commit process - - + SVNClientManager manager = svnSess.getManager(); + + + try { + + if(log.isDebugEnabled()) { + log.debug("leSvnPath : "+checkoutPath+svnPath+uploadFileName); + } + + //On ajoute le repertoire + manager.getWCClient().doAdd( file , false , false , false , SVNDepth.EMPTY, false, true ); + if(log.isDebugEnabled()) { + log.debug("Add success !"); + } + //On ajoute l'image aux fichiers versionnés + + } + catch (SVNException e) { + log.error("Erreur SVN Add",e); + request.setAttribute("error", true); + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return Action.ERROR; + } + + - File[] tabFile = new File[1]; - tabFile[0] = file; - + File[] checkoutDirTab = new File[1]; + checkoutDirTab[0] = checkoutDir; + try { - //On ajoute l'image aux fichiers versionnés - manager.getWCClient().doAdd( file , false , false , false , SVNDepth.FILES, false, false ); - //On commit la modification - manager.getCommitClient().doCommit(tabFile, false, "From scmwebeditor -- add the file : "+uploadFileName, null, null, false, true, SVNDepth.FILES); + manager.getCommitClient().doCommit(checkoutDirTab, false, "From scmwebeditor -- add the file : "+uploadFileName, null, null, false, true, SVNDepth.INFINITY); + + if(log.isDebugEnabled()) { + log.debug("Commit success !"); + } + } catch (SVNAuthenticationException authexep) { log.error("authentification fail"); request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.LOGIN; - } + } catch (SVNException e) { - log.error("Erreur SVN",e); + log.error("Erreur SVN commit",e); request.setAttribute("error", true); //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.ERROR; } + //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.SUCCESS; + + } + + @Override public void setServletRequest(HttpServletRequest request) { this.request=request;

1 0