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

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

06 Jul '11

Author: kcardineaud Date: 2011-07-06 11:05:42 +0200 (Wed, 06 Jul 2011) New Revision: 159 Url: http://nuiton.org/repositories/revision/scmwebeditor/159 Log: Add a filter that allow to click only on file in svn tree 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-05 14:26:01 UTC (rev 158) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-06 09:05:42 UTC (rev 159) @@ -208,7 +208,7 @@ for (UrlSvnFile file : files ) { TreeNode node = new TreeNode(); node.setId(file.toString()); - node.setTitle(file.toString()); + node.setTitle(file.toString().substring(file.toString().lastIndexOf("/")+1)); node.setState(TreeNode.NODE_STATE_LEAF); node.setIcon("ui-icon-document"); nodes.add(node); @@ -218,14 +218,12 @@ Iterator<Entry<String, String>> iter1 = directories.entrySet().iterator(); while (iter1.hasNext()) { Map.Entry<String,String> ent = (Map.Entry<String,String>) iter1.next(); - //La clé de la HashMap - //La Valeur de la HashMap String value = ent.getValue(); TreeNode node = new TreeNode(); node.setId(value); - node.setTitle(value); + node.setTitle(value.substring(value.lastIndexOf("/"))); nodes.add(node); @@ -307,7 +305,6 @@ return result; } - //public String getFileOrDirName(Strin) public static String replaceLast(String string, String toReplace, String replacement) { Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-05 14:26:01 UTC (rev 158) +++ trunk/src/main/webapp/Search.jsp 2011-07-06 09:05:42 UTC (rev 159) @@ -11,44 +11,14 @@ <sj:head debug="true" jquerytheme="default"/> - -  -  - -  - - - <script> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; - document.location.href=("checkout.action?address="+item.attr("id")) + + if(item.text().indexOf("/") == -1) { + document.location.href=("checkout.action?address="+item.attr("id")); + } + }); </script>

1 0

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

05 Jul '11

