Author: glandais Date: 2008-03-14 10:40:54 +0000 (Fri, 14 Mar 2008) New Revision: 1334 Added: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-ear/pom.xml trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is/simexplorer-is-web/pom.xml trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml Log: Update to Tapestry 5.0.11 Using a bean for application state for a user Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/pom.xml 2008-03-14 10:40:54 UTC (rev 1334) @@ -59,7 +59,7 @@ ISO-8859-15 </maven.compile.encoding> <!-- Tapestry version --> - <tapestry.version>5.0.10</tapestry.version> + <tapestry.version>5.0.11</tapestry.version> </properties> </profile> </profiles> Modified: trunk/simexplorer-is/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-14 10:40:54 UTC (rev 1334) @@ -51,7 +51,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>5.0.11-SNAPSHOT</version> + <version>${tapestry.version}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-14 10:40:54 UTC (rev 1334) @@ -34,3 +34,9 @@ simexplorer.common.structure=Structure simexplorer.common.structures=Structures simexplorer.contenttype.rawtype=Raw file (text) +simexplorer.ui.web.delete.action= +simexplorer.ui.web.details.action= +simexplorer.ui.web.export.action= +simexplorer.ui.web.history.action= +simexplorer.ui.web.metadata.action= +simexplorer.ui.web.rights.action= Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-14 10:40:54 UTC (rev 1334) @@ -34,3 +34,9 @@ simexplorer.common.structure=Structure simexplorer.common.structures=Structures simexplorer.contenttype.rawtype=Fichier brut (texte) +simexplorer.ui.web.delete.action= +simexplorer.ui.web.details.action= +simexplorer.ui.web.export.action= +simexplorer.ui.web.history.action= +simexplorer.ui.web.metadata.action= +simexplorer.ui.web.rights.action= Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-14 10:40:54 UTC (rev 1334) @@ -96,7 +96,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>5.0.11-SNAPSHOT</version> + <version>${tapestry.version}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -21,6 +21,7 @@ import javax.servlet.http.HttpSession; +import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.IncludeStylesheet; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Parameter; @@ -34,7 +35,7 @@ import fr.cemagref.simexplorer.is.storage.SearchColumn; import fr.cemagref.simexplorer.is.ui.web.pages.ElementList; import fr.cemagref.simexplorer.is.ui.web.pages.Login; -import fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage; +import fr.cemagref.simexplorer.is.ui.web.services.SimExplorerState; /** * AbstractPage.java @@ -45,8 +46,12 @@ * Last update : $Date: 2007/05/14 07:56:43 $ By : $Author: E023931M $ */ @IncludeStylesheet("css/Layout.css") -public class Layout extends ProtectedPage { +public class Layout { + /** The application state. */ + @ApplicationState + private SimExplorerState applicationState; + /** The persistent locale. */ @Inject @Service("PersistentLocale") @@ -64,9 +69,10 @@ @InjectPage private ElementList elementList; + /** The login page. */ @InjectPage private Login loginPage; - + /** The request globals. */ @Inject private RequestGlobals requestGlobals; @@ -158,18 +164,18 @@ * @return the login name */ public String getLoginName() { - return getUserLogged().getLogin(); + return applicationState.getUser().getLogin(); } /** * Gets the logged. * * @return the logged - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public boolean getLogged() throws SimExplorerException { - getUserRights(); - return isUserLogged(); + return (applicationState.getUser() != null); } /** @@ -178,7 +184,10 @@ * @return the administrator */ public boolean getAdministrator() { - return isUserAdmin(); + if (applicationState.getUser() != null) { + return applicationState.getUser().isAdmin(); + } + return false; } /** @@ -187,7 +196,10 @@ * @return the super administrator */ public boolean getSuperAdministrator() { - return isUserSuperAdmin(); + if (applicationState.getUser() != null) { + return applicationState.getUser().isSuperAdmin(); + } + return false; } /** @@ -226,14 +238,4 @@ this.searchColumn = searchColumn; } - @Override - public String getWindowTitle() { - return null; - } - - @Override - public boolean hasAccessToPage() { - return true; - } - } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -17,16 +17,19 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.grid; -import org.apache.tapestry.beaneditor.PropertyModel; +import java.util.List; + +import org.apache.tapestry.grid.ColumnSort; import org.apache.tapestry.grid.GridDataSource; +import org.apache.tapestry.grid.SortConstraint; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; -import fr.cemagref.simexplorer.is.storage.SearchColumn; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; +import fr.cemagref.simexplorer.is.storage.SearchColumn; /** * Datasource of element list. @@ -148,13 +151,15 @@ /* (non-Javadoc) * @see org.apache.tapestry.grid.GridDataSource#prepare(int, int, org.apache.tapestry.beaneditor.PropertyModel, boolean) */ - public void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending) { + public void prepare(int startIndex, int endIndex, List<SortConstraint> sortConstraints) { this.indexStart = startIndex; try { String sortColumn = ""; - if (sortModel != null) { - sortColumn = sortModel.getPropertyName(); + boolean ascending = false; + if (sortConstraints != null && sortConstraints.size() > 0) { + sortConstraints.get(0).getPropertyModel().getPropertyName(); + ascending = (sortConstraints.get(0).getColumnSort() == ColumnSort.ASCENDING); } switch (listType) { case ElementList: Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -20,12 +20,12 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; @@ -57,7 +57,7 @@ private MetaData[] usedByAllVersions; /** The _element. */ - @SetterGetter + @Property private MetaData _listMetadata; /** The element detail. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -18,11 +18,11 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.SerializableInputStream; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; @@ -35,11 +35,11 @@ public class ElementImport extends UserPage { /** The _file ea. */ - @SetterGetter + @Property private UploadedFile _fileEA; /** The _file lib. */ - @SetterGetter + @Property private UploadedFile _fileLib; /** The element detail. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -20,12 +20,12 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SearchColumn; @@ -53,7 +53,7 @@ private ComponentResources resources; /** The _element. */ - @SetterGetter + @Property private MetaData _element; /** The query. */ @@ -98,7 +98,7 @@ this.searchColumn = searchColumn; } elementListGrid.setCurrentPage(1); - elementListGrid.updateSort(""); + elementListGrid.getSortModel().clear(); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -20,18 +20,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.StringTokenizer; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Actor; @@ -99,7 +98,7 @@ private List<Actor> adminList; /** The actor. */ - @SetterGetter + @Property private Actor actor; /** The user encoder. */ @@ -108,7 +107,7 @@ Object onSuccess() { elementListGrid.setCurrentPage(1); - elementListGrid.updateSort(""); + elementListGrid.getSortModel().clear(); return this; } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -18,12 +18,12 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; @@ -47,7 +47,7 @@ private ComponentResources resources; /** The _element. */ - @SetterGetter + @Property private MetaData _element; /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -19,6 +19,7 @@ import java.util.List; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.ioc.services.ExceptionAnalysis; @@ -26,7 +27,6 @@ import org.apache.tapestry.ioc.services.ExceptionInfo; import org.apache.tapestry.services.ExceptionReporter; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -36,7 +36,7 @@ public class ExceptionReport implements ExceptionReporter { /** The _unknown. */ - @SetterGetter(onlyGetter = true) + @Property(write = false) private boolean _unknown; /** The exception. */ @@ -44,20 +44,20 @@ /** The _stack. */ @SuppressWarnings("unused") - @SetterGetter(onlyGetter = true) + @Property(write = false) private List<ExceptionInfo> _stack; /** The _info. */ - @SetterGetter + @Property private ExceptionInfo _info; /** The _property name. */ - @SetterGetter + @Property private String _propertyName; /** The _frame. */ @SuppressWarnings("unused") - @SetterGetter + @Property private String _frame; /** The analyzer. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -25,13 +25,13 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Link; import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; import org.codelutin.tapestry.beans.TreeNode; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; @@ -49,7 +49,7 @@ /** The _group. */ @SuppressWarnings("unused") - @SetterGetter + @Property private Group _group; /** The bean model source. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -30,8 +30,10 @@ import org.apache.tapestry.services.RequestGlobals; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; +import fr.cemagref.simexplorer.is.ui.web.services.SimExplorerState; /** * The Class Login. @@ -57,7 +59,7 @@ /** The token. */ @ApplicationState - private String token; + private SimExplorerState applicationState; /** The request globals. */ @Inject @@ -87,13 +89,20 @@ Arrays.fill(chars, (char) 0); password = null; - token = RemoteSecurityService.getAuthentificationService().loginUser(user, pass); + String token = RemoteSecurityService.getAuthentificationService().loginUser(user, pass); if (token != null && !token.equals("")) { - Object fromURL = requestGlobals.getRequest().getSession(false).getAttribute("fromURL"); + + User loggedUser = RemoteSecurityService.getAuthentificationService().getLoggedUser(token); + + applicationState.setToken(token); + applicationState.setUser(loggedUser); + + String fromURL = applicationState.getRequestedURL(); if (fromURL == null) { return elementList; } - requestGlobals.getResponse().sendRedirect((String) fromURL); + //return fromURL.substring(1); + requestGlobals.getResponse().sendRedirect(fromURL); } formLogin.recordError(messages.get("simexplorer.ui.web.login.invalid")); return this; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -20,18 +20,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.StringTokenizer; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.ValueEncoder; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; @@ -78,7 +77,7 @@ /** The _group. */ @SuppressWarnings("unused") - @SetterGetter + @Property private Group _group; /** The metadataModel. */ @@ -86,7 +85,7 @@ private BeanModel metadataModel; /** The _element. */ - @SetterGetter + @Property private MetaData _element; /** The element detail. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -18,12 +18,12 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.annotations.Property; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; @@ -41,7 +41,7 @@ /** The _user. */ @SuppressWarnings("unused") - @SetterGetter + @Property private User _user; /** The bean model source. */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -29,17 +29,18 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; -import fr.cemagref.simexplorer.is.ui.web.pages.Login; +import fr.cemagref.simexplorer.is.ui.web.services.SimExplorerState; /** * The Class ProtectedPage. */ public abstract class ProtectedPage { - /** The token. */ + /** The application state. */ @ApplicationState - private String token; + private SimExplorerState applicationState; + /** The request globals. */ @Inject private RequestGlobals requestGlobals; @@ -78,7 +79,7 @@ getUserRights(); if (!userLogged) { String fromURL = requestGlobals.getRequest().getPath(); - requestGlobals.getRequest().getSession(true).setAttribute("fromURL", fromURL); + applicationState.setRequestedURL(fromURL); return "Login"; } if (!hasAccessToPage()) @@ -110,20 +111,21 @@ * @return the token */ public String getToken() { - return token; + return applicationState.getToken(); } /** * Compute user logged. * * @return the user - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ private User computeUserLogged() throws SimExplorerException { User loggedUser = null; - if (token != null) { + if (getToken() != null) { try { - loggedUser = RemoteSecurityService.getAuthentificationService().getLoggedUser(token); + loggedUser = RemoteSecurityService.getAuthentificationService().getLoggedUser(getToken()); } catch (Exception e) { loggedUser = null; } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -19,27 +19,17 @@ import java.io.IOException; -import org.apache.tapestry.ValueEncoder; -import org.apache.tapestry.internal.services.EnumValueEncoderFactory; -import org.apache.tapestry.internal.services.GenericValueEncoderFactory; -import org.apache.tapestry.internal.services.StringValueEncoder; -import org.apache.tapestry.internal.services.TypeCoercedValueEncoderFactory; -import org.apache.tapestry.ioc.Configuration; import org.apache.tapestry.ioc.MappedConfiguration; -import org.apache.tapestry.ioc.ObjectLocator; import org.apache.tapestry.ioc.OrderedConfiguration; import org.apache.tapestry.ioc.ServiceBinder; import org.apache.tapestry.ioc.annotations.InjectService; -import org.apache.tapestry.ioc.services.Coercion; -import org.apache.tapestry.ioc.services.CoercionTuple; +import org.apache.tapestry.services.ApplicationStateContribution; import org.apache.tapestry.services.Request; import org.apache.tapestry.services.RequestFilter; import org.apache.tapestry.services.RequestHandler; import org.apache.tapestry.services.Response; -import org.apache.tapestry.services.ValueEncoderFactory; import org.slf4j.Logger; -import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.Version; /** @@ -128,6 +118,11 @@ }; } + public void contributeApplicationStateManager(MappedConfiguration<Class, ApplicationStateContribution> configuration) + { + configuration.add(SimExplorerState.class, new ApplicationStateContribution("session")); + } + /** * This is a contribution to the RequestHandler service configuration. This is how we extend Tapestry using the * timing filter. A common use for this kind of filter is transaction management or security. Added: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -0,0 +1,100 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.services; + +import fr.cemagref.simexplorer.is.security.entities.User; + +/** + * The Class SimExplorerState. + */ +public class SimExplorerState { + + /** The token. */ + private String token; + + /** The user. */ + private User user; + + /** The requested url. */ + private String requestedURL; + + /** + * Instantiates a new sim explorer state. + */ + public SimExplorerState() { + super(); + token = null; + user = null; + requestedURL = null; + } + + /** + * Gets the token. + * + * @return the token + */ + public String getToken() { + return token; + } + + /** + * Sets the token. + * + * @param token the new token + */ + public void setToken(String token) { + this.token = token; + } + + /** + * Gets the user. + * + * @return the user + */ + public User getUser() { + return user; + } + + /** + * Sets the user. + * + * @param user the new user + */ + public void setUser(User user) { + this.user = user; + } + + /** + * Gets the requested url. + * + * @return the requested url + */ + public String getRequestedURL() { + return requestedURL; + } + + /** + * Sets the requested url. + * + * @param requestedURL the new requested url + */ + public void setRequestedURL(String requestedURL) { + this.requestedURL = requestedURL; + } + +} Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-14 10:40:54 UTC (rev 1334) @@ -49,12 +49,13 @@ * @param beanModelSource the bean model source * @param resources the resources * @param sortable the sortable + * @param securityList the security list * * @return the meta data model */ - public static BeanModel getMetaDataModel(BeanModelSource beanModelSource, ComponentResources resources, + public static BeanModel<MetaData> getMetaDataModel(BeanModelSource beanModelSource, ComponentResources resources, boolean sortable, boolean securityList) { - BeanModel model = beanModelSource.create(MetaData.class, false, resources); + BeanModel<MetaData> model = beanModelSource.create(MetaData.class, false, resources); List<String> wantedProperties = new ArrayList<String>(); wantedProperties.add("uuid"); wantedProperties.add("version"); @@ -72,7 +73,7 @@ model.get(property).sortable(false); } if (!wantedProperties.contains(property)) { - model = model.remove(property); + model = model.exclude(property); } } if (securityList) { @@ -95,15 +96,15 @@ * * @return the group model */ - public static BeanModel getGroupModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, + public static BeanModel<Group> getGroupModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, boolean delete) { - BeanModel model = beanModelSource.create(Group.class, true, resources); + BeanModel<Group> model = beanModelSource.create(Group.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); wantedProperties.add("name"); List<String> properties = model.getPropertyNames(); for (String property : properties) { if (!wantedProperties.contains(property)) { - model = model.remove(property); + model = model.exclude(property); } } if (edit) { @@ -125,9 +126,9 @@ * * @return the user model */ - public static BeanModel getUserModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, + public static BeanModel<User> getUserModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, boolean delete) { - BeanModel model = beanModelSource.create(User.class, true, resources); + BeanModel<User> model = beanModelSource.create(User.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); wantedProperties.add("login"); wantedProperties.add("name"); @@ -137,7 +138,7 @@ List<String> properties = model.getPropertyNames(); for (String property : properties) { if (!wantedProperties.contains(property)) { - model = model.remove(property); + model = model.exclude(property); } } if (edit) { Modified: trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml 2008-03-13 19:33:30 UTC (rev 1333) +++ trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml 2008-03-14 10:40:54 UTC (rev 1334) @@ -2,7 +2,7 @@ <div t:id="pagerTop"/> - <table class="t-data-grid"> + <table t:id="table"> <thead t:id="columns"/> <tbody> <tr t:id="rows"/>