This is an automated email from the git hooks/post-receive script. New commit to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit dfbf3006002a8964c10f807591d8e0403902819e Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Wed May 13 14:47:20 2015 +0200 The path where the local repositories will be stored is directly given to the providers, instead of giving the session ID only --- .../org/nuiton/scmwebeditor/git/GitConnection.java | 9 ++++---- .../org/nuiton/scmwebeditor/git/GitProvider.java | 4 ++-- .../org/nuiton/scmwebeditor/api/ScmProvider.java | 4 ++-- .../org/nuiton/scmwebeditor/svn/SvnConnection.java | 10 ++++----- .../org/nuiton/scmwebeditor/svn/SvnProvider.java | 4 ++-- .../scmwebeditor/uiweb/actions/BrowseAction.java | 24 ++++------------------ .../scmwebeditor/uiweb/actions/EditAction.java | 4 +++- .../scmwebeditor/uiweb/actions/LogoutAction.java | 4 +++- .../scmwebeditor/uiweb/actions/ResetAction.java | 3 ++- .../uiweb/actions/ScmWebEditorCommitAction.java | 4 +++- .../scmwebeditor/uiweb/actions/UploadAction.java | 3 ++- 11 files changed, 32 insertions(+), 41 deletions(-) diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 38f69ed..7725c09 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -69,13 +69,13 @@ public class GitConnection implements ScmConnection { protected String fileName; /** the id of the HTTP session */ - protected String sessionId; + protected String pathToLocalRepos; /** the default branch to use when the requested one was not found */ protected static final String DEFAULT_BRANCH = "master"; - public GitConnection(String address, String sessionId) throws IOException { + public GitConnection(String address, String pathToLocalRepos) throws IOException { if(log.isDebugEnabled()) { log.debug("Git repository"); @@ -103,7 +103,7 @@ public class GitConnection implements ScmConnection { fileName = address.substring(address.lastIndexOf("/") + 1); } - this.sessionId = sessionId; + this.pathToLocalRepos = pathToLocalRepos; } @@ -731,7 +731,6 @@ public class GitConnection implements ScmConnection { throws ScmNotFoundException, IOException, AuthenticationException { // Cloning the remote repository to a local directory - String localReposPath = ScmWebEditorConfig.getLocalRepositoriesPath(); String hashedAddress = addressGit; String hashResult = hash(addressGit, "SHA-512"); @@ -740,7 +739,7 @@ public class GitConnection implements ScmConnection { hashedAddress = hashResult; } - localDirectory = new File(localReposPath + File.separator + sessionId + File.separator + hashedAddress); + localDirectory = new File(pathToLocalRepos + File.separator + hashedAddress); CredentialsProvider credentials = null; diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java index 525ef7b..9bdabe4 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java @@ -83,13 +83,13 @@ public class GitProvider implements ScmProvider { } @Override - public ScmConnection getConnection(String address, String sessionId) { + public ScmConnection getConnection(String address, String pathToLocalRepos) { GitConnection gitConn = null; this.address = address; try { - gitConn = new GitConnection(address, sessionId); + gitConn = new GitConnection(address, pathToLocalRepos); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can not connect to Git repository at " + address); diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java index 3f60775..8182654 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java @@ -44,10 +44,10 @@ public interface ScmProvider { /** * Gives the connection to the SCM * @param address the repository's address - * @param sessionId the HTTP session ID which will be used to separate each user's local files + * @param pathToLocalRepos the folder which will be used to store one client's repositories * @return the connection to the SCM */ - ScmConnection getConnection(String address, String sessionId); + ScmConnection getConnection(String address, String pathToLocalRepos); /** diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java index 2ea9e25..1058998 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java @@ -68,7 +68,7 @@ public class SvnConnection implements ScmConnection { protected DefaultSVNOptions svnOption; /** the id of the HTTP session */ - protected String sessionId; + protected String pathToLocalRepos; /** * @@ -76,7 +76,7 @@ public class SvnConnection implements ScmConnection { protected SVNClientManager manager; - public SvnConnection(String address, String sessionId) throws SVNException { + public SvnConnection(String address, String pathToLocalRepos) throws SVNException { if(log.isDebugEnabled()) { log.debug("SVN repository"); @@ -95,7 +95,7 @@ public class SvnConnection implements ScmConnection { svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); manager = SVNClientManager.newInstance(svnOption, authManager); - this.sessionId = sessionId; + this.pathToLocalRepos = pathToLocalRepos; } @@ -615,7 +615,7 @@ public class SvnConnection implements ScmConnection { String file = path.substring(path.lastIndexOf("/") + 1); // storing the file content to the user's local directory - File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId); + File localDirectory = new File(pathToLocalRepos); if (!localDirectory.exists()) { localDirectory.mkdir(); @@ -844,7 +844,7 @@ public class SvnConnection implements ScmConnection { public void createCheckoutdir() throws IOException { - File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId); + File localDirectory = new File(pathToLocalRepos); if (!localDirectory.exists()) { localDirectory.mkdir(); diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java index 414ec11..bfc14b2 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java @@ -55,12 +55,12 @@ public class SvnProvider implements ScmProvider { } @Override - public ScmConnection getConnection(String address, String sessionId) { + public ScmConnection getConnection(String address, String pathToLocalRepos) { SvnConnection svnConn = null; try { - svnConn = new SvnConnection(address, sessionId); + svnConn = new SvnConnection(address, pathToLocalRepos); } catch (SVNException e) { if (log.isErrorEnabled()) { log.error("Can not connect to SVN repository at " + address, e); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java index a377db2..e7aa635 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java @@ -38,6 +38,7 @@ import org.nuiton.scmwebeditor.api.dto.BrowseResultDto; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -53,10 +54,6 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR protected String address; - protected List<String> files; - - protected Map<String, String> directories; - protected String username; protected String pw; @@ -93,14 +90,6 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR public void setList(String list) { this.list = list; } - public List<String> getFiles() { return files; } - - public void setFiles(List<String> files) { this.files = files; } - - public Map<String, String> getDirectories() { return directories; } - - public void setDirectories(Map<String, String> directories) { this.directories = directories; } - public String getInfo() { return info; } public String getAddress() { return address; } @@ -162,12 +151,13 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR HttpSession session = request.getSession(); String sessionId = session.getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; + ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); scmSupportsBranches = provider.supportsBranches(); - ScmConnection scmConn = provider.getConnection(address, sessionId); - if (scmConn == null) { error = true; return ROOT; @@ -187,12 +177,6 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR if (resultDto.getHeadBranchName() != null) { headBranchName = resultDto.getHeadBranchName(); } - if (resultDto.getFiles() != null) { - files = resultDto.getFiles(); - } - if (resultDto.getDirectories() != null) { - directories = resultDto.getDirectories(); - } if (resultDto.getSelectedBranch() != null) { selectedBranch = resultDto.getSelectedBranch(); } diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java index 6a26321..a373bad 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java @@ -46,8 +46,10 @@ public class EditAction extends ScmWebEditorMainAction { HttpSession session = request.getSession(); String sessionId = session.getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; + ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); - ScmConnection scmConn = provider.getConnection(address, sessionId); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); scmSupportsBranches = provider.supportsBranches(); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java index 1c8e8f5..1b9f065 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java @@ -32,6 +32,7 @@ import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; public class LogoutAction extends AbstractScmWebEditorAction implements ServletRequestAware, ServletResponseAware { @@ -67,9 +68,10 @@ public class LogoutAction extends AbstractScmWebEditorAction implements ServletR public String execute() { String sessionId = request.getSession().getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); - ScmConnection scmConn = provider.getConnection(address, sessionId); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); // getting the repository unique identifier if it is possible String repositoryId = scmConn.getRepositoryId(); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java index 62b2182..db27f98 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java @@ -78,9 +78,10 @@ public class ResetAction extends AbstractScmWebEditorAction { public String execute() { String sessionId = request.getSession().getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); - ScmConnection scmConn = provider.getConnection(address, sessionId); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); // getting the repository unique identifier if it is possible String repositoryId = scmConn.getRepositoryId(); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java index ccfe6bc..7d5f6e9 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java @@ -40,6 +40,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.io.File; import java.io.StringReader; @@ -251,9 +252,10 @@ public class ScmWebEditorCommitAction extends AbstractScmWebEditorAction impleme // connection to the repository HttpSession session = request.getSession(); String sessionId = session.getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); - ScmConnection scmConn = provider.getConnection(address, sessionId); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); // if the repository is not protected for writing, we get its UUID String repositoryUUID = scmConn.getRepositoryId(); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java index 8cb8b02..5ecfe50 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java @@ -148,6 +148,7 @@ public class UploadAction extends AbstractScmWebEditorAction implements ServletR HttpSession session = request.getSession(); String sessionId = session.getId(); + String pathToLocalRepos = ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId; ScmProvider provider = ScmWebEditorConfig.getProvider(scmType); @@ -156,7 +157,7 @@ public class UploadAction extends AbstractScmWebEditorAction implements ServletR return ERROR; } - ScmConnection scmConn = provider.getConnection(address, sessionId); + ScmConnection scmConn = provider.getConnection(address, pathToLocalRepos); // if the repository is not protected for writing, we get its UUID String repositoryUUID = scmConn.getRepositoryId(); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.