Author: mfortun Date: 2011-08-10 15:17:10 +0200 (Wed, 10 Aug 2011) New Revision: 1118 Url: http://nuiton.org/repositories/revision/wikitty/1118 Log: *correct interceptor Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java trunk/wikitty-publication/src/main/resources/struts.xml Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java 2011-08-10 12:24:11 UTC (rev 1117) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java 2011-08-10 13:17:10 UTC (rev 1118) @@ -26,6 +26,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.publication.WikittyPublicationSession; @@ -57,16 +58,22 @@ Map<String, Object> session = ActionContext.getContext().getSession(); - + + // get wikittypublication context + String context = StringUtil.split( + invocation.getProxy().getActionName(), "/")[0]; + + WikittyPublicationSession pubSession = WikittyPublicationSession - .getWikittyPublicationSession(session,"codelutin"); + .getWikittyPublicationSession(session,context); WikittyUser user = pubSession.getUser(); HttpServletRequest request = ServletActionContext.getRequest(); + // Construct redirect url. - String redirect = "codelutin/"+request.getContextPath() + error ; + String redirect = "/"+ context+request.getContextPath() + error ; redirect += "?success="+request.getServletPath(); // If the user isn't logged in Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-10 12:24:11 UTC (rev 1117) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-10 13:17:10 UTC (rev 1118) @@ -78,7 +78,7 @@ </package> <!-- Action aviable only to logged user extends="restrictedArea" --> - <package name="publication" extends="publicArea"> + <package name="publication" extends="restrictedArea"> <action name="*/edit/*" class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> @@ -115,7 +115,7 @@ </action> </package> - <package name="fragment" namespace="/fragment" extends="publicArea"> + <package name="fragment" namespace="/fragment" extends="restrictedArea"> <action name="wikittyInfo" class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> <result>/WEB-INF/jsp/wikittyInfo.jsp</result>