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

r156 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 17:27:37 +0200 (Fri, 01 Jul 2011) New Revision: 156 Url: http://nuiton.org/repositories/revision/scmwebeditor/156 Log: Use taglib to display upload result Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/Search.jsp trunk/src/main/webapp/upload.jsp trunk/src/main/webapp/uploadForm.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 15:27:37 UTC (rev 156) @@ -1,7 +1,6 @@ package org.nuiton.scmwebeditor.actions; import java.util.Date; -import java.util.GregorianCalendar; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -55,7 +54,7 @@ result = execute(); date = new Date(); - log.info("Date : "+date.getTime()); + return Action.SUCCESS; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-01 15:27:37 UTC (rev 156) @@ -35,6 +35,9 @@ protected String username; protected String pw; protected String svnPath; + + protected boolean badLogin; + protected boolean error; protected HttpServletRequest request; @@ -76,28 +79,31 @@ this.pw = pw; } + public boolean isBadLogin() { + return badLogin; + } + public boolean isError() { + return error; + } public String execute() { + badLogin=false; + error=false; + if(log.isInfoEnabled()) { log.info("PictureName : "+uploadFileName); log.info("ContentType : "+uploadContentType); } - - - + HttpSession httpSession = request.getSession(true); SvnSession svnSess = getSvnSession(httpSession); - - // Resetting authentification information and manager - svnSess.updateAuthentication( - svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, - svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + svnSess.updateAuthentication(username,pw); /* @@ -121,20 +127,20 @@ //On supprime le repertoire temporaire delTempDirectory(svnSess); //redirect to a login page + error=true; return "error"; } catch (SVNException e) { //Suppression du repertoire temporaire delTempDirectory(svnSess); + error=true; return "error"; } File checkoutDir = svnSess.getCheckoutdir(); - - //On test si le chemin commence par un / si non, on l'ajoute if(!svnPath.startsWith("/")) { svnPath="/"+svnPath; @@ -153,7 +159,9 @@ try { FileUtils.copyFile(upload, file); } catch (IOException e) { + error=true; log.error("Can't copy the file to the checkout directory",e); + return "error"; } @@ -180,7 +188,7 @@ } catch (SVNException e) { log.error("Erreur SVN Add",e); - request.setAttribute("error", true); + error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.ERROR; @@ -200,14 +208,14 @@ } catch (SVNAuthenticationException authexep) { log.error("authentification fail"); - request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); + badLogin=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.LOGIN; } catch (SVNException e) { log.error("Erreur SVN commit",e); - request.setAttribute("error", true); + error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.ERROR; Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/resources/struts.xml 2011-07-01 15:27:37 UTC (rev 156) @@ -22,19 +22,19 @@ <result>/Save.jsp</result> </action> - <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> + <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" > <result>/uploadSuccess.jsp</result> <result name="login" >/uploadForm.jsp</result> <result name="error" >/uploadForm.jsp</result> </action> - <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> + <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" > <result>/upload.jsp</result> <result name="login" >/upload.jsp</result> <result name="error" >/upload.jsp</result> </action> - <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> + <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" > <result>/Preview.jsp</result> </action> Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/webapp/Search.jsp 2011-07-01 15:27:37 UTC (rev 156) @@ -8,14 +8,14 @@ <s:form action="search"> - <s:if test="!files.empty"> - <p>Files on the repository : </p> - <table> - <s:iterator value="files"> - <tr><td><a href="checkout.action?address=<s:property/>"><s:property/> <s:property value="level"/></a></td></tr> - </s:iterator> + <s:if test="!files.empty"> + <p>Files on the repository : </p> + <table> + <s:iterator value="files"> + <tr><td><a href="checkout.action?address=<s:property/>"><s:property/> <s:property value="level"/></a></td></tr> + </s:iterator> </table> - </s:if> + </s:if> <s:label name="error"></s:label> </s:form> Modified: trunk/src/main/webapp/upload.jsp =================================================================== --- trunk/src/main/webapp/upload.jsp 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/webapp/upload.jsp 2011-07-01 15:27:37 UTC (rev 156) @@ -1,16 +1,14 @@ +<%@ taglib prefix="s" uri="/struts-tags"%> + <p>Result : </p> - <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> - <p> - <font color="red"> - Bad username or password - </font> - </p> - <% } else if (request.getAttribute("error")!=null && request.getAttribute("error").equals(true)) { %> - <p> - <font color="red"> - Erreur SVN - </font> - </p> - <% } else {%> - <p>File upload successful</p> - <% } %> \ No newline at end of file + + + <s:if test="badLogin"> + <p><font color="red">Bad username or password</font></p> + </s:if> + <s:elseif test="error"> + <p><font color="red">Erreur SVN</font></p> + </s:elseif> + <s:else> + <p>File upload successful</p> + </s:else> \ No newline at end of file Modified: trunk/src/main/webapp/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/uploadForm.jsp 2011-07-01 14:34:00 UTC (rev 155) +++ trunk/src/main/webapp/uploadForm.jsp 2011-07-01 15:27:37 UTC (rev 156) @@ -1,5 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + <%@ taglib prefix="s" uri="/struts-tags"%> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> @@ -13,20 +14,13 @@ <label>Path on svn : <input type="text" name="svnPath" /></label><br/> <label>username : <input type="text" name="username" /></label><br/> <label>password : <input type="password" name="pw" /></label><br/> - <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> - <p> - <font color="red"> - Bad username or password - </font> - </p> - <% } %> - <%if (request.getAttribute("error")!=null && request.getAttribute("error").equals(true)) { %> - <p> - <font color="red"> - Erreur SVN - </font> - </p> - <% } %> + + <s:if test="badLogin"> + <p><font color="red">Bad username or password</font></p> + </s:if> + <s:elseif test="error"> + <p><font color="red">Erreur SVN</font></p> + </s:elseif> <input type="submit"/> </form>

