Author: echatellier Date: 2014-06-10 10:14:35 +0200 (Tue, 10 Jun 2014) New Revision: 173 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/173 Log: Introduce demo user for session Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:14:35 UTC (rev 173) @@ -128,17 +128,19 @@ @Override public void contextDestroyed(ServletContextEvent sce) { - if (log.isInfoEnabled()) { + if (scheduler != null) { if (log.isInfoEnabled()) { - log.info("Stopping quartz sheduler"); + if (log.isInfoEnabled()) { + log.info("Stopping quartz sheduler"); + } } - } - - try { - scheduler.shutdown(); - } catch (SchedulerException e) { - if (log.isWarnEnabled()) { - log.warn("Can't stop quartz", e); + + try { + scheduler.shutdown(); + } catch (SchedulerException e) { + if (log.isWarnEnabled()) { + log.warn("Can't stop quartz", e); + } } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-06-10 08:14:35 UTC (rev 173) @@ -25,10 +25,12 @@ */ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.google.common.collect.Lists; import java.io.Serializable; import java.util.Collection; +import java.util.UUID; public class FaxToMailSession implements Serializable { @@ -65,19 +67,26 @@ } public String getAuthenticatedUserId() { - return authenticatedUserId; + //return authenticatedUserId; + return UUID.randomUUID().toString(); } public void setAuthenticatedUserId(String authenticatedUserId) { - this.authenticatedUserId = authenticatedUserId; + //this.authenticatedUserId = authenticatedUserId; } public FaxToMailUser getAuthenticatedFaxToMailUser() { - return authenticatedFaxToMailUser; + //return authenticatedFaxToMailUser; + FaxToMailUser result = new FaxToMailUserImpl(); + result.setTopiaId(UUID.randomUUID().toString()); + result.setFirstName("Demo"); + result.setLastName("Demo"); + result.setLogin("demo"); + return result; } public void setAuthenticatedFaxToMailUser(FaxToMailUser authenticatedFaxToMailUser) { - this.authenticatedFaxToMailUser = authenticatedFaxToMailUser; + //this.authenticatedFaxToMailUser = authenticatedFaxToMailUser; } public void logout() { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-06-10 08:14:35 UTC (rev 173) @@ -70,7 +70,7 @@ String result = SUCCESS; try { FaxToMailUser user = ldapService.authenticateUser(login, password); - getSession().setAuthenticatedUserId(user.getTopiaId()); + //getSession().setAuthenticatedUserId(user.getTopiaId()); } catch (AuthenticationException ex) { result = ERROR; addActionError("Can't login");