Author: glorieux Date: 2009-12-15 10:10:57 +0100 (Tue, 15 Dec 2009) New Revision: 52 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java Log: Fixed redirect url if parmaLang = paramDefaultLang. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-11-30 10:01:36 UTC (rev 51) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-12-15 09:10:57 UTC (rev 52) @@ -67,9 +67,7 @@ log.debug("Connection to SCMWebEditor"); log.debug("--------------------------"); } - HttpSession httpSession = request.getSession(true); - try { // First Part Svn checkout and JSP call @@ -91,6 +89,7 @@ } // on redirige vers la page OutConnection.jsp request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); + request.setAttribute(ATTRIBUTE_FILESEARCH_SERVLET_URL, request.getContextPath() + "/searchservlet"); log.debug("l'uri est: " + request.getRequestURI()); redirect(request, response, "/OutConnection.jsp"); return; @@ -117,6 +116,7 @@ if (paramLang.equals(paramDefaultLang)) { // on a maven site, default locale is on root relativePath = "/src/site/" + paramFormat + "/"; + paramProjectUrl = paramProjectUrl.replace("/"+paramDefaultLang+"/", "/"); } String scmPath = paramAdresse.endsWith(relativePath) ? "" : relativePath;