1 0

r155 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 16:34:00 +0200 (Fri, 01 Jul 2011) New Revision: 155 Url: http://nuiton.org/repositories/revision/scmwebeditor/155 Log: Change a bad name in Save.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/webapp/Save.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 14:18:01 UTC (rev 154) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 14:34:00 UTC (rev 155) @@ -60,6 +60,11 @@ return Action.SUCCESS; } + + /** + * Use to display a beautiful date in jsp + * @return + */ public String getFormatDate() { return date.toString(); } Modified: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp 2011-07-01 14:18:01 UTC (rev 154) +++ trunk/src/main/webapp/Save.jsp 2011-07-01 14:34:00 UTC (rev 155) @@ -10,8 +10,8 @@ <h4> Can't save modification </h4> </s:elseif> <s:elseif test="result=='uselessSave'" > - <h4> It's useless to save the file, it is not modify</h4> + <h4> It's useless to save the file, file is not modify</h4> </s:elseif> <s:else> - <h4>Last change save <s:property value="getFormatDate" /> </h4> + <h4>Last change save <s:property value="formatDate" /> </h4> </s:else> \ No newline at end of file

1 0

r154 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 16:18:01 +0200 (Fri, 01 Jul 2011) New Revision: 154 Url: http://nuiton.org/repositories/revision/scmwebeditor/154 Log: Use taglib to display save result Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/Save.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 14:18:01 UTC (rev 154) @@ -1,14 +1,22 @@ package org.nuiton.scmwebeditor.actions; +import java.util.Date; +import java.util.GregorianCalendar; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; + public class SaveAction extends ScmWebEditorCommitAction { String result; + Date date; + + + + private static final Log log = LogFactory.getLog(SaveAction.class); @@ -20,8 +28,12 @@ public void setResult(String result) { this.result = result; } + + public Date getDate() { + return date; + } + - /** * */ @@ -42,14 +54,16 @@ } result = execute(); + date = new Date(); + log.info("Date : "+date.getTime()); return Action.SUCCESS; } - static public SaveAction getAction() { - return (SaveAction) ActionContext.getContext() - .get(CONTEXT_ACTION_KEY); + public String getFormatDate() { + return date.toString(); } + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-01 14:18:01 UTC (rev 154) @@ -186,7 +186,7 @@ if(log.isErrorEnabled()) { log.error("Can't write in file " , e); } - return "erreur"; + return "error"; } @@ -231,7 +231,7 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); - return "erreur"; + return "error"; } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/resources/struts.xml 2011-07-01 14:18:01 UTC (rev 154) @@ -15,7 +15,7 @@ <action name="commit" class="org.nuiton.scmwebeditor.actions.ScmWebEditorCommitAction" method="execute"> <result name="success" >/Redirect.jsp</result> <result name="authError" >/ModificationViewer.jsp</result> - <result name="erreur">/BadFileRedirect.jsp</result> + <result name="error">/BadFileRedirect.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> Modified: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/webapp/Save.jsp 2011-07-01 14:18:01 UTC (rev 154) @@ -1,22 +1,17 @@ -<%@page - import="org.nuiton.scmwebeditor.actions.SaveAction"%> -<%@page import="java.util.Date" %> - <% - SaveAction action = SaveAction.getAction(); - - String result = action.getResult(); - %> - - - - <%if(result.equals("authError")) { %> - <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> - <% } else if(result.equals("erreur")) { %> - <h4> Can't save modification </h4> - <% } else if(result.equals("uselessSave")) { %> - <h4> It's useless to save the file, it is not modify</h4> - <% } else { %> - <h4>Last change save <%=new Date()%> </h4> - <% } %> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + + - \ No newline at end of file + <s:if test="result=='authError'" > + <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> + </s:if> + <s:elseif test="result=='error'" > + <h4> Can't save modification </h4> + </s:elseif> + <s:elseif test="result=='uselessSave'" > + <h4> It's useless to save the file, it is not modify</h4> + </s:elseif> + <s:else> + <h4>Last change save <s:property value="getFormatDate" /> </h4> + </s:else> \ No newline at end of file

