Author: bleny Date: 2013-03-27 14:14:14 +0100 (Wed, 27 Mar 2013) New Revision: 48 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove hack, now login is mandatory Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-27 13:11:24 UTC (rev 47) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-27 13:14:14 UTC (rev 48) @@ -24,11 +24,9 @@ */ import com.franciaflex.magalie.MagalieApplicationConfig; -import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; -import com.franciaflex.magalie.services.service.MagalieUsersService; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; @@ -84,7 +82,7 @@ } else if (MagalieSession.class.isAssignableFrom(propertyType)) { - toInject = getMagalieSession(invocation, serviceContext); + toInject = getMagalieSession(invocation); } else if (MagalieApplicationConfig.class.isAssignableFrom(propertyType)) { @@ -115,7 +113,7 @@ } - protected MagalieSession getMagalieSession(ActionInvocation invocation, MagalieServiceContext serviceContext) { + protected MagalieSession getMagalieSession(ActionInvocation invocation) { MagalieSession session = (MagalieSession) invocation.getInvocationContext().getSession().get(MagalieSession.SESSION_PARAMETER); @@ -123,12 +121,6 @@ session = new MagalieSession(); - MagalieUsersService magalieUsersService = serviceContext.newService(MagalieUsersService.class); - - MagalieUser magalieUser = magalieUsersService.getMagalieUser("ale"); - - session.setMagalieUser(magalieUser); - invocation.getInvocationContext().getSession().put(MagalieSession.SESSION_PARAMETER, session); }