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

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

July 29, 2011

Author: kcardineaud Date: 2011-07-29 11:55:01 +0200 (Fri, 29 Jul 2011) New Revision: 194 Url: http://nuiton.org/repositories/revision/scmwebeditor/194 Log: Remove useless informations stock in session Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-29 09:16:22 UTC (rev 193) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-29 09:55:01 UTC (rev 194) @@ -24,7 +24,6 @@ */ 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.util.FileUtil; @@ -48,14 +47,6 @@ */ protected StringBuffer scmEditorUrl; /** - * Id du user for temp_dir name - */ - protected String id; - /** - * file format - */ - protected String format; - /** * svn path without fileName */ protected String svnPath; @@ -96,23 +87,16 @@ */ protected SVNClientManager manager; - //TODO-TC avoid constructor with so much parameter - //TODO-TC avoid constructor with exception throwing... public SvnSession( String svnPath, String fileName, String projectUrl, - String id, - String format, StringBuffer scmEditorUrl) { this.scmEditorUrl = scmEditorUrl; - this.id = id; - this.format = format; this.svnPath = svnPath; this.fileName = fileName; this.projectUrl = projectUrl; - log.info(login+" "+password); try { this.remoteUrl = SVNURL.parseURIEncoded(svnPath); } catch (SVNException e) { @@ -215,22 +199,6 @@ this.svnPath = svnPath; } - public String getFormat() { - return format; - } - - public void setFormat(String format) { - this.format = format; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public StringBuffer getScmEditorUrl() { return scmEditorUrl; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-29 09:16:22 UTC (rev 193) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-29 09:55:01 UTC (rev 194) @@ -187,7 +187,7 @@ try { String originalText = FileUtils.readFileToString(checkOutFile); - request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute("lastText", lastText); request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); @@ -252,7 +252,7 @@ svnSess.setPassword(null); // if authentication failed edition page is reload form user's relogin request.setAttribute("address", address); - request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(newText)); request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null)); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-29 09:16:22 UTC (rev 193) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-29 09:55:01 UTC (rev 194) @@ -146,8 +146,6 @@ relativePath, scmFileName, projectUrl, - httpSession.getId(), - format, request.getRequestURL()); @@ -314,7 +312,7 @@ - request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute(PARAMETER_FORMAT, format); request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null));

1 0

r193 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org July 29, 2011

July 29, 2011

Author: kcardineaud Date: 2011-07-29 11:16:22 +0200 (Fri, 29 Jul 2011) New Revision: 193 Url: http://nuiton.org/repositories/revision/scmwebeditor/193 Log: Change some authentification system Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-28 15:01:30 UTC (rev 192) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-29 09:16:22 UTC (rev 193) @@ -103,8 +103,6 @@ String svnPath, String fileName, String projectUrl, - String login, - String password, String id, String format, StringBuffer scmEditorUrl) { @@ -114,33 +112,18 @@ this.svnPath = svnPath; this.fileName = fileName; this.projectUrl = projectUrl; - this.login = login; - this.password = password; -// try { -// this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); -// } catch (IOException e) { -// e.printStackTrace(); -// } + log.info(login+" "+password); try { this.remoteUrl = SVNURL.parseURIEncoded(svnPath); } catch (SVNException e) { log.debug("SVNSESS NULL"); } - this.authManager = SVNWCUtil.createDefaultAuthenticationManager(this.checkoutdir, this.login, this.password, false); - this.svnOption = SVNWCUtil.createDefaultOptions(this.checkoutdir, false); + this.authManager = SVNWCUtil.createDefaultAuthenticationManager(); + this.svnOption = SVNWCUtil.createDefaultOptions(false); this.svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); this.manager = SVNClientManager.newInstance(this.svnOption, this.authManager); } - /** - * Delete checkout directory. - * - * @throws IOException if any io pb - */ -// public void cleanCheckoutDir() throws IOException { -// FileUtils.deleteDirectory(getCheckoutdir()); -// } - public void updateAuthentication(String login, String password) { setLogin(login); setPassword(password); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-28 15:01:30 UTC (rev 192) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-29 09:16:22 UTC (rev 193) @@ -142,35 +142,23 @@ - String tmp_log = null; - String tmp_pass = null; - svnSess = new SvnSession( relativePath, scmFileName, projectUrl, - tmp_log, - tmp_pass, httpSession.getId(), format, request.getRequestURL()); - svnSess.updateAuthentication( - svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, - svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); - - + setSvnSession(httpSession, svnSess); - - - String originalText =""; - String login = svnSess.getLogin(); - String pw = svnSess.getPassword(); + String login = this.getUsername(); + String pw = this.getPw(); String url = svnSess.getSvnPath(); String file = svnSess.getFileName(); @@ -178,6 +166,10 @@ login = "anonymous"; pw = "anonymous"; } + else { + svnSess.setLogin(login); + svnSess.setPassword(pw); + } SVNRepository repository = null; Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-28 15:01:30 UTC (rev 192) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-29 09:16:22 UTC (rev 193) @@ -48,7 +48,7 @@ </head> -<body> +<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> <center> @@ -121,7 +121,7 @@ <script type="text/javascript"> - function loadChange(){ + function loadChange() { document.getElementById('newTextId').value = editor.mirror.getValue(); } </script>

1 0

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

July 28, 2011

Author: kcardineaud Date: 2011-07-28 17:01:30 +0200 (Thu, 28 Jul 2011) New Revision: 192 Url: http://nuiton.org/repositories/revision/scmwebeditor/192 Log: Change the way to create the temp directory Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-28 13:55:23 UTC (rev 191) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-28 15:01:30 UTC (rev 192) @@ -186,22 +186,22 @@ } - public void checkout(SvnSession svnSess) throws SVNException { + public void checkout(SvnSession svnSess, File checkoutdir) throws SVNException { SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl()); } - upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); } - public void delTempDirectory(SvnSession svnSess) { + public void delTempDirectory(File checkoutdir) { try { - FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + FileUtils.deleteDirectory(checkoutdir); } catch (IOException e) { if(log.isErrorEnabled()) { log.error("Can't delete temp directory"); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-28 13:55:23 UTC (rev 191) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-28 15:01:30 UTC (rev 192) @@ -15,6 +15,7 @@ import org.nuiton.jrst.JRST; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; +import org.nuiton.util.FileUtil; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; @@ -111,6 +112,7 @@ protected boolean testRstParsing(String newText) { try { + JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { log.debug("RST generate success"); } @@ -145,8 +147,9 @@ svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + File checkoutdir = null; try { - svnSess.createCheckoutdir(); + checkoutdir = FileUtil.createTempDirectory("scm_", ""); } catch (IOException e1) { if(log.isErrorEnabled()) { log.error("Can't create checkoutDir",e1); @@ -157,7 +160,7 @@ // Avant le commit, il faut checkout le repertoire try { - checkout(svnSess); + checkout(svnSess, checkoutdir); } catch (SVNAuthenticationException authexep) { request.setAttribute(PARAMETER_ADDRESS, address); @@ -166,18 +169,18 @@ log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } //On supprime le repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); //redirect to a login page return Action.LOGIN; } catch (SVNException e) { //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); return "errorPath"; } - File checkOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + File checkOutFile = new File(checkoutdir, svnSess.getFileName()); lastText=newText; @@ -204,7 +207,7 @@ /* fichier non trouve, on redirige vers BadFileRedirect.jsp * après avoir supprimé le repertoire temporaire */ - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl()); return "error"; } catch (IOException e) { @@ -216,7 +219,7 @@ /* * Commit process */ - File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + File pathToFile = new File(checkoutdir, svnSess.getFileName()); SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); try { @@ -261,22 +264,22 @@ request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); return Action.LOGIN; } catch (SVNException e) { if(log.isErrorEnabled()) { log.error("SVN FAIL",e); } //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); return "error"; } - if (svnSess.getCheckoutdir() != null) { + if (checkoutdir != null) { //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); } //if commit success user is redirect on the project page request.setAttribute(ATTRIBUTE_REDIRECTION_URL, svnSess.getProjectUrl()); @@ -285,7 +288,7 @@ log.debug("End of commit"); } //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutdir); if(log.isInfoEnabled()) { log.info(username + " with IP "+request.getRemoteAddr()+" commit the file "+address+" with message : "+commitMessage); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-28 13:55:23 UTC (rev 191) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-28 15:01:30 UTC (rev 192) @@ -13,6 +13,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; +import org.nuiton.util.FileUtil; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; @@ -114,7 +115,9 @@ */ SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + File checkoutDir = null; try { + checkoutDir = FileUtil.createTempDirectory("scm_", ""); svnSess.createCheckoutdir(); } catch (IOException e1) { if(log.isErrorEnabled()) { @@ -129,7 +132,7 @@ if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl()); } - upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + upclient.doCheckout(svnSess.getRemoteUrl(), checkoutDir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.INFINITY, false); } catch (SVNAuthenticationException authexep) { @@ -138,20 +141,20 @@ log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } //On supprime le repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); //redirect to a login page error=true; return "error"; } catch (SVNException e) { //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); error=true; return "error"; } - File checkoutDir = svnSess.getCheckoutdir(); + //On test si le chemin commence par un / si non, on l'ajoute @@ -207,7 +210,7 @@ } error=true; //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); return Action.ERROR; } @@ -229,7 +232,7 @@ } badLogin=true; //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); return Action.LOGIN; } catch (SVNException e) { @@ -238,13 +241,13 @@ } error=true; //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); return ERROR; } //Suppression du repertoire temporaire - delTempDirectory(svnSess); + delTempDirectory(checkoutDir); if(log.isDebugEnabled()) { log.debug("File upload successful");

1 0

r191 - trunk/src/main/webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org July 28, 2011

July 28, 2011

Author: kcardineaud Date: 2011-07-28 15:55:23 +0200 (Thu, 28 Jul 2011) New Revision: 191 Url: http://nuiton.org/repositories/revision/scmwebeditor/191 Log: Fix a bug : after a save and continue action, we can save without modify the file Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-28 12:38:56 UTC (rev 190) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-28 13:55:23 UTC (rev 191) @@ -48,7 +48,7 @@ </head> -<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> +<body> <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> <center> @@ -57,7 +57,7 @@ String typeEditor="null"; if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")) { %> - <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/rst.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> + <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> <% } %> </center> @@ -184,7 +184,7 @@ <input type="hidden" NAME=pw /><% }%> <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> - <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> + <input type="hidden" id="origText" name="origText" value="<%=request.getAttribute("OrigText")%>"/> <% if(request.getAttribute("lastText")!=null) { %> <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> <% } %> Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-07-28 12:38:56 UTC (rev 190) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-07-28 13:55:23 UTC (rev 191) @@ -17,4 +17,11 @@ </s:elseif> <s:else> <h4>Last change save <s:property value="formatDate" /> </h4> + <s:set id="lastRevSet" value="newText" /> + <s:hidden id="lastRev" value="%{lastRevSet}" /> + <script type="text/javascript"> + origText = document.getElementById("origText"); + origText.value = document.getElementById("lastRev").value; + + </script> </s:else> \ No newline at end of file

1 0

r190 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp/WEB-INF/content webapp/css
by kcardineaud＠users.nuiton.org July 28, 2011

July 28, 2011

Author: kcardineaud Date: 2011-07-28 14:38:56 +0200 (Thu, 28 Jul 2011) New Revision: 190 Url: http://nuiton.org/repositories/revision/scmwebeditor/190 Log: Add a verification for rst on commit Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-27 12:55:22 UTC (rev 189) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-28 12:38:56 UTC (rev 190) @@ -12,6 +12,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; +import org.nuiton.jrst.JRST; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; @@ -39,6 +40,7 @@ protected String pw; protected String address; protected String lastText; + protected String fileType; protected HttpServletRequest request; @@ -55,6 +57,14 @@ return newText; } + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + public void setNewText(String newText) { this.newText = newText; } @@ -99,9 +109,34 @@ this.lastText = lastText; } + protected boolean testRstParsing(String newText) { + try { + if(log.isDebugEnabled()) { + log.debug("RST generate success"); + } + return true; + } catch (Exception e) { + if(log.isErrorEnabled()) { + log.error("RST generate fail",e); + } + return false; + } + + + } + + public String execute() { + if(fileType.equals("rst")) { + if(!testRstParsing(newText)) { + return "errorRst"; + } + } + + + HttpSession httpSession = request.getSession(true); SvnSession svnSess = getSvnSession(httpSession); Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-27 12:55:22 UTC (rev 189) +++ trunk/src/main/resources/struts.xml 2011-07-28 12:38:56 UTC (rev 190) @@ -21,6 +21,7 @@ <result name="login" >/WEB-INF/content/modificationViewer.jsp</result> <result name="error">/WEB-INF/content/badFileRedirect.jsp</result> <result name="errorPath">/WEB-INF/content/badFileRedirect.jsp</result> + <result name="errorRst">/WEB-INF/content/badFileRedirect.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-27 12:55:22 UTC (rev 189) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-28 12:38:56 UTC (rev 190) @@ -55,14 +55,21 @@ <h2><s:text name="scm.welcome"/></h2> <% String typeEditor="null"; - if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")) { %> - <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/rst.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> - <% } %> + <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/rst.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> + <% } %> </center> <form method="post" action=commit.action id="editForm"> + <% + if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + %> + <input type="hidden" name="fileType" value="rst" /> + <% } else { %> + <input type="hidden" name="fileType" value="other" /> + <% } %> Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-07-27 12:55:22 UTC (rev 189) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-07-28 12:38:56 UTC (rev 190) @@ -9,6 +9,9 @@ <s:elseif test="result=='error'" > <h4> Can't save modification </h4> </s:elseif> + <s:elseif test="result=='errorPath'" > + <h4> Can't save modification, RST is not valid</h4> + </s:elseif> <s:elseif test="result=='uselessSave'" > <h4> It's useless to save the file, file is not modify</h4> </s:elseif> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-07-27 12:55:22 UTC (rev 189) +++ trunk/src/main/webapp/css/main.css 2011-07-28 12:38:56 UTC (rev 190) @@ -6,6 +6,11 @@ margin:auto; } + +img { + border:none; + } + .wwlbl , .wwctrl { display:inline; }

1 0

r189 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org July 27, 2011

July 27, 2011

Author: kcardineaud Date: 2011-07-27 14:55:22 +0200 (Wed, 27 Jul 2011) New Revision: 189 Url: http://nuiton.org/repositories/revision/scmwebeditor/189 Log: Add close() to a stream and remove some useless instructions Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 08:11:22 UTC (rev 188) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 12:55:22 UTC (rev 189) @@ -182,80 +182,80 @@ SVNRepository repository = null; try { - repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url ) ); - ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , pw ); - repository.setAuthenticationManager( authManager ); + repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url ) ); + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , pw ); + repository.setAuthenticationManager( authManager ); + + SVNNodeKind nodeKind = repository.checkPath( file , -1 ); + + + + + if ( nodeKind == SVNNodeKind.NONE ) { + if(log.isErrorEnabled()) { + log.error( "There is no entry at '" + url + "'." ); + } + request.setAttribute("projectUrl", projectUrl); + return "errorPath"; + + } else if ( nodeKind == SVNNodeKind.DIR ) { + if(log.isErrorEnabled()) { + log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + } + request.setAttribute("projectUrl", projectUrl); + if(log.isErrorEnabled()) { + log.error("Error with svn path or file "); + } + return "errorPath"; + } + + + ByteArrayOutputStream baos = new ByteArrayOutputStream( ); + + //On récupere le contenu du fichier, et on le met dans un outputStream + repository.getFile( file , -1 , null , baos ); + + originalText=baos.toString(); + baos.close(); - SVNNodeKind nodeKind = repository.checkPath( file , -1 ); - - - - - if ( nodeKind == SVNNodeKind.NONE ) { - if(log.isErrorEnabled()) { - log.error( "There is no entry at '" + url + "'." ); + } catch (SVNAuthenticationException authexep) { + + request.setAttribute(PARAMETER_ADDRESS, address); + + // if svn authentication failed user is redirected on login page + if(log.isDebugEnabled()) { + log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } + //redirect to a login page + return Action.LOGIN; + + } catch (SVNException e) { request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - return "errorPath"; - } else if ( nodeKind == SVNNodeKind.DIR ) { + if(log.isErrorEnabled()) { - log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + log.error("SVN error ",e); } - request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); + return "errorPath"; + } catch (IOException e) { if(log.isErrorEnabled()) { - log.error("Error with svn path or file "); + log.error("IO error ",e); } return "errorPath"; - } - + } - ByteArrayOutputStream baos = new ByteArrayOutputStream( ); - - repository.getFile( file , -1 , null , baos ); - - originalText=baos.toString(); - - - } catch (SVNAuthenticationException authexep) { - - request.setAttribute(PARAMETER_ADDRESS, address); - - // if svn authentication failed user is redirected on login page - if(log.isDebugEnabled()) { - log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); - } - //On supprime le repertoire temporaire - delTempDirectory(svnSess); - //redirect to a login page - return Action.LOGIN; - - } catch (SVNException e) { - request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - if(log.isErrorEnabled()) { - log.error("SVN error ",e); - } - return "errorPath"; - } - String mimeType =null; - try { - mimeType = getMimeType(originalText, svnSess.getFileName()); - } catch (IOException e) { - if(log.isErrorEnabled()) { - log.error("Can't get MimeType, problem when reading file",e); - } - } + try { + mimeType = getMimeType(originalText, svnSess.getFileName()); + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, problem when reading file",e); + } + } /* @@ -309,8 +309,6 @@ // Si le fichier n'est pas de type texte, on ne peut pas l'éditer if(mimeType==null || editable==false ) { request.setAttribute("projectUrl", projectUrl); - //On supprime le repertoire temporaire - delTempDirectory(svnSess); if(log.isErrorEnabled()) { log.error("Can't edit this file, mimetype : "+mimeType);