1 0

r153 - trunk/src/main/webapp
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 15:19:08 +0200 (Fri, 01 Jul 2011) New Revision: 153 Url: http://nuiton.org/repositories/revision/scmwebeditor/153 Log: Use taglib to display rst preview Modified: trunk/src/main/webapp/Preview.jsp Modified: trunk/src/main/webapp/Preview.jsp =================================================================== --- trunk/src/main/webapp/Preview.jsp 2011-07-01 12:39:28 UTC (rev 152) +++ trunk/src/main/webapp/Preview.jsp 2011-07-01 13:19:08 UTC (rev 153) @@ -1,17 +1,10 @@ -<%@page - import="org.nuiton.scmwebeditor.actions.PreviewAction"%> + <%@ taglib prefix="s" uri="/struts-tags"%> <%--Title and div for rst preview--%> <h3 id="prevtitle" >Preview :</h3> + <div id="prev" title="Preview"> <div id="preview" > - <% - PreviewAction action = PreviewAction.getAction(); - - String preview = action.getXMLResponse(); - - %> - <%=preview%> - + <s:property value="XMLResponse" escapeHtml="false"/> </div> </div>

1 0

r152 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 14:39:28 +0200 (Fri, 01 Jul 2011) New Revision: 152 Url: http://nuiton.org/repositories/revision/scmwebeditor/152 Log: Use taglib to display the search result on the repository Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/Search.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-01 09:59:44 UTC (rev 151) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-01 12:39:28 UTC (rev 152) @@ -41,13 +41,21 @@ LinkedList<UrlSvnFile> files; String username; String pw; + String error; + + String info; String list; + public String getError() { + return error; + } + + public String getList() { return list; } @@ -103,7 +111,7 @@ String url = address; - + String name = "anonymous"; String password="anonymous"; @@ -137,11 +145,13 @@ if(log.isErrorEnabled()) { log.error( "There is no entry at '" + url + "'." ); } + error="There is no entry at '" + url + "'."; return Action.SUCCESS; } else if ( nodeKind == SVNNodeKind.FILE ) { if(log.isErrorEnabled()) { log.error( "The entry at '" + url + "' is a file while a directory was expected." ); } + error="The entry is a file while a directory was expected."; return Action.SUCCESS; } @@ -149,11 +159,16 @@ Collections.sort(files); } catch (SVNAuthenticationException authexep) { - log.error("Can't access to the repository : Auth Problem"); + if(log.isErrorEnabled()) { + log.error("Can't access to the repository : Auth Problem"); + } return "authError"; } catch ( SVNException svne ) { - log.error("Can't access to the repository",svne); + if(log.isErrorEnabled()) { + log.error("Can't access to the repository"); + } + error="Can't access to the repository"; } Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-01 09:59:44 UTC (rev 151) +++ trunk/src/main/webapp/Search.jsp 2011-07-01 12:39:28 UTC (rev 152) @@ -1,45 +1,23 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> -<%@page import="java.util.LinkedList" %> -<%@page import="java.util.Iterator" %> -<%@page import="org.nuiton.scmwebeditor.UrlSvnFile" %> <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> <div id="search"> - <% - 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 { - %> + <s:form action="search"> + + <s:if test="!files.empty"> + <p>Files on the repository : </p> + <table> + <s:iterator value="files"> + <tr><td><a href="checkout.action?address=<s:property/>"><s:property/> <s:property value="level"/></a></td></tr> + </s:iterator> + </table> + </s:if> - <p>This is not a repository.</p> - <% - } - %> - + <s:label name="error"></s:label> + </s:form> + </div> \ No newline at end of file

1 0

r151 - in trunk: . src/main/java/org/nuiton/scmwebeditor/actions src/main/resources src/main/webapp src/main/webapp/css
by kcardineaud＠users.nuiton.org July 1, 2011

July 1, 2011