Author: kcardineaud Date: 2011-07-05 16:26:01 +0200 (Tue, 05 Jul 2011) New Revision: 158 Url: http://nuiton.org/repositories/revision/scmwebeditor/158 Log: Use jquery tree to display files on the repository Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/Search.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-04 14:56:03 UTC (rev 157) +++ trunk/pom.xml 2011-07-05 14:26:01 UTC (rev 158) @@ -99,7 +99,13 @@ <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> <scope>runtime</scope> - </dependency> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> <dependency> <groupId>org.apache.struts.xwork</groupId> @@ -107,6 +113,12 @@ <version>${strutsxworksVersion}</version> </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + </dependencies>  Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-04 14:56:03 UTC (rev 157) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-05 14:26:01 UTC (rev 158) @@ -1,12 +1,17 @@ package org.nuiton.scmwebeditor.actions; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import com.jgeppert.struts2.jquery.tree.result.TreeNode; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; @@ -53,6 +58,11 @@ String list; + protected List<TreeNode> nodes = new ArrayList<TreeNode>(); + protected String id = ""; + + + public String getError() { return error; } @@ -121,12 +131,26 @@ log.info("Enter in search action"); } + DAVRepositoryFactory.setup(); - String url = address; + String url = ""; + if(id.equals("")) { + return "root"; + } + else if(id.equals("0")) { + url=address; + } + else { + url=id; + address=id; + } + + + String name = "anonymous"; String password="anonymous"; @@ -135,14 +159,17 @@ password=pw; } + + files = new LinkedList<UrlSvnFile>(); directories = new HashMap<String,String>(); + + if(address.endsWith("/")) { address = address.substring(0, address.length()-1); } - SVNRepository repository = null; try { @@ -152,7 +179,7 @@ if(log.isInfoEnabled()) { log.info( "Repository Root: " + repository.getRepositoryRoot( true ) ); - log.info( "Repository UUID: " + repository.getRepositoryUUID( true ) ); + log.info( "Repository UUID: " + repository.getRepositoryUUID( true ) ); } SVNNodeKind nodeKind = repository.checkPath( "" , -1 ); @@ -177,6 +204,36 @@ Collections.sort(files); + + for (UrlSvnFile file : files ) { + TreeNode node = new TreeNode(); + node.setId(file.toString()); + node.setTitle(file.toString()); + node.setState(TreeNode.NODE_STATE_LEAF); + node.setIcon("ui-icon-document"); + nodes.add(node); + } + + + Iterator<Entry<String, String>> iter1 = directories.entrySet().iterator(); + while (iter1.hasNext()) { + Map.Entry<String,String> ent = (Map.Entry<String,String>) iter1.next(); + //La clé de la HashMap + + //La Valeur de la HashMap + String value = ent.getValue(); + + TreeNode node = new TreeNode(); + node.setId(value); + node.setTitle(value); + nodes.add(node); + + + //Traitement + } + + + } catch (SVNAuthenticationException authexep) { if(log.isErrorEnabled()) { log.error("Can't access to the repository : Auth Problem"); @@ -190,7 +247,7 @@ error="Can't access to the repository"; } - + log.info("Success"); return Action.SUCCESS; } @@ -228,13 +285,31 @@ } + + + public String getJSON() { + return search(); + } + + public List<TreeNode> getNodes() { + return nodes; + } + + public void setId(String id) { + this.id=id; + } + + + public String getAddressUnique(String leFichier) { String result = leFichier.replaceAll("/|:", ""); log.info("Result of getAddressUnique : "+result); return result; } + //public String getFileOrDirName(Strin) + public static String replaceLast(String string, String toReplace, String replacement) { int pos = string.lastIndexOf(toReplace); if (pos > -1) { Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-04 14:56:03 UTC (rev 157) +++ trunk/src/main/resources/struts.xml 2011-07-05 14:26:01 UTC (rev 158) @@ -4,6 +4,9 @@ "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> <package name="action" extends="struts-default"> + <result-types> + <result-type name="json" class="org.apache.struts2.json.JSONResult"/> + </result-types> <action name="checkout" class="org.nuiton.scmwebeditor.actions.ScmWebEditorMainAction" method="execute"> <result name="noParameter" >/OutConnection.jsp</result> @@ -38,8 +41,15 @@ <result>/Preview.jsp</result> </action> + + + <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="search"> - <result>/Search.jsp</result> + <param name="address"/> + <result name="root" >Search.jsp</result> + <result name="success" type="json"> + <param name="root">nodes</param> + </result> <result name="authError" >/LoginSearch.jsp</result> </action> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-07-04 14:56:03 UTC (rev 157) +++ trunk/src/main/webapp/OutConnection.jsp 2011-07-05 14:26:01 UTC (rev 158) @@ -2,6 +2,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> <sj:head jquerytheme="default"/> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" @@ -48,6 +49,18 @@ <div id="htmlcontentSearch" ></div> </form> + <p align="right">©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-04 14:56:03 UTC (rev 157) +++ trunk/src/main/webapp/Search.jsp 2011-07-05 14:26:01 UTC (rev 158) @@ -7,16 +7,19 @@ <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> + <sj:head debug="true" jquerytheme="default"/>  +  +  + + +<script> +$.subscribe('treeClicked', function(event, data) { + var item = event.originalEvent.data.rslt.obj; + document.location.href=("checkout.action?address="+item.attr("id")) +}); + +</script> + + <div id="searchTree"> + <s:set name="address"> + <s:property value="address"/> + </s:set> + + + <s:url id="searchTreeUrl" action="search?address=%{address}"/> + + + <sjt:tree id="svnTree" + + htmlTitles="true" + jstreetheme="classic" + href="%{searchTreeUrl}" + onClickTopics="treeClicked" + /> + + </div> + <s:label name="error"></s:label>

1 0

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

04 Jul '11

Author: kcardineaud Date: 2011-07-04 16:56:03 +0200 (Mon, 04 Jul 2011) New Revision: 157 Url: http://nuiton.org/repositories/revision/scmwebeditor/157 Log: The search function load svn by directory 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 15:27:37 UTC (rev 156) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-04 14:56:03 UTC (rev 157) @@ -2,8 +2,10 @@ import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,7 +25,6 @@ import org.tmatesoft.svn.core.wc.SVNWCUtil; import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; public class SearchAction extends ScmWebEditorBaseAction { @@ -39,13 +40,14 @@ String address; LinkedList<UrlSvnFile> files; + Map<String,String> directories; String username; String pw; String error; - - + + int numberOfFile; String info; String list; @@ -69,6 +71,11 @@ public LinkedList<UrlSvnFile> getFiles() { return files; } + + + public Map<String,String> getDirectories() { + return directories; + } public String getInfo() { @@ -79,8 +86,7 @@ public String getAddress() { return address; } - - + public void setAddress(String address) { this.address = address; } @@ -104,9 +110,18 @@ this.pw = pw; } + public int getNumberOfFile() { + return numberOfFile; + } + public String search() { + if(log.isInfoEnabled()) { + log.info("Enter in search action"); + } + + DAVRepositoryFactory.setup(); String url = address; @@ -121,8 +136,8 @@ } files = new LinkedList<UrlSvnFile>(); + directories = new HashMap<String,String>(); - if(address.endsWith("/")) { address = address.substring(0, address.length()-1); } @@ -154,8 +169,12 @@ error="The entry is a file while a directory was expected."; return Action.SUCCESS; } - + numberOfFile=0; listEntries( repository , "" ); + if(log.isInfoEnabled()) { + log.info("Nombre de fichier : "+files.size()); + } + Collections.sort(files); } catch (SVNAuthenticationException authexep) { @@ -185,34 +204,37 @@ } Iterator<?> iterator = entries.iterator(); + while (iterator.hasNext()) { SVNDirEntry entry = (SVNDirEntry) iterator.next(); - if(log.isInfoEnabled()) { - log.info("/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"); + if(log.isDebugEnabled()) { + log.debug("/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"); } String fichier = address+"/" + (path.equals("") ? "" : path + "/") + entry.getName(); if ( entry.getKind() == SVNNodeKind.DIR ) { - listEntries(repository, (path.equals("")) ? entry.getName() : path + "/" + entry.getName()); + directories.put(getAddressUnique(fichier),fichier); + + //listEntries(repository, (path.equals("")) ? entry.getName() : path + "/" + entry.getName()); } else { - // On ajoute dans la liste files seulement les fichiers et pas les répertoires files.add(new UrlSvnFile(fichier)); - } } } - - static public SearchAction getAction() { - return (SearchAction) ActionContext.getContext() - .get(CONTEXT_ACTION_KEY); + + public String getAddressUnique(String leFichier) { + String result = leFichier.replaceAll("/|:", ""); + log.info("Result of getAddressUnique : "+result); + return result; } + public static String replaceLast(String string, String toReplace, String replacement) { int pos = string.lastIndexOf(toReplace); if (pos > -1) { @@ -225,7 +247,6 @@ } - } Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-01 15:27:37 UTC (rev 156) +++ trunk/src/main/webapp/Search.jsp 2011-07-04 14:56:03 UTC (rev 157) @@ -1,23 +1,42 @@ <%@ 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" %> + + <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <sj:head jquerytheme="default"/> + <sj:head debug="true" jquerytheme="default"/> -<div id="search"> - <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:iterator value="directories" var="directory" > + <tr><td> + + <sj:a + id="%{key}Button" + targets="htmlcontent%{key}" + href="search.action?address=%{value}" + > + ${directory.value} + </sj:a> + + + <div id="htmlcontent${directory.key}" ></div> + + </td></tr> + </s:iterator> + + </table> - </s:if> +  <s:label name="error"></s:label> - </s:form> - -</div> \ No newline at end of file +

1 0

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

01 Jul '11

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 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

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

30 Jun '11

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