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());
participants (1)
-
kcardineaud＠users.nuiton.org