Author: kcardineaud Date: 2011-07-01 11:59:44 +0200 (Fri, 01 Jul 2011) New Revision: 151 Url: http://nuiton.org/repositories/revision/scmwebeditor/151 Log: Add upload function in Ajax, work but response doesn't apear in page Added: trunk/src/main/webapp/upload.jsp Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/css/main.css Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/pom.xml 2011-07-01 09:59:44 UTC (rev 151) @@ -171,7 +171,7 @@  <siteLocales>fr,en</siteLocales> <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <strutsxworksVersion>2.2.3</strutsxworksVersion>  Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-01 09:59:44 UTC (rev 151) @@ -216,6 +216,11 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); + + if(log.isInfoEnabled()) { + log.info("File upload successful"); + } + return Action.SUCCESS; Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/resources/struts.xml 2011-07-01 09:59:44 UTC (rev 151) @@ -23,11 +23,17 @@ </action> <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> - <result>/uploadSuccess.jsp</result> - <result name="login" >/uploadForm.jsp</result> - <result name="error" >/uploadForm.jsp</result> + <result>/uploadSuccess.jsp</result> + <result name="login" >/uploadForm.jsp</result> + <result name="error" >/uploadForm.jsp</result> </action> + <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> + <result>/upload.jsp</result> + <result name="login" >/upload.jsp</result> + <result name="error" >/upload.jsp</result> + </action> + <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> <result>/Preview.jsp</result> </action> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-01 09:59:44 UTC (rev 151) @@ -278,31 +278,29 @@ </div> -  + </s:form> + </div> + --> - <sj:div id="htmlcontentUpload"></sj:div> + <div id="targetContentUpload"></div> <div id="htmlcontentPreview"></div> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/webapp/css/main.css 2011-07-01 09:59:44 UTC (rev 151) @@ -15,8 +15,16 @@ text-align:center; } +#uploadFormId { + width:70%; + margin:auto; + display:block; + padding:1%; + text-align:left; +} + .CodeMirror-scroll { - height:500px; + height:500px; } #prevtitle { Added: trunk/src/main/webapp/upload.jsp =================================================================== --- trunk/src/main/webapp/upload.jsp (rev 0) +++ trunk/src/main/webapp/upload.jsp 2011-07-01 09:59:44 UTC (rev 151) @@ -0,0 +1,16 @@ +<p>Result : </p> + <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> + <p> + <font color="red"> + Bad username or password + </font> + </p> + <% } else if (request.getAttribute("error")!=null && request.getAttribute("error").equals(true)) { %> + <p> + <font color="red"> + Erreur SVN + </font> + </p> + <% } else {%> + <p>File upload successful</p> + <% } %> \ No newline at end of file

1 0

r150 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org June 30, 2011

June 30, 2011

Author: kcardineaud Date: 2011-06-30 14:44:14 +0200 (Thu, 30 Jun 2011) New Revision: 150 Url: http://nuiton.org/repositories/revision/scmwebeditor/150 Log: Change some bad value of string Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/PrivateSvnRedirect.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-30 10:05:45 UTC (rev 149) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-30 12:44:14 UTC (rev 150) @@ -192,7 +192,7 @@ request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); - return "erreurPath"; + return "errorPath"; } @@ -203,18 +203,18 @@ mineType = getMineType(CheckOutFile); } catch (Exception e) { if(log.isErrorEnabled()) { - log.error("",e); + log.error("Can't get MimeType",e); } } // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if( !mineType.matches(".*text.*|.*xml.*|.*javascript.*") ) { + if(mineType==null || !mineType.matches(".*text.*|.*xml.*|.*javascript.*") ) { request.setAttribute("projectUrl", projectUrl); //On supprime le repertoire temporaire delTempDirectory(svnSess); - return "erreurPath"; + return "errorPath"; } else { request.setAttribute("minetype", mineType); @@ -244,7 +244,7 @@ */ delTempDirectory(svnSess); request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl()); - return "erreurPath"; + return "errorPath"; } catch (IOException e) { log.error("Can't find the checkout file",e); } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-30 10:05:45 UTC (rev 149) +++ trunk/src/main/resources/struts.xml 2011-06-30 12:44:14 UTC (rev 150) @@ -8,7 +8,7 @@ <action name="checkout" class="org.nuiton.scmwebeditor.actions.ScmWebEditorMainAction" method="execute"> <result name="noParameter" >/OutConnection.jsp</result> <result name="login" >/PrivateSvnRedirect.jsp</result> - <result name="erreurPath" >/BadFileRedirect.jsp</result> + <result name="errorPath" >/BadFileRedirect.jsp</result> <result name="editPage" >/ModificationViewer.jsp</result> </action> Modified: trunk/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-06-30 10:05:45 UTC (rev 149) +++ trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-06-30 12:44:14 UTC (rev 150) @@ -23,7 +23,7 @@ TYPE=password NAME=pw SIZE=12></label></p> <input type="submit" value="Submit" name="Save" /> <input type="button" value="Exit" name="Cancel" - onclick="cancelRedirect(this.form.project_url);" /></form> + onclick="cancelRedirect(this.form.projectUrl);" /></form> <p>©2004-2009 CodeLutin</p> </body> </html> \ No newline at end of file

1 0

r149 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org June 30, 2011

June 30, 2011

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 June 30, 2011

June 30, 2011

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 June 29, 2011

June 29, 2011

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