Author: kcardineaud Date: 2011-08-19 15:23:31 +0200 (Fri, 19 Aug 2011) New Revision: 235 Url: http://nuiton.org/repositories/revision/scmwebeditor/235 Log: Fix an issue with authentification in reset action Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-19 10:30:54 UTC (rev 234) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-19 13:23:31 UTC (rev 235) @@ -262,38 +262,13 @@ String lastRevision = ""; - SvnConnection svnConn = null; + SvnConnection svnConn = new SvnConnection(address); - svnConn = new SvnConnection(address); - - + String url = svnConn.getSvnPath(); String file = svnConn.getFileName(); - //Si le repo n'est pas protege en ecriture on recupere sont UUID - String repositoryUUID = svnConn.getUUID(); - if (repositoryUUID==null) { - repositoryUUID=address; - } - - if(login==null && password==null) { - if(getScmSession().getUsername(repositoryUUID)!=null && getScmSession().getPassword(repositoryUUID)!=null) { - //On recupère les identifiants en session - login = getScmSession().getUsername(repositoryUUID); - password = getScmSession().getPassword(repositoryUUID); - } - else { - login = "anonymous"; - password = "anonymous"; - } - } - else { - getScmSession().addScmUser(repositoryUUID, login , password); - } - - - SVNRepository repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url )); ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , password ); repository.setAuthenticationManager( authManager ); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-19 10:30:54 UTC (rev 234) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-19 13:23:31 UTC (rev 235) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.nuiton.scmwebeditor.SvnConnection; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNException; @@ -79,12 +80,32 @@ public String execute() { - + SvnConnection svnConn = new SvnConnection(address); + + //Si le repo n'est pas protege en ecriture on recupere sont UUID + String repositoryUUID = svnConn.getUUID(); + if (repositoryUUID==null) { + repositoryUUID=address; + } + + if(username==null && pw==null) { + if(getScmSession().getUsername(repositoryUUID)!=null && getScmSession().getPassword(repositoryUUID)!=null) { + //On recupère les identifiants en session + username = getScmSession().getUsername(repositoryUUID); + pw = getScmSession().getPassword(repositoryUUID); + } + else { + username = null; + pw = null; + } + } + + try { lastRevision = getHeadRevision(address, username, pw); - numRevision=getHeadNumberRevision(address, username, pw); + numRevision =getHeadNumberRevision(address, username, pw); } catch (SVNAuthenticationException authexep) {