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

r154 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org 01 Jul '11

01 Jul '11

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 01 Jul '11

01 Jul '11

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 01 Jul '11

01 Jul '11

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 01 Jul '11

01 Jul '11

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