Author: kcardineaud Date: 2011-08-16 10:49:20 +0200 (Tue, 16 Aug 2011) New Revision: 215 Url: http://nuiton.org/repositories/revision/scmwebeditor/215 Log: svn tree can now be use with repository that is read/write protect Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/js/pictureUpload.js Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -211,7 +211,7 @@ } upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); - + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-16 08:49:20 UTC (rev 215) @@ -155,6 +155,18 @@ return repositoryRoot; } + + + public void testConnection() throws SVNException { + SVNRepository repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(addressSvn)); + repository.setAuthenticationManager(this.authManager); + + + repository.testConnection(); + + + } + public ISVNAuthenticationManager getAuthManager() { return authManager; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -232,6 +232,9 @@ return Action.LOGIN; } catch (SVNException e) { + if(log.isErrorEnabled()) { + log.error("Can't checkout the file",e); + } //Suppression du repertoire temporaire delTempDirectory(checkoutdir); return "errorPath"; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -164,7 +164,19 @@ svnConn.updateAuthentication( username, pw); + try { + svnConn.testConnection(); + } catch (SVNException e) { + if(log.isDebugEnabled()) { + log.debug("Test connection fail",e); + } + getScmSession().delScmUser(repositoryUUID); + username = null; + pw = null; + } + + //Si il n'y a pas de fichier à uploader on retourne sur le formulaire d'upload if(upload==null) { return "redirect"; @@ -309,6 +321,7 @@ badLogin=true; //Suppression du repertoire temporaire delTempDirectory(checkoutDir); + getScmSession().delScmUser(repositoryUUID); return Action.LOGIN; } catch (SVNException e) { Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-16 08:49:20 UTC (rev 215) @@ -28,7 +28,7 @@ </s:elseif> <s:elseif test="result=='errorPath'" > - <h4> Can't save modification, RST is not valid</h4> + <h4> Can't save modification, Path Error</h4> </s:elseif> <s:elseif test="result=='uselessSave'" > <h4> It's useless to save the file, file is not modify</h4> Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-16 08:49:20 UTC (rev 215) @@ -13,6 +13,9 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>UploadFile</title> <link rel="stylesheet" type="text/css" href="css/main.css"> + + + </head> <body> @@ -23,15 +26,18 @@ var item = event.originalEvent.data.rslt.obj; if(item.text().indexOf("/") != -1) { - window.document.getElementById("svnPath").value=item.attr("id"); + window.document.getElementById("svnPath").value=item.attr("id"); } }); </script> + <s:set id="scm.upload"> + <s:text name="scm.upload"/> + </s:set> + <center><h1><s:text name="%{scm.upload}" ></s:text></h1></center> - <form method="POST" id="uploadForm" action="doUpload.action" enctype="multipart/form-data"> <label><s:text name="scm.uploadFile" /> : <input type="file" name="upload"/></label><br/> <label><s:text name="scm.uploadPath" /> : <s:textfield size="50px" type="text" name="svnPath" id="svnPath" value="%{fileRoot}" /></label><br/> @@ -39,7 +45,7 @@ <div id="searchTree"> - <s:url id="searchTreeUrl" action="search?address=%{svnRoot}" /> + <s:url id="searchTreeUrl" action="search?address=%{svnRoot}&username=%{username}&pw=%{pw}" /> <sjt:tree id="svnTree" htmlTitles="true" jstreetheme="classic" Modified: trunk/src/main/webapp/js/pictureUpload.js =================================================================== --- trunk/src/main/webapp/js/pictureUpload.js 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/js/pictureUpload.js 2011-08-16 08:49:20 UTC (rev 215) @@ -1,5 +1,5 @@ function upload_popup(page, name, fileAddress) { var address = fileAddress.value; - window.open (page+'?address='+address, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') + window.open (page+'?address='+address, name, config='top=200, left=300, height=600, width=700, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') } \ No newline at end of file