branch develop updated (c978066 -> 5e4332f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from c978066 Improve the reload of the page when doing an operation on the repository through the popup windows new 5e4332f Fix the bug which appeared when trying to access a file with accents in its path The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5e4332f083188f800c31feb43724b14cf5fa4878 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 14:10:02 2015 +0200 Fix the bug which appeared when trying to access a file with accents in its path Summary of changes: .../java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java | 2 ++ .../main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java | 5 +++++ .../java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java | 2 ++ .../java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java | 2 ++ .../nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java | 2 ++ .../java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java | 2 ++ 9 files changed, 21 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 5e4332f083188f800c31feb43724b14cf5fa4878 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 14:10:02 2015 +0200 Fix the bug which appeared when trying to access a file with accents in its path --- .../java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java | 2 ++ .../main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java | 5 +++++ .../java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java | 2 ++ .../org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java | 2 ++ .../java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java | 2 ++ .../nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java | 2 ++ .../java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java | 2 ++ 9 files changed, 21 insertions(+) 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 e2e790c..90bd8a9 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 @@ -37,6 +37,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -238,6 +239,7 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } if (username != null && pw != null) { diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java index ab66bf4..b165587 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateBranchAction.java @@ -32,6 +32,7 @@ import javax.naming.AuthenticationException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; import java.util.List; /** @@ -122,6 +123,7 @@ public class CreateBranchAction extends AbstractScmWebEditorAction implements Se String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java index 665870a..ac53be0 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/CreateDirectoryAction.java @@ -33,6 +33,7 @@ import org.nuiton.scmwebeditor.api.dto.result.CreateDirectoryResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; /** * Creates a new directory in the repository @@ -154,6 +155,7 @@ public class CreateDirectoryAction extends AbstractScmWebEditorAction implements String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); 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 f695d2d..980d8ba 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 @@ -37,6 +37,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpSession; import java.io.File; import java.io.IOException; +import java.text.Normalizer; import java.util.LinkedList; /** @@ -100,6 +101,10 @@ public class EditAction extends ScmWebEditorMainAction { String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); + if (log.isDebugEnabled()) { + log.debug("mydebug nom de cookie : " + repositoryUUID); + } } directoryPath = address.substring(0, address.lastIndexOf('/')); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java index 1241515..269327c 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/MoveFileAction.java @@ -33,6 +33,7 @@ import org.nuiton.scmwebeditor.api.dto.result.MoveFileResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; /** * Moves a file in the repository @@ -162,6 +163,7 @@ public class MoveFileAction extends AbstractScmWebEditorAction implements Servle String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java index 244b99e..c53b2ae 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java @@ -33,6 +33,7 @@ import org.nuiton.scmwebeditor.api.dto.result.RemoveDirectoryResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; /** * Removes a directory on the repository @@ -147,6 +148,7 @@ public class RemoveDirectoryAction extends AbstractScmWebEditorAction implements String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java index d8f4d4d..c3d6fc0 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveFileAction.java @@ -33,6 +33,7 @@ import org.nuiton.scmwebeditor.api.dto.result.RemoveFileResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; /** * Removes a file from the repository @@ -147,6 +148,7 @@ public class RemoveFileAction extends AbstractScmWebEditorAction implements Serv String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); 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 14ddd19..6346945 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 @@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.File; import java.io.StringReader; +import java.text.Normalizer; /** * Commits all the changes to the remote repository @@ -237,6 +238,7 @@ public class ScmWebEditorCommitAction extends AbstractScmWebEditorAction impleme String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java index 9841096..a8c6569 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadFileAction.java @@ -33,6 +33,7 @@ import org.nuiton.scmwebeditor.api.dto.result.UploadFileResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; +import java.text.Normalizer; /** * Uploads a file from the client to the repository @@ -183,6 +184,7 @@ public class UploadFileAction extends AbstractScmWebEditorAction implements Serv String repositoryUUID = scmConn.getRepositoryId(); if (repositoryUUID == null) { repositoryUUID = address.replace(' ', '_'); + repositoryUUID = Normalizer.normalize(repositoryUUID, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } String[] usernamePw = getUsernamePwFromSession(repositoryUUID, username, pw); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm