Author: tchemit Date: 2011-11-07 11:32:04 +0100 (Mon, 07 Nov 2011) New Revision: 14 Url: http://forge.codelutin.com/repositories/revision/echobase/14 Log: fix login + clean ui classes Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/ Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2011-11-07 10:30:22 UTC (rev 13) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2011-11-07 10:32:04 UTC (rev 14) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.ui; -import fr.ifremer.echobase.EchoBaseObjectFactory; import fr.ifremer.echobase.entities.EchoBaseUser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,46 +41,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(EchoBaseSession.class); -// /** -// * Obtain the user EchoBase session. -// * <p/> -// * If not found in application session, then will instanciate it and -// * push it in it. -// * <p/> -// * At the creation time the session, it will also set his object factory. -// * -// * @return the user EchoBase session (never null) -// */ -// public static EchoBaseSession getEchoBaseSession() { -// Map<String, Object> session = ActionContext.getContext().getSession(); -// EchoBaseSession echoBaseSession = (EchoBaseSession) -// session.get(SESSION_PARAMETER_ECHO_BASE_SESSION); -// if (echoBaseSession == null) { -// // let's create it -// echoBaseSession = new EchoBaseSession(); -// echoBaseSession.setObjectFactory(EchoBaseObjectFactory.newInstance()); -// session.put(SESSION_PARAMETER_ECHO_BASE_SESSION, echoBaseSession); -// } -// return echoBaseSession; -// } - -// /** -// * Tests if user is loggued (means the {@link #getEchoBaseUser()} is not null). -// * -// * @return {@code true} if user is loggued, {@code false} otherwise -// */ -// public static boolean isUserInSession() { -// EchoBaseSession session = getEchoBaseSession(); -// boolean result = session.getEchoBaseUser() != null; -// return result; -// } - - /** Key used to store this EchoBase session in application session */ -// public static final String SESSION_PARAMETER_ECHO_BASE_SESSION = "echobaseSession"; - - /** Key to set EchoBase factory in this session. */ - protected static final String PROPERTY_OBJECT_FACTORY = "objectFactory"; - /** Key to set User connected in this session. */ protected static final String PROPERTY_ECHO_BASE_USER = "echobaseUser"; @@ -89,24 +48,6 @@ protected Map<String, Object> store; /** - * Gets the object factory dedicated for this user. - * - * @return the user's object factory or {@code null} if not in session - */ - public EchoBaseObjectFactory getObjectFactory() { - return get(PROPERTY_OBJECT_FACTORY, EchoBaseObjectFactory.class); - } - - /** - * Sets in this session the object factory. - * - * @param objectFactory the new object factory to use in this session - */ - public void setObjectFactory(EchoBaseObjectFactory objectFactory) { - set(PROPERTY_OBJECT_FACTORY, objectFactory); - } - - /** * Gets the informations of user as soon as the user is loggued. * * @return the informations of loggued user or {@code null} if not in session Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-07 10:30:22 UTC (rev 13) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-07 10:32:04 UTC (rev 14) @@ -23,15 +23,12 @@ */ package fr.ifremer.echobase.ui.actions; -import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.EchoBaseConfiguration; -import fr.ifremer.echobase.EchoBaseObjectFactory; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceContextImpl; import fr.ifremer.echobase.services.EchoBaseServiceFactory; -import fr.ifremer.echobase.services.IOCService; import fr.ifremer.echobase.ui.EchoBaseApplicationContext; import fr.ifremer.echobase.ui.EchoBaseSession; import org.nuiton.topia.TopiaContext; @@ -122,13 +119,6 @@ return getEchoBaseApplicationContext().getConfiguration().getApplicationVersion().toString(); } - public EchoBaseObjectFactory getServiceFactory() { - Preconditions.checkNotNull(echoBaseSession, - "No echo base user session injected."); - EchoBaseObjectFactory factory = echoBaseSession.getObjectFactory(); - return factory; - } - /** * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni * à la fabrication d'un service. @@ -162,18 +152,6 @@ this.transaction = transaction; } - public IOCService getIocService() { - return getServiceFactory().newService(IOCService.class); - } - - protected void injectExcept(Class<?>... annotations) throws Exception { - getIocService().injectExcept(this, annotations); - } - - protected void injectOnly(Class<?>... annotations) throws Exception { - getIocService().injectOnly(this, annotations); - } - public String formatDate(Date date) { String result = getDateFormat().format(date); return result; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2011-11-07 10:30:22 UTC (rev 13) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2011-11-07 10:32:04 UTC (rev 14) @@ -32,7 +32,7 @@ * Check user login. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class LoginValidator extends EchoBaseFieldValidatorSupport { @@ -42,7 +42,7 @@ UserService userService = (UserService) getFieldValue("userService", object); - String login = (String) getFieldValue("login", object); + String login = (String) getFieldValue("email", object); String password = (String) getFieldValue("password", object); if (log.isInfoEnabled()) { @@ -56,14 +56,14 @@ if (user == null) { // user not found - addFieldError("login", _("t3.error.login.unknown")); + addFieldError("email", _("echobase.error.login.unknown")); return; } boolean passwordOk = userService.checkPassword(user, password); if (!passwordOk) { - addFieldError("password", _("t3.error.bad.password")); + addFieldError("password", _("echobase.error.bad.password")); } } catch (Exception e) { if (log.isErrorEnabled()) { Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-07 10:30:22 UTC (rev 13) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-07 10:32:04 UTC (rev 14) @@ -38,8 +38,7 @@ <result name="input">/WEB-INF/jsp/user/login.jsp</result> <result name="error">/WEB-INF/jsp/user/login.jsp</result> <result name="redirect" type="redirect">${redirectAction}</result> - <interceptor-ref name="topiaTransaction"/> - <interceptor-ref name="basicStack"/> + <interceptor-ref name="echoBaseParamsPrepareParamsStack"/> </action> <!-- logout action --> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-07 10:30:22 UTC (rev 13) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-07 10:32:04 UTC (rev 14) @@ -6,6 +6,8 @@ echobase.common.email=Email echobase.common.password=Mot de passe echobase.common.save=Sauvegarder +echobase.error.bad.password=Mot de passe incorrrect +echobase.error.login.unknown=Utilisateur inconnu echobase.export.queryDescription=Description echobase.export.queryName=Nom echobase.export.querySql=SQL @@ -27,5 +29,3 @@ echobase.title.login=Connection echobase.title.users=Adminitration des utilisateurs echobase.user.gridTitle=Liste des utilisateurs -t3.error.bad.password= -t3.error.login.unknown=