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

r166 - in trunk: . src/main/java/org/nuiton/scmwebeditor src/main/java/org/nuiton/scmwebeditor/actions src/main/webapp/WEB-INF
by kcardineaud＠users.nuiton.org 07 Jul '11

07 Jul '11

Author: kcardineaud Date: 2011-07-07 17:01:43 +0200 (Thu, 07 Jul 2011) New Revision: 166 Url: http://nuiton.org/repositories/revision/scmwebeditor/166 Log: ScmWebEditor can now be use with svn protocol repository Added: trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/WEB-INF/web.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/pom.xml 2011-07-07 15:01:43 UTC (rev 166) @@ -44,7 +44,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.3.2-1</version> + <version>1.3.5</version> </dependency> <dependency> Added: trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java 2011-07-07 15:01:43 UTC (rev 166) @@ -0,0 +1,24 @@ +package org.nuiton.scmwebeditor; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl; + +public class ApplicationListener implements ServletContextListener { + + @Override + public void contextInitialized(ServletContextEvent sce) { + SVNRepositoryFactoryImpl.setup(); + DAVRepositoryFactory.setup(); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + // Nothing + + } + +} Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 15:01:43 UTC (rev 166) @@ -23,6 +23,7 @@ import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl; import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; @@ -164,6 +165,9 @@ if(id.equals("")) { try { + log.info("Address svn : "+address); + + repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( address ) ); authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); repository.setAuthenticationManager( authManager ); @@ -177,7 +181,7 @@ return "authError"; } catch (SVNException e) { if(log.isErrorEnabled()) { - log.error("Can't access to the repository"); + log.error("Can't access to the repository",e); } error="Can't access to the repository"; } Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-07-07 15:01:43 UTC (rev 166) @@ -18,52 +18,9 @@ <welcome-file>index.jsp</welcome-file> </welcome-file-list> -  + <listener> + <description>Init</description> + <listener-class>org.nuiton.scmwebeditor.ApplicationListener</listener-class> + </listener> - - - - - - - - - - - </web-app>

1 0

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

07 Jul '11

