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