Author: sletellier Date: 2011-11-07 11:46:58 +0100 (Mon, 07 Nov 2011) New Revision: 15 Url: http://forge.codelutin.com/repositories/revision/echobase/15 Log: Update javadoc Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContextImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInitializable.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInjectable.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSingleton.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/IOCService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/AbstractInjector.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectDAO.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntitiesById.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntityById.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectFromDAO.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/Injector.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorDAO.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntitiesById.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntityById.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorFromDAO.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 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/actions/HomeAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/LoginAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckInUserSessionInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CleanEchoBaseSessionInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-07 10:46:58 UTC (rev 15) @@ -42,7 +42,7 @@ * EchoBase configuration * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class EchoBaseConfiguration { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-07 10:46:58 UTC (rev 15) @@ -34,7 +34,8 @@ /** * All EchoBase configuration options. * - * @since 1.0 + * @author chemit <chemit@codelutin.com> + * @since 0.1 */ public enum EchoBaseConfigurationOption implements ApplicationConfig.OptionDef { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2011-11-07 10:46:58 UTC (rev 15) @@ -23,6 +23,10 @@ */ package fr.ifremer.echobase; +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + */ public class EchoBaseTechnicalException extends RuntimeException { private static final long serialVersionUID = 1L; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java 2011-11-07 10:46:58 UTC (rev 15) @@ -41,6 +41,10 @@ import java.util.Properties; import java.util.Set; +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + */ public class EchoBaseTopiaRootContextSupplierFactory { /** Logger. */ Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.java 2011-11-07 10:46:58 UTC (rev 15) @@ -41,7 +41,7 @@ * To obtain services. * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class EchoBaseObjectFactory { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java 2011-11-07 10:46:58 UTC (rev 15) @@ -26,7 +26,8 @@ import org.nuiton.topia.TopiaContext; /** - * @author sletellier + * @author sletellier <letellier@codelutin.com> + * @since 0.1 */ public class AbstractEchoBaseService implements EchoBaseService { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java 2011-11-07 10:46:58 UTC (rev 15) @@ -24,6 +24,10 @@ package fr.ifremer.echobase.services; +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + */ public interface EchoBaseService { void setServiceContext(EchoBaseServiceContext serviceContext); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2011-11-07 10:46:58 UTC (rev 15) @@ -31,6 +31,9 @@ * This contract represents objects you must provide when asking for a service. * Objects provided may be injected in services returned by * {@link EchoBaseServiceFactory#newService(Class, EchoBaseServiceContext)} + * + * @author chemit <chemit@codelutin.com> + * @since 0.1 */ public interface EchoBaseServiceContext { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContextImpl.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContextImpl.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContextImpl.java 2011-11-07 10:46:58 UTC (rev 15) @@ -27,7 +27,11 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import org.nuiton.topia.TopiaContext; -/** Instances of this class will be given to service factory. */ +/** Instances of this class will be given to service factory. + * + * @author chemit <chemit@codelutin.com> + * @since 0.1 + **/ public class EchoBaseServiceContextImpl implements EchoBaseServiceContext { protected TopiaContext transaction; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceFactory.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceFactory.java 2011-11-07 10:46:58 UTC (rev 15) @@ -26,9 +26,12 @@ import fr.ifremer.echobase.EchoBaseTechnicalException; import java.lang.reflect.InvocationTargetException; +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + **/ + public class EchoBaseServiceFactory { -public class EchoBaseServiceFactory { - public <E extends EchoBaseService> E newService(Class<E> clazz, EchoBaseServiceContext serviceContext) { // instantiate service using empty constructor E service; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInitializable.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInitializable.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInitializable.java 2011-11-07 10:46:58 UTC (rev 15) @@ -23,7 +23,10 @@ */ package fr.ifremer.echobase.services; - +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + **/ import fr.ifremer.echobase.EchoBaseObjectFactory; /** Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInjectable.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInjectable.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceInjectable.java 2011-11-07 10:46:58 UTC (rev 15) @@ -27,7 +27,7 @@ * Contract for service which need an injections. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public interface EchoBaseServiceInjectable { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSingleton.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSingleton.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSingleton.java 2011-11-07 10:46:58 UTC (rev 15) @@ -32,7 +32,7 @@ * A shared service will be keep as a singleton in the {@link EchoBaseObjectFactory}. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public interface EchoBaseServiceSingleton { } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/IOCService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/IOCService.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/IOCService.java 2011-11-07 10:46:58 UTC (rev 15) @@ -43,7 +43,7 @@ * * @author tchemit <chemit@codelutin.com> * @see Injector - * @since 1.0 + * @since 0.1 */ public class IOCService implements EchoBaseServiceInitializable, EchoBaseServiceSingleton { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2011-11-07 10:46:58 UTC (rev 15) @@ -35,7 +35,10 @@ import java.util.List; -/** @author sletellier */ +/** + * @author sletellier <letellier@codelutin.com> + * @since 0.1 + **/ public class UserService extends AbstractEchoBaseService { public EchoBaseUserDAO getDAO() throws TopiaException { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/AbstractInjector.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/AbstractInjector.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/AbstractInjector.java 2011-11-07 10:46:58 UTC (rev 15) @@ -38,7 +38,7 @@ * Abstract injector with some useful logi. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public abstract class AbstractInjector<A extends Annotation, B> implements Injector<A, B> { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectDAO.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectDAO.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectDAO.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectorDAO - * @since 1.0 + * @since 0.1 */ @Retention(RUNTIME) @Target(FIELD) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntitiesById.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntitiesById.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntitiesById.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectorEntitiesById - * @since 1.0 + * @since 0.1 */ @Retention(RUNTIME) @Target(FIELD) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntityById.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntityById.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntityById.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectorEntityById - * @since 1.0 + * @since 0.1 */ @Retention(RUNTIME) @Target(FIELD) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectFromDAO.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectFromDAO.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectFromDAO.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectorFromDAO - * @since 1.0 + * @since 0.1 */ @Retention(RUNTIME) @Target(FIELD) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/Injector.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/Injector.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/Injector.java 2011-11-07 10:46:58 UTC (rev 15) @@ -35,7 +35,7 @@ * * @author tchemit <chemit@codelutin.com> * @see IOCService - * @since 1.0 + * @since 0.1 */ public interface Injector<A extends Annotation, B> extends EchoBaseServiceInitializable { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorDAO.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorDAO.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorDAO.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectDAO - * @since 1.0 + * @since 0.1 */ public class InjectorDAO extends AbstractInjector<InjectDAO, TopiaTransactionAware> { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntitiesById.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntitiesById.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntitiesById.java 2011-11-07 10:46:58 UTC (rev 15) @@ -40,7 +40,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectEntitiesById - * @since 1.0 + * @since 0.1 */ public class InjectorEntitiesById extends AbstractInjector<InjectEntitiesById, TopiaTransactionAware> { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntityById.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntityById.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntityById.java 2011-11-07 10:46:58 UTC (rev 15) @@ -37,8 +37,8 @@ * Fires the {@link InjectEntityById} annotation. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 * @see InjectEntityById + * @since 0.1 */ public class InjectorEntityById extends AbstractInjector<InjectEntityById, TopiaTransactionAware> { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorFromDAO.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorFromDAO.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorFromDAO.java 2011-11-07 10:46:58 UTC (rev 15) @@ -41,7 +41,7 @@ * * @author tchemit <chemit@codelutin.com> * @see InjectFromDAO - * @since 1.0 + * @since 0.1 */ public class InjectorFromDAO extends AbstractInjector<InjectFromDAO, TopiaTransactionAware> { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java 2011-11-07 10:46:58 UTC (rev 15) @@ -66,7 +66,7 @@ * On stop, just release the application configuration. * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class ApplicationListener implements ServletContextListener { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2011-11-07 10:46:58 UTC (rev 15) @@ -27,6 +27,10 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import org.nuiton.topia.TopiaContext; +/** + * @author chemit <chemit@codelutin.com> + * @since 0.1 + */ public class EchoBaseApplicationContext { protected EchoBaseConfiguration configuration; 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:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2011-11-07 10:46:58 UTC (rev 15) @@ -34,7 +34,7 @@ * The session object of EchoBase to put in servlet session. * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class EchoBaseSession { 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:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-07 10:46:58 UTC (rev 15) @@ -48,7 +48,7 @@ * untranslated key. * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class EchoBaseActionSupport extends BaseAction implements TopiaTransactionAware { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/HomeAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/HomeAction.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/HomeAction.java 2011-11-07 10:46:58 UTC (rev 15) @@ -28,7 +28,7 @@ * To go to the home page. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class HomeAction extends EchoBaseActionSupport { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/LoginAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/LoginAction.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/LoginAction.java 2011-11-07 10:46:58 UTC (rev 15) @@ -39,7 +39,7 @@ * Login and Logout action. * * @author chemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class LoginAction extends EchoBaseActionSupport implements SessionAware { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java 2011-11-07 10:46:58 UTC (rev 15) @@ -1,20 +1,17 @@ package fr.ifremer.echobase.ui.actions; -import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EchoBaseUserDAO; import fr.ifremer.echobase.entities.EchoBaseUserDTO; import fr.ifremer.echobase.services.UserService; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; import java.util.ArrayList; import java.util.List; /** - * @author sletellier + * @author sletellier <letellier@codelutin.com> + * @since 0.1 */ public class UserAction extends EchoBaseActionSupport { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2011-11-07 10:46:58 UTC (rev 15) @@ -36,7 +36,7 @@ * Abstract check interceptor. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public abstract class AbstractCheckInterceptor extends AbstractInterceptor { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckInUserSessionInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckInUserSessionInterceptor.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckInUserSessionInterceptor.java 2011-11-07 10:46:58 UTC (rev 15) @@ -40,7 +40,7 @@ * * @author chemit <chemit@codelutin.com> * @see EchoBaseSession - * @since 1.0 + * @since 0.1 */ public class CheckInUserSessionInterceptor extends AbstractCheckInterceptor { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2011-11-07 10:46:58 UTC (rev 15) @@ -33,7 +33,7 @@ * To check user is loggued. If not, then redirect to the {@link #loginAction}. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class CheckLogguedInterceptor extends AbstractCheckInterceptor { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2011-11-07 10:46:58 UTC (rev 15) @@ -33,7 +33,7 @@ * To check if logged user is admin. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class CheckUserIsAdmin extends AbstractCheckInterceptor { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CleanEchoBaseSessionInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CleanEchoBaseSessionInterceptor.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CleanEchoBaseSessionInterceptor.java 2011-11-07 10:46:58 UTC (rev 15) @@ -39,7 +39,7 @@ * * @author tchemit <chemit@codelutin.com> * @see EchoBaseSession - * @since 1.0 + * @since 0.1 */ public class CleanEchoBaseSessionInterceptor extends AbstractInterceptor { private static final long serialVersionUID = 1L; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java 2011-11-07 10:46:58 UTC (rev 15) @@ -37,7 +37,7 @@ * create a new topia transaction on a EchoBase database. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public class EchoBaseTransactionInterceptorImpl extends OpenTopiaTransactionInterceptor { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java 2011-11-07 10:46:58 UTC (rev 15) @@ -31,7 +31,7 @@ * Base T3 validator. * * @author tchemit <chemit@codelutin.com> - * @since 1.0 + * @since 0.1 */ public abstract class EchoBaseFieldValidatorSupport extends NuitonFieldValidatorSupport { 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:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-07 10:46:58 UTC (rev 15) @@ -52,7 +52,7 @@ <interceptor-ref name="basicStack"/> </action> - <!-- Display lists of users --> + <!-- display lists of users --> <action name="userList" class="fr.ifremer.echobase.ui.actions.UserAction"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp 2011-11-07 10:32:04 UTC (rev 14) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp 2011-11-07 10:46:58 UTC (rev 15) @@ -42,6 +42,7 @@ href="%{userListUrl}" pager="false" navigator="true" + rowNum="-1" navigatorAddOptions="{ height:280, reloadAfterSubmit:true, @@ -89,7 +90,7 @@ editable="true" edittype="password" hidden="true"/> - gridModel + <sjg:gridColumn name="admin" title='%{getText("echobase.common.admin")}' sortable="true"