1 0

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

July 27, 2011

Author: kcardineaud Date: 2011-07-27 10:11:22 +0200 (Wed, 27 Jul 2011) New Revision: 188 Url: http://nuiton.org/repositories/revision/scmwebeditor/188 Log: Fix an issue with temp directory Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-27 08:11:22 UTC (rev 188) @@ -116,12 +116,12 @@ this.projectUrl = projectUrl; this.login = login; this.password = password; +// try { +// this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); +// } catch (IOException e) { +// e.printStackTrace(); +// } try { - this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); - } catch (IOException e) { - e.printStackTrace(); - } - try { this.remoteUrl = SVNURL.parseURIEncoded(svnPath); } catch (SVNException e) { log.debug("SVNSESS NULL"); @@ -137,14 +137,14 @@ * * @throws IOException if any io pb */ - public void cleanCheckoutDir() throws IOException { - FileUtils.deleteDirectory(getCheckoutdir()); - } +// public void cleanCheckoutDir() throws IOException { +// FileUtils.deleteDirectory(getCheckoutdir()); +// } public void updateAuthentication(String login, String password) { setLogin(login); setPassword(password); - setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(getCheckoutdir(), getLogin(), getPassword(), false)); + setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(getLogin(), getPassword())); setManager(SVNClientManager.newInstance(getSvnOption(), getAuthManager())); } @@ -160,6 +160,10 @@ return checkoutdir; } + public void createCheckoutdir() throws IOException { + this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); + } + public void setCheckoutdir(File checkoutdir) { this.checkoutdir = checkoutdir; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -110,7 +110,16 @@ svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + try { + svnSess.createCheckoutdir(); + } catch (IOException e1) { + if(log.isErrorEnabled()) { + log.error("Can't create checkoutDir",e1); + } + return "error"; + } + // Avant le commit, il faut checkout le repertoire try { checkout(svnSess); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -13,7 +13,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.tika.exception.TikaException; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; @@ -24,9 +23,9 @@ import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; -import org.xml.sax.SAXException; + import com.opensymphony.xwork2.Action; public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { @@ -257,8 +256,8 @@ log.error("Can't get MimeType, problem when reading file",e); } } - - + + /* String[] mimeTypes =null; try { @@ -291,8 +290,8 @@ if(log.isErrorEnabled()) { log.error("Can't read properties file", e ); } - editableFiles = new String[1]; - editableFiles[0] = "text"; + editableFiles = new String[1]; + editableFiles[0] = "text"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -114,7 +114,17 @@ */ SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + try { + svnSess.createCheckoutdir(); + } catch (IOException e1) { + if(log.isErrorEnabled()) { + log.error("Can't create checkoutDir",e1); + } + error=true; + return "error"; + } + try { if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl());

1 0

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

July 25, 2011

Author: kcardineaud Date: 2011-07-25 11:02:54 +0200 (Mon, 25 Jul 2011) New Revision: 187 Url: http://nuiton.org/repositories/revision/scmwebeditor/187 Log: Change exception when reading file mimetype Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:42:29 UTC (rev 186) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 09:02:54 UTC (rev 187) @@ -238,41 +238,60 @@ protected String getMimeType(File file) throws IOException, SAXException, TikaException { InputStream is = new FileInputStream(file); + String result = null; try { BodyContentHandler contenthandler = new BodyContentHandler(); Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, file.getName()); AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); - String result = metadata.get(Metadata.CONTENT_TYPE); + result = metadata.get(Metadata.CONTENT_TYPE); if(log.isDebugEnabled()) { log.debug("Mine type of " + file.getName() + " is : " + result); + } + + } catch (SAXException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, parsing error",e); } - return result; + } catch (TikaException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, tika error",e); + } } finally { is.close(); } + return result; } - protected String getMimeType(String content, String filename) throws IOException, SAXException, TikaException { + protected String getMimeType(String content, String filename) throws IOException { InputStream is = new ByteArrayInputStream(content.getBytes()); + String result = null; try { BodyContentHandler contenthandler = new BodyContentHandler(); Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, filename); AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); - String result = metadata.get(Metadata.CONTENT_TYPE); + result = metadata.get(Metadata.CONTENT_TYPE); if(log.isDebugEnabled()) { log.debug("Mine type of " + filename + " is : " + result); } - return result; + } catch (SAXException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, parsing error",e); + } + } catch (TikaException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, tika error",e); + } } finally { is.close(); } + return result; } protected String[] getMimeTypes(String content, String filename) throws IOException, SAXException, TikaException { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:42:29 UTC (rev 186) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 09:02:54 UTC (rev 187) @@ -13,6 +13,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.tika.exception.TikaException; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; @@ -23,6 +24,7 @@ import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; +import org.xml.sax.SAXException; import com.opensymphony.xwork2.Action; @@ -247,14 +249,16 @@ String mimeType =null; - try { - mimeType = getMimeType(originalText, svnSess.getFileName()); - } catch (Exception e) { - if(log.isErrorEnabled()) { - log.error("Can't get MimeType",e); - } - } + + try { + mimeType = getMimeType(originalText, svnSess.getFileName()); + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, problem when reading file",e); + } + } + /* String[] mimeTypes =null; try {

1 0

r186 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources/i18n
by kcardineaud＠users.nuiton.org July 25, 2011

July 25, 2011

Author: kcardineaud Date: 2011-07-25 10:42:29 +0200 (Mon, 25 Jul 2011) New Revision: 186 Url: http://nuiton.org/repositories/revision/scmwebeditor/186 Log: Fix an issue with Exception when reading scm.properties file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -302,7 +302,7 @@ * @param file le fichier contenant les propriétés * @return un objet Properties contenant les propriétés du fichier */ - public static Properties loadProperties(String file) throws IOException, FileNotFoundException{ + public static Properties loadProperties(String file) throws IOException { Properties properties = new Properties(); FileInputStream input = new FileInputStream(file); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.Properties; @@ -272,22 +273,23 @@ Properties properties=null; String[] editableFiles=null; - try{ - // chargement des propriétés - properties = loadProperties("src/main/resources/scm.properties"); - if(log.isDebugEnabled()) { - log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); - } - editableFiles=properties.getProperty("editableFiles").split(","); - } - catch(Exception e){ - if(log.isErrorEnabled()) { - log.error("Can't read properties file", e ); - editableFiles = new String[1]; - editableFiles[0] = "text"; - - } - } + + + try { + properties = loadProperties("src/main/resources/scm.properties"); + + if(log.isDebugEnabled()) { + log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); + } + editableFiles=properties.getProperty("editableFiles", "text").split(","); + + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + } + editableFiles = new String[1]; + editableFiles[0] = "text"; + } boolean editable =false; Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:42:29 UTC (rev 186) @@ -30,7 +30,7 @@ scm.reset=Reinitialiser scm.resetTitle=Retour a la derniere revision du fichier scm.saveAndContinue=Sauvegarder et continuer -scm.saveAndContinueTitle=Enregister les modifications sur le depot et continer d''editer le fichier +scm.saveAndContinueTitle=Enregister les modifications sur le depot et continuer d''editer le fichier scm.saveAndQuit=Sauvegarder et quitter scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte

1 0

r185 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources resources/i18n
by kcardineaud＠users.nuiton.org July 25, 2011

July 25, 2011

Author: kcardineaud Date: 2011-07-25 10:02:49 +0200 (Mon, 25 Jul 2011) New Revision: 185 Url: http://nuiton.org/repositories/revision/scmwebeditor/185 Log: Add a configuration file where can be add compatible file type Added: trunk/src/main/resources/scm.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:02:49 UTC (rev 185) @@ -46,6 +46,7 @@ import java.io.*; import java.net.MalformedURLException; import java.nio.charset.Charset; +import java.util.Properties; /** * User: chemit @@ -295,5 +296,26 @@ } } + /** + * Recuperation des propriétés dans un fichier properties + * + * @param file le fichier contenant les propriétés + * @return un objet Properties contenant les propriétés du fichier + */ + public static Properties loadProperties(String file) throws IOException, FileNotFoundException{ + Properties properties = new Properties(); + + FileInputStream input = new FileInputStream(file); + try{ + properties.load(input); + return properties; + } + + finally{ + input.close(); + } + + } + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:02:49 UTC (rev 185) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; +import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -268,9 +269,40 @@ } */ + + Properties properties=null; + String[] editableFiles=null; + try{ + // chargement des propriétés + properties = loadProperties("src/main/resources/scm.properties"); + if(log.isDebugEnabled()) { + log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); + } + editableFiles=properties.getProperty("editableFiles").split(","); + } + catch(Exception e){ + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + editableFiles = new String[1]; + editableFiles[0] = "text"; + + } + } + + boolean editable =false; + if(mimeType!=null ) { + for (String fileType : editableFiles){ + if (mimeType.matches(".*"+fileType+".*")) { + editable=true; + } + } + } + + + // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if(mimeType==null || !mimeType.matches(".*text.*|.*xml.*|.*javascript.*|.*sh.*|.*x-tex.*") ) { + if(mimeType==null || editable==false ) { request.setAttribute("projectUrl", projectUrl); //On supprime le repertoire temporaire delTempDirectory(svnSess); Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -1,5 +1,5 @@ scm.FileInEditor=File in editor \: -scm.badPathOrFileName=Bad repository path or file name\! Please correct it. +scm.badPathOrFileName=Bad repository path or file name, or the file is not editable \! Please correct it. scm.badUsernameOrPassword=Bad username or password scm.beTransferred=You should be transferred automatically to the new page. If not please scm.clickHere=click here Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -1,7 +1,7 @@ scm.FileInEditor=Fichier dans l''editeur \: -scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! +scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect, ou le fichier n''est pas editable \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect -scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non +scm.beTransferred=Vous devriez etre redirige sur une nouvelle page. si non scm.clickHere=cliquez ici scm.commitMessage=Message associe au commit scm.commitMessageTitle=laisser un message pour le commit @@ -9,7 +9,7 @@ scm.exit=Quitter scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. -scm.formTransferred=Vous devrais être redirige vers la page du formulaire. si non +scm.formTransferred=Vous devriez etre redirige vers la page du formulaire. si non scm.info.ProblemWithRst=Si vous rencontrez des problemes avec RestruturedText, visitez le scm.info.rstWebsite=site de la documentation RST scm.language=Langage Added: trunk/src/main/resources/scm.properties =================================================================== --- trunk/src/main/resources/scm.properties (rev 0) +++ trunk/src/main/resources/scm.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -0,0 +1 @@ +editableFiles=text,xml,javascript,sh,x-tex,x-java \ No newline at end of file

1 0