Author: kcardineaud Date: 2011-07-07 16:00:26 +0200 (Thu, 07 Jul 2011) New Revision: 165 Url: http://nuiton.org/repositories/revision/scmwebeditor/165 Log: ScmwebEditor use stream to get the file content to edit, faster than checkout the directory Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-07 10:31:09 UTC (rev 164) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-07 14:00:26 UTC (rev 165) @@ -236,7 +236,7 @@ protected String getMineType(File file) throws IOException, SAXException, TikaException { - FileInputStream is = new FileInputStream(file); + InputStream is = new FileInputStream(file); try { BodyContentHandler contenthandler = new BodyContentHandler(); Metadata metadata = new Metadata(); @@ -251,5 +251,22 @@ is.close(); } } + + protected String getMineType(String content, String filename) throws IOException, SAXException, TikaException { + InputStream is = new ByteArrayInputStream(content.getBytes()); + 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); + log.info("Mine type of " + filename + " is : " + result); + return result; + } + finally { + is.close(); + } + } } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-07 10:31:09 UTC (rev 164) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-07 14:00:26 UTC (rev 165) @@ -1,13 +1,11 @@ package org.nuiton.scmwebeditor.actions; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; +import java.io.ByteArrayOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.commons.io.FileUtils; + import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,7 +14,13 @@ import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.SVNNodeKind; +import org.tmatesoft.svn.core.SVNURL; +import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.io.SVNRepository; +import org.tmatesoft.svn.core.io.SVNRepositoryFactory; +import org.tmatesoft.svn.core.wc.SVNWCUtil; import com.opensymphony.xwork2.Action; @@ -162,34 +166,84 @@ DAVRepositoryFactory.setup(); -// Checkout svn and file organisation + String originalText =""; + + + String login = svnSess.getLogin(); + String pw = svnSess.getPassword(); + String url = svnSess.getSvnPath(); + String file = svnSess.getFileName(); + + if(login==null && pw==null) { + login = "anonymous"; + pw = "anonymous"; + } + + SVNRepository repository = null; + try { - checkout(svnSess); - } 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()); + 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 + "'." ); } - //On supprime le repertoire temporaire + request.setAttribute("projectUrl", projectUrl); + //Suppression du repertoire temporaire delTempDirectory(svnSess); - //redirect to a login page - return Action.LOGIN; - - } catch (SVNException e) { + 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); //Suppression du repertoire temporaire delTempDirectory(svnSess); return "errorPath"; } + + ByteArrayOutputStream baos = new ByteArrayOutputStream( ); + + repository.getFile( file , -1 , null , baos ); + + originalText=baos.toString(); + - File CheckOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + } 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); + return "errorPath"; + } + + + + String mineType =null; try { - mineType = getMineType(CheckOutFile); + mineType = getMineType(originalText, svnSess.getFileName()); } catch (Exception e) { if(log.isErrorEnabled()) { log.error("Can't get MimeType",e); @@ -210,39 +264,24 @@ } - try { - String originalText = FileUtils.readFileToString(CheckOutFile); - request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); - 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)); - request.setAttribute(ATTRIBUTE_IS_LOGIN, (svnSess.getLogin() != null && svnSess.getPassword() != null && !svnSess.getLogin().equalsIgnoreCase("") && !svnSess.getPassword().equalsIgnoreCase(""))); - request.setAttribute(ATTRIBUTE_PROJECT_URL, svnSess.getProjectUrl()); - request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl()); - if (log.isDebugEnabled()) { - log.debug("l'url est : " + svnSess.getScmEditorUrl()); - } - request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); - request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); + - // End on first part - - } catch (FileNotFoundException ee) { - /* fichier non trouve, on redirige vers BadFileRedirect.jsp - * après avoir supprimé le repertoire temporaire - */ - delTempDirectory(svnSess); - request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl()); - return "errorPath"; - } catch (IOException e) { - log.error("Can't find the checkout file",e); + request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + 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)); + request.setAttribute(ATTRIBUTE_IS_LOGIN, (svnSess.getLogin() != null && svnSess.getPassword() != null && !svnSess.getLogin().equalsIgnoreCase("") && !svnSess.getPassword().equalsIgnoreCase(""))); + request.setAttribute(ATTRIBUTE_PROJECT_URL, svnSess.getProjectUrl()); + request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl()); + if (log.isDebugEnabled()) { + log.debug("l'url est : " + svnSess.getScmEditorUrl()); } + request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); + request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); - //On supprime le repertoire temporaire - delTempDirectory(svnSess); return "editPage"; + - } Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-07-07 10:31:09 UTC (rev 164) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-07 14:00:26 UTC (rev 165) @@ -100,7 +100,6 @@ - <script type='text/javascript'> selectLanguage('<%=((String) request.getAttribute("minetype"))%>','<%=request.getAttribute("format")%>' ); changeModeBy(editor, document.getElementById('language')); @@ -125,7 +124,7 @@ <div id="htmlcontentCommit"></div> - <p>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></p> + <label>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></label> <%if (request.getAttribute("IsLogin").equals(false) == true){ %> @@ -163,6 +162,7 @@ button="true" buttonIcon="ui-icon-refresh" value="Save and Continue Editing" + title="Commit modifications and continue editing the file" > </sj:submit> @@ -179,16 +179,17 @@ href="%{ajaxPreview}" button="true" buttonIcon="ui-icon-refresh" - value="Preview" + value="Preview" > </sj:submit> <%}%> <sj:submit + title="Go back to the last revision of the file" id="resetButton" targets="resetResult" - value="Reset Ajax" + value="Reset" button="true" href="reset.action" /> @@ -204,7 +205,7 @@ </div> </form> <center> - <button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> + <button title="Upload a file on the repository" onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> </center> <div>

1 0

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

07 Jul '11

Author: kcardineaud Date: 2011-07-07 12:31:09 +0200 (Thu, 07 Jul 2011) New Revision: 164 Url: http://nuiton.org/repositories/revision/scmwebeditor/164 Log: The default language in editor is now select only with javascript instead of java/javascript Added: trunk/src/main/webapp/selectLanguage.js Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 09:25:04 UTC (rev 163) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 10:31:09 UTC (rev 164) @@ -127,7 +127,6 @@ if(log.isInfoEnabled()) { log.info("Enter in search action"); - log.info("username : "+username+" pw : "+pw); } Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-07-07 09:25:04 UTC (rev 163) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-07 10:31:09 UTC (rev 164) @@ -11,6 +11,8 @@ <head> <title>SCMWebEditor</title> + <script src="selectLanguage.js"></script> +   @@ -75,8 +77,18 @@ <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> + + + <script type="text/javascript"> + var textarea = document.getElementById('newTextId'); + var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } + var codeMirrorOptions = { mode: "null" } + var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); + </script> + + <label>Language : - <select id="language" name="langageSelection" onchange="changeModeBy(this)"> + <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)"> <option value="null">Text</option> <option value="rst">ReStructuredText</option> <option value="javascript">Javascript</option> @@ -86,101 +98,16 @@ </select> </label> - <% - if(typeEditor.equals("null") && request.getAttribute("minetype")!=null) { - if(( (String) request.getAttribute("minetype")).contains("rst") ) { - typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% - } - else if(( (String) request.getAttribute("minetype")).contains("javascript")) { - typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% - } - else if(( (String) request.getAttribute("minetype")).contains("html") ) { - typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } - else if(( (String) request.getAttribute("minetype")).contains("xml") ) { - typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } - } - if (typeEditor.equals("null") && request.getAttribute("format")!=null){ - - - if (request.getAttribute("format").equals("rst")) { - typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% } else if(request.getAttribute("format").equals("javascript")) { - typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% } else if(request.getAttribute("format").equals("html")) { - typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } else if(request.getAttribute("format").equals("xml")) { - typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } else if(request.getAttribute("format").equals("java")) { - typeEditor="text/x-java"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=5 - </script> - <% - } - - } -%> + + <script type='text/javascript'> + selectLanguage('<%=((String) request.getAttribute("minetype"))%>','<%=request.getAttribute("format")%>' ); + changeModeBy(editor, document.getElementById('language')); + </script> - <script type="text/javascript"> - var textarea = document.getElementById('newTextId'); - var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } - var codeMirrorOptions = { mode: "<%=typeEditor%>" } - var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); - </script> - - - <script type="text/javascript"> - function changeModeBy(select){ - editor.mirror.setOption("mode",select.value); - //editor.reindent(); - } - </script> - <script type="text/javascript"> function loadChange(){ document.getElementById('newTextId').value = editor.mirror.getValue(); } Added: trunk/src/main/webapp/selectLanguage.js =================================================================== --- trunk/src/main/webapp/selectLanguage.js (rev 0) +++ trunk/src/main/webapp/selectLanguage.js 2011-07-07 10:31:09 UTC (rev 164) @@ -0,0 +1,92 @@ +/** + * + */ + + +function contains(text, test) { + + if(text.indexOf(test) == -1) { + return false; + } + else { + return true; + } +} + + + +function changeModeBy(CodeMirrorEditor, select){ + CodeMirrorEditor.mirror.setOption("mode",select.value); +} + + + +function selectLanguage(minetype, format) { + + var typeEditor = null; + + if(typeEditor==null && minetype!=null) { + + if(contains(minetype, "rst") ) { + typeEditor="rst"; + document.getElementById('language').selectedIndex=1 + } + else if(contains(minetype, "javascript")) { + typeEditor="javascript"; + document.getElementById('language').selectedIndex=2 + } + else if(contains(minetype, "html") ) { + typeEditor="text/html"; + + + document.getElementById('language').selectedIndex=3 + + + } + else if( contains(minetype, "xml") ) { + typeEditor="xml"; + + + document.getElementById('language').selectedIndex=4 + + + } + } + + if (typeEditor==null && format!=null){ + + + if (format==("rst")) { + typeEditor="rst"; + + + document.getElementById('language').selectedIndex=1 +// var element = document.getElementById('language'); +// element.value = "rst"; + + } else if(format==("javascript")) { + typeEditor="javascript"; + + document.getElementById('language').selectedIndex=2 + + } else if(format==("html")) { + typeEditor="text/html"; + + document.getElementById('language').selectedIndex=3 + + } else if(format==("xml")) { + typeEditor="xml"; + + document.getElementById('language').selectedIndex=4 + + } else if(format==("java")) { + typeEditor="text/x-java"; + + document.getElementById('language').selectedIndex=5 + + } + + } + + +} \ No newline at end of file

1 0

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

07 Jul '11

Author: kcardineaud Date: 2011-07-07 11:25:04 +0200 (Thu, 07 Jul 2011) New Revision: 163 Url: http://nuiton.org/repositories/revision/scmwebeditor/163 Log: Add a method to checkout a file with a SvnSession 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/ScmWebEditorMainAction.java trunk/src/main/resources/struts.xml Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-06 15:58:11 UTC (rev 162) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-07 09:25:04 UTC (rev 163) @@ -34,6 +34,10 @@ import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.sax.BodyContentHandler; +import org.tmatesoft.svn.core.SVNDepth; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; import org.xml.sax.SAXException; import com.opensymphony.xwork2.ActionSupport; @@ -180,6 +184,20 @@ } } + + public void checkout(SvnSession svnSess) 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(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + + } + + public void delTempDirectory(SvnSession svnSess) { try { FileUtils.deleteDirectory(svnSess.getCheckoutdir()); @@ -205,12 +223,7 @@ return tmp_dir; } -/* - protected void redirect(HttpServletRequest request, HttpServletResponse response, String path) throws IOException, ServletException { - RequestDispatcher requestDispacher = getServletContext().getRequestDispatcher(path); - requestDispacher.forward(request, response); - } -*/ + protected String getRedirectUrl(SvnSession svnSess) { StringBuilder buffer = new StringBuilder(); buffer.append(svnSess.getScmEditorUrl()); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-06 15:58:11 UTC (rev 162) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-07 09:25:04 UTC (rev 163) @@ -18,11 +18,12 @@ import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.wc.SVNCommitClient; -import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import com.opensymphony.xwork2.Action; + + public class ScmWebEditorCommitAction extends ScmWebEditorBaseAction implements ServletRequestAware { /** * @@ -110,41 +111,34 @@ svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); - - /* - * Checkout process - */ - SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); - - try { - if (log.isDebugEnabled()) { - log.debug("Do Checkout of " + svnSess.getRemoteUrl()); - } - upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), - SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + checkout(svnSess); } 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 "authError"; - + 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) { - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - return "error"; + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return "errorPath"; } + + + File checkOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + lastText=newText; - File CheckOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); try { - String originalText = FileUtils.readFileToString(CheckOutFile); + String originalText = FileUtils.readFileToString(checkOutFile); request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); request.setAttribute("lastText", lastText); request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); @@ -223,7 +217,7 @@ request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); //Suppression du repertoire temporaire delTempDirectory(svnSess); - return "authError"; + return Action.LOGIN; } catch (SVNException e) { if(log.isErrorEnabled()) { log.error("SVN FAIL",e); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-06 15:58:11 UTC (rev 162) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-07 09:25:04 UTC (rev 163) @@ -15,11 +15,8 @@ import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; -import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNUpdateClient; import com.opensymphony.xwork2.Action; @@ -34,11 +31,9 @@ protected String projectUrl; protected String format; - protected String username; protected String pw; - - + protected HttpServletRequest request; @@ -165,17 +160,11 @@ DAVRepositoryFactory.setup(); - SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + - - // Checkout svn and file organisation try { - if (log.isDebugEnabled()) { - log.debug("Do Checkout of " + svnSess.getRemoteUrl()); - } - upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), - SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + checkout(svnSess); } catch (SVNAuthenticationException authexep) { request.setAttribute(PARAMETER_ADDRESS, address); Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-06 15:58:11 UTC (rev 162) +++ trunk/src/main/resources/struts.xml 2011-07-07 09:25:04 UTC (rev 163) @@ -17,8 +17,9 @@ <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="login" >/ModificationViewer.jsp</result> <result name="error">/BadFileRedirect.jsp</result> + <result name="errorPath">/BadFileRedirect.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save">

1 0

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

06 Jul '11

Author: kcardineaud Date: 2011-07-06 17:58:11 +0200 (Wed, 06 Jul 2011) New Revision: 162 Url: http://nuiton.org/repositories/revision/scmwebeditor/162 Log: ResetAction does not download the file anymore, but use stream (faster) Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java trunk/src/main/resources/struts.xml Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-06 14:21:39 UTC (rev 161) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-06 15:58:11 UTC (rev 162) @@ -1,23 +1,22 @@ package org.nuiton.scmwebeditor.actions; -import java.io.File; -import java.io.IOException; +import java.io.ByteArrayOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; -import org.tmatesoft.svn.core.SVNAuthenticationException; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; -import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import org.tmatesoft.svn.core.SVNNodeKind; +import org.tmatesoft.svn.core.SVNURL; +import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; +import org.tmatesoft.svn.core.io.SVNRepository; +import org.tmatesoft.svn.core.io.SVNRepositoryFactory; +import org.tmatesoft.svn.core.wc.SVNWCUtil; import com.opensymphony.xwork2.Action; @@ -40,65 +39,67 @@ public String execute() { - try { HttpSession httpSession = request.getSession(true); SvnSession svnSess = getSvnSession(httpSession); - DAVRepositoryFactory.setup(); - SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + String login = svnSess.getLogin(); + String pw = svnSess.getPassword(); + String url = svnSess.getSvnPath(); + String file = svnSess.getFileName(); -// Checkout svn and file organisation - try { - if (log.isDebugEnabled()) { - log.debug("Do Checkout of " + svnSess.getRemoteUrl()); - } - upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), - SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); - } catch (SVNAuthenticationException authexep) { - - - // if svn authentication failed user is redirected on login page - - //On supprime le repertoire temporaire - delTempDirectory(svnSess); - //redirect to a login page - return Action.LOGIN; - - } catch (SVNException e) { - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - return "errorPath"; + if(login==null && pw==null) { + login = "anonymous"; + pw = "anonymous"; } + SVNRepository repository = null; + + try { + repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url ) ); + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , pw ); + repository.setAuthenticationManager( authManager ); - File checkOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + SVNNodeKind nodeKind = repository.checkPath( file , -1 ); + - try { - lastRevision = FileUtils.readFileToString(checkOutFile); - } catch (IOException e) { + if ( nodeKind == SVNNodeKind.NONE ) { if(log.isErrorEnabled()) { - log.error("Can't read this file",e); + log.error( "There is no entry at '" + url + "'." ); } + return Action.SUCCESS; + } else if ( nodeKind == SVNNodeKind.DIR ) { + if(log.isErrorEnabled()) { + log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + } + return Action.SUCCESS; } + - //On supprime le repertoire temporaire - delTempDirectory(svnSess); + ByteArrayOutputStream baos = new ByteArrayOutputStream( ); + + repository.getFile( file , -1 , null , baos ); + + lastRevision=baos.toString(); + + } + catch (SVNException e) { + if(log.isErrorEnabled()) { + log.error("Can't reach the svn repository"); + return "errorPath"; + } + } if(log.isInfoEnabled()) { - log.info("Reset success !"); + } return Action.SUCCESS; - } - catch(Exception e) { - log.error("erreur", e); - return "erreur"; - } + } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-06 14:21:39 UTC (rev 161) +++ trunk/src/main/resources/struts.xml 2011-07-06 15:58:11 UTC (rev 162) @@ -46,8 +46,6 @@ </action> - - <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="search"> <param name="address"/> <result name="root" >Search.jsp</result>

1 0

r161 - 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 16:21:39 +0200 (Wed, 06 Jul 2011) New Revision: 161 Url: http://nuiton.org/repositories/revision/scmwebeditor/161 Log: Search tree can now be use with read/write lock svn 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-06 12:50:06 UTC (rev 160) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-06 14:21:39 UTC (rev 161) @@ -34,9 +34,7 @@ public class SearchAction extends ScmWebEditorBaseAction { - /** - * - */ + private static final long serialVersionUID = 4432027215087932750L; @@ -129,6 +127,7 @@ if(log.isInfoEnabled()) { log.info("Enter in search action"); + log.info("username : "+username+" pw : "+pw); } @@ -137,20 +136,8 @@ 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"; @@ -172,9 +159,45 @@ SVNRepository repository = null; + ISVNAuthenticationManager authManager = null; + + + if(id.equals("")) { + + try { + repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( address ) ); + authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); + repository.setAuthenticationManager( authManager ); + + repository.testConnection(); + + } catch (SVNAuthenticationException e) { + if(log.isErrorEnabled()) { + log.error("Can't access to the repository : Auth Problem"); + } + return "authError"; + } catch (SVNException e) { + if(log.isErrorEnabled()) { + log.error("Can't access to the repository"); + } + error="Can't access to the repository"; + } + + return "root"; + } + else if(id.equals("0")) { + url=address; + } + else { + url=id; + address=id; + } + + try { + repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( url ) ); - ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); + authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); repository.setAuthenticationManager( authManager ); if(log.isInfoEnabled()) { @@ -245,7 +268,7 @@ error="Can't access to the repository"; } - log.info("Success"); + log.info("Search success"); return Action.SUCCESS; } Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-06 12:50:06 UTC (rev 160) +++ trunk/src/main/webapp/Search.jsp 2011-07-06 14:21:39 UTC (rev 161) @@ -27,13 +27,16 @@ <s:set name="address"> <s:property value="address"/> </s:set> + <s:set name="username"> + <s:property value="username"/> + </s:set> + <s:set name="pw"> + <s:property value="pw"/> + </s:set> - <s:url id="searchTreeUrl" action="search?address=%{address}"/> - - + <s:url id="searchTreeUrl" action="search?address=%{address}&username=%{username}&pw=%{pw}" /> <sjt:tree id="svnTree" - htmlTitles="true" jstreetheme="classic" href="%{searchTreeUrl}"

1 0

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

06 Jul '11

Author: kcardineaud Date: 2011-07-06 14:50:06 +0200 (Wed, 06 Jul 2011) New Revision: 160 Url: http://nuiton.org/repositories/revision/scmwebeditor/160 Log: Reset Action put the last revision of the file in the editor Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java trunk/src/main/webapp/reset.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-06 09:05:42 UTC (rev 159) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-06 12:50:06 UTC (rev 160) @@ -224,14 +224,19 @@ protected String getMineType(File file) throws IOException, SAXException, TikaException { FileInputStream is = new FileInputStream(file); - 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); - log.info("Mine type of " + file.getName() + " is : " + result); - return result; + 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); + log.info("Mine type of " + file.getName() + " is : " + result); + return result; + } + finally { + is.close(); + } } } Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-06 12:50:06 UTC (rev 160) @@ -0,0 +1,112 @@ +package org.nuiton.scmwebeditor.actions; + +import java.io.File; +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.nuiton.scmwebeditor.SvnSession; +import org.tmatesoft.svn.core.SVNAuthenticationException; +import org.tmatesoft.svn.core.SVNDepth; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; + +import com.opensymphony.xwork2.Action; + +public class ResetAction extends ScmWebEditorBaseAction implements ServletRequestAware { + + + private static final long serialVersionUID = -1154924826535371319L; + + private static final Log log = LogFactory.getLog(ResetAction.class); + + protected HttpServletRequest request; + + protected String lastRevision; + + + public String getLastRevision() { + return lastRevision; + } + + + + public String execute() { + try { + + HttpSession httpSession = request.getSession(true); + + SvnSession svnSess = getSvnSession(httpSession); + + + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + +// Checkout svn and file organisation + try { + if (log.isDebugEnabled()) { + log.debug("Do Checkout of " + svnSess.getRemoteUrl()); + } + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { + + + // if svn authentication failed user is redirected on login page + + //On supprime le repertoire temporaire + delTempDirectory(svnSess); + //redirect to a login page + return Action.LOGIN; + + } catch (SVNException e) { + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return "errorPath"; + } + + + File checkOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + try { + lastRevision = FileUtils.readFileToString(checkOutFile); + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't read this file",e); + } + } + + //On supprime le repertoire temporaire + delTempDirectory(svnSess); + + + if(log.isInfoEnabled()) { + log.info("Reset success !"); + } + + return Action.SUCCESS; + } + catch(Exception e) { + log.error("erreur", e); + return "erreur"; + } + + } + + + + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; + } + + +} Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-06 09:05:42 UTC (rev 159) +++ trunk/src/main/resources/struts.xml 2011-07-06 12:50:06 UTC (rev 160) @@ -25,6 +25,10 @@ <result>/Save.jsp</result> </action> + <action name="reset" class="org.nuiton.scmwebeditor.actions.ResetAction" > + <result>/reset.jsp</result> + </action> + <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" > <result>/uploadSuccess.jsp</result> <result name="login" >/uploadForm.jsp</result> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-07-06 09:05:42 UTC (rev 159) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-06 12:50:06 UTC (rev 160) @@ -250,7 +250,6 @@ formIds="editForm" targets="htmlcontentPreview" href="%{ajaxPreview}" - indicator="indicator" button="true" buttonIcon="ui-icon-refresh" value="Preview" @@ -259,7 +258,16 @@ <%}%> - <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" /> + <sj:submit + id="resetButton" + targets="resetResult" + value="Reset Ajax" + button="true" + href="reset.action" + /> + <div id="resetResult"></div> + +  <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirect(this.form.ProjectUrl);"/> Added: trunk/src/main/webapp/reset.jsp =================================================================== --- trunk/src/main/webapp/reset.jsp (rev 0) +++ trunk/src/main/webapp/reset.jsp 2011-07-06 12:50:06 UTC (rev 160) @@ -0,0 +1,12 @@ +<%@ taglib prefix="s" uri="/struts-tags"%> + + <s:set name="lastRevision"> + <s:property value="lastRevision"/> + </s:set> + + <s:hidden id="valueOfLastRevision" value="%{lastRevision}" /> + <script type="text/javascript"> + + editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); + + </script> \ No newline at end of file

1 0

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