Author: sletellier Date: 2011-11-03 17:20:03 +0100 (Thu, 03 Nov 2011) New Revision: 4 Url: http://forge.codelutin.com/repositories/revision/echobase/4 Log: - Remove T3 references - Update files headers - Creating login and home pages - Add includes pages Added: trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.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-services/src/main/resources/echobase-db-h2.properties trunk/echobase-services/src/main/resources/echobase-db.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionAware.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/LoginAction.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/EchoBaseSessionInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp trunk/echobase-ui/src/site/site_fr.xml trunk/src/site/site_fr.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-03 16:20:03 UTC (rev 4) @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.n_; /** - * T3 configuration + * EchoBase configuration * * @author chemit <chemit@codelutin.com> * @since 1.0 @@ -48,12 +48,12 @@ public EchoBaseConfiguration() { - setConfigFileName("t3-config"); + setConfigFileName("echobase-config"); if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - loadDefaultOptions(BaracoudaConfigurationOption.class); + loadDefaultOptions(EchoBaseConfigurationOption.class); } /** @@ -72,13 +72,13 @@ } } - createDirectory(BaracoudaConfigurationOption.DATA_DIRECTORY, + createDirectory(EchoBaseConfigurationOption.DATA_DIRECTORY, "data directory"); - createDirectory(BaracoudaConfigurationOption.USER_LOG_DIRECTORY, + createDirectory(EchoBaseConfigurationOption.USER_LOG_DIRECTORY, "user logs directory"); - createDirectory(BaracoudaConfigurationOption.TREATMENT_WORKING_DIRECTORY, + createDirectory(EchoBaseConfigurationOption.TREATMENT_WORKING_DIRECTORY, "treatment workdir directory"); } @@ -89,7 +89,7 @@ * the directory to create * @param name a name used for logs */ - protected void createDirectory(BaracoudaConfigurationOption key, String name) { + protected void createDirectory(EchoBaseConfigurationOption key, String name) { File directory = getOptionAsFile(key.getKey()); @@ -97,7 +97,7 @@ directory, "Could not find " + name + " (key " + key + - "in your configuration file named t3-config)" + "in your configuration file named echobase-config)" ); if (log.isInfoEnabled()) { log.info(key + " = " + directory); @@ -111,61 +111,42 @@ } /** - * All T3 configuration options. + * All EchoBase configuration options. * * @since 1.0 */ - public enum BaracoudaConfigurationOption implements OptionDef { + public enum EchoBaseConfigurationOption implements OptionDef { - /** Main directory where to put t3 data (logs, and others...). */ + /** Main directory where to put echobase data (logs, and others...). */ DATA_DIRECTORY( "data.directory", - n_("t3.config.data.directory.description"), - "/var/local/t3", + n_("echobase.config.data.directory.description"), + "/var/local/echobase", File.class), + INTERNAL_DB_DIRECTORY( "internal.db.directory", - n_("t3.config.internal.db.directory.description"), - "${data.directory}/db", + n_("echobase.config.internal.db.directory.description"), + "${data.directory}/echobase", File.class), PARAMETER_PROFILE_DIRECTORY( "parameterProfiles.storage.directory", - n_("t3.config.parameterProfiles.storage.directory.description"), + n_("echobase.config.parameterProfiles.storage.directory.description"), "${data.directory}/parameter-profiles", File.class), USER_LOG_DIRECTORY( "user.log.directory", - n_("t3.user.log.directory.description"), + n_("echobase.user.log.directory.description"), "${data.directory}/logs", File.class), TREATMENT_WORKING_DIRECTORY( "treatment.working.directory", - n_("t3.config.treatment.working.directory.description"), + n_("echobase.config.treatment.working.directory.description"), "${data.directory}/treatments", - File.class), - STRATUM_WEIGHT_RATIO( - "stratum.weightRatio", - n_("t3.config.stratum.weightRatio.description"), - "40", - Float.class), - RF1_MINIMUM_RATE( - "rf1.minimumrate", - n_("t3.config.rf1.minimumrate.description"), - "0.8", - Float.class), - RF1_MAXIMUM_RATE( - "rf1.maximumrate", - n_("t3.config.rf1.maximumrate.description"), - "1.5", - Float.class), - WEIGHTED_SET_WEIGHT( - "level0.weightedSetWeight", - n_("t3.config.level0.weightedSetWeight.description"), - "40", - Float.class); + File.class); /** Configuration key. */ protected final String key; @@ -179,10 +160,10 @@ /** Default value of option. */ protected String defaultValue; - BaracoudaConfigurationOption(String key, - String description, - String defaultValue, - Class<?> type) { + EchoBaseConfigurationOption(String key, + String description, + String defaultValue, + Class<?> type) { this.key = key; this.description = description; this.defaultValue = defaultValue; 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseObjectFactory.java 2011-11-03 16:20:03 UTC (rev 4) @@ -77,19 +77,19 @@ } /** - * Obtain a new T3 factory. + * Obtain a new EchoBase factory. * <p/> * <strong>Note:</strong> The shared configuration must have been setted * before using this method via the method * {@link #setConfiguration(ApplicationConfig)} * - * @return the new instanciated T3 factory. + * @return the new instanciated EchoBase factory. */ public static EchoBaseObjectFactory newInstance() { // must have a configuration to start the factory Preconditions.checkNotNull( configuration, - "No t3 appliation configuration registred."); + "No EchoBase appliation configuration registred."); if (log.isInfoEnabled()) { log.info("New EchoBaseObjectFactory with configuration " + configuration); 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/AbstractInjector.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectDAO.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntitiesById.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectEntityById.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectFromDAO.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/Injector.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorDAO.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntitiesById.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorEntityById.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ioc/InjectorFromDAO.java 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ /* * #%L - * T3 :: Api + * EchoBase :: Services * * $Id$ - * $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/java/fr/ird/t3/servic... $ + * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2011 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: trunk/echobase-services/src/main/resources/echobase-db-h2.properties =================================================================== --- trunk/echobase-services/src/main/resources/echobase-db-h2.properties 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/resources/echobase-db-h2.properties 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ ### # #%L -# T3 :: Api +# EchoBase :: Services # # $Id$ -# $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/resources/t3-internal... $ +# $HeadURL$ # %% -# Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit +# Copyright (C) 2011 Ifremer, Codelutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -28,4 +28,4 @@ hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:${internal.db.directory}/t3-user +hibernate.connection.url=jdbc:h2:file:${internal.db.directory}/echobase-user Modified: trunk/echobase-services/src/main/resources/echobase-db.properties =================================================================== --- trunk/echobase-services/src/main/resources/echobase-db.properties 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/resources/echobase-db.properties 2011-11-03 16:20:03 UTC (rev 4) @@ -1,11 +1,11 @@ ### # #%L -# T3 :: Api +# EchoBase :: Services # # $Id$ -# $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-api/src/main/resources/t3-datadb.p... $ +# $HeadURL$ # %% -# Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit +# Copyright (C) 2011 Ifremer, Codelutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -21,6 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### +### # DB configuration hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.connection.driver_class=org.postgresql.Driver @@ -35,6 +36,6 @@ # Migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine -topia.service.migration.callback=fr.ird.t3.services.migration.T3MigrationCallback +topia.service.migration.callback=fr.ifremer.echobase.services.migration.EchoBaseMigrationCallback topia.service.migration.showSql=true Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2011-11-03 16:20:03 UTC (rev 4) @@ -1,9 +1,9 @@ -t3.config.data.directory.description= -t3.config.internal.db.directory.description= -t3.config.level0.weightedSetWeight.description= -t3.config.parameterProfiles.storage.directory.description= -t3.config.rf1.maximumrate.description= -t3.config.rf1.minimumrate.description= -t3.config.stratum.weightRatio.description= -t3.config.treatment.working.directory.description= -t3.user.log.directory.description= +echobase.config.data.directory.description= +echobase.config.internal.db.directory.description= +echobase.config.level0.weightedSetWeight.description= +echobase.config.parameterProfiles.storage.directory.description= +echobase.config.rf1.maximumrate.description= +echobase.config.rf1.minimumrate.description= +echobase.config.stratum.weightRatio.description= +echobase.config.treatment.working.directory.description= +echobase.user.log.directory.description= 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/ApplicationListener.java 2011-11-03 16:20:03 UTC (rev 4) @@ -74,7 +74,7 @@ // init I18n DefaultI18nInitializer i18nInitializer = - new DefaultI18nInitializer("t3-i18n"); + new DefaultI18nInitializer("echobase-i18n"); i18nInitializer.setMissingKeyReturnNull(true); I18n.init(i18nInitializer, Locale.getDefault()); 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2011-11-03 16:20:03 UTC (rev 4) @@ -44,14 +44,14 @@ private static final Log log = LogFactory.getLog(EchoBaseSession.class); /** - * Obtain the user T3 session. + * 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 T3 session (never null) + * @return the user EchoBase session (never null) */ public static EchoBaseSession getEchoBaseSession() { Map<String, Object> session = ActionContext.getContext().getSession(); @@ -80,7 +80,7 @@ /** Key used to store this EchoBase session in application session */ public static final String SESSION_PARAMETER_ECHO_BASE_SESSION = "echobaseSession"; - /** Key to set T3 factory in this session. */ + /** Key to set EchoBase factory in this session. */ protected static final String PROPERTY_OBJECT_FACTORY = "objectFactory"; /** Key to set User connected in this session. */ @@ -119,10 +119,10 @@ /** * Sets in this session the loggued user. * - * @param t3User the user loggued to use in this session + * @param echoBaseUser the user loggued to use in this session */ - public void setEchoBaseUser(EchoBaseUser t3User) { - set(PROPERTY_ECHO_BASE_USER, t3User); + public void setEchoBaseUser(EchoBaseUser echoBaseUser) { + set(PROPERTY_ECHO_BASE_USER, echoBaseUser); } /** Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionAware.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionAware.java 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionAware.java 2011-11-03 16:20:03 UTC (rev 4) @@ -31,5 +31,5 @@ */ public interface EchoBaseSessionAware { - void setEchoBaseSession(EchoBaseSession t3Session); + void setEchoBaseSession(EchoBaseSession 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-03 16:20:03 UTC (rev 4) @@ -59,7 +59,7 @@ /** - * T3 User session. + * EchoBase User session. * <p/> * <strong>This object will be injected only if you implements the * contract {@link EchoBaseSessionAware} on your action.</strong> @@ -67,9 +67,9 @@ private transient EchoBaseSession echoBaseSession; /** - * To inject the T3 User session in action. + * To inject the EchoBase User session in action. * - * @param echoBaseSession the new T3 User session to inject in action + * @param echoBaseSession the new EchoBase User session to inject in action */ @Override public final void setEchoBaseSession(EchoBaseSession echoBaseSession) { 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/LoginAction.java 2011-11-03 16:20:03 UTC (rev 4) @@ -95,7 +95,7 @@ EchoBaseSession userSession = getEchoBaseSession(); - // user is authorized, keep it in his t3Session + // user is authorized, keep it in his echoBaseSession userSession.setEchoBaseUser(user); // add locale in echoBaseSession if required 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CleanEchoBaseSessionInterceptor.java 2011-11-03 16:20:03 UTC (rev 4) @@ -62,11 +62,11 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - EchoBaseSession t3Session = EchoBaseSession.getEchoBaseSession(); - if (t3Session != null) { + EchoBaseSession echoBaseSession = EchoBaseSession.getEchoBaseSession(); + if (echoBaseSession != null) { for (String paramName : parameters) { - Object value = t3Session.remove(paramName); + Object value = echoBaseSession.remove(paramName); if (log.isDebugEnabled()) { log.debug("Removed [" + paramName + "] : " + value); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseSessionInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseSessionInterceptor.java 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseSessionInterceptor.java 2011-11-03 16:20:03 UTC (rev 4) @@ -43,8 +43,8 @@ Object action = invocation.getAction(); if (action instanceof EchoBaseSessionAware) { - EchoBaseSession t3Session = EchoBaseSession.getEchoBaseSession(); - ((EchoBaseSessionAware) action).setEchoBaseSession(t3Session); + EchoBaseSession echoBaseSession = EchoBaseSession.getEchoBaseSession(); + ((EchoBaseSessionAware) action).setEchoBaseSession(echoBaseSession); } return invocation.invoke(); } 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseTransactionInterceptorImpl.java 2011-11-03 16:20:03 UTC (rev 4) @@ -32,7 +32,7 @@ /** * Implementation of the {@link OpenTopiaTransactionInterceptor} giving how to - * create a new topia transaction on a T3 database. + * create a new topia transaction on a EchoBase database. * * @author tchemit <chemit@codelutin.com> * @since 1.0 Added: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-03 16:20:03 UTC (rev 4) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="user" extends="default" namespace="/user"> + + <!-- when a action has no context --> + <!--<action name="missingEchoBaseDatabase">--> + <!--<result name="success">/WEB-INF/jsp/missingEchoBaseDatabaseSelected.jsp</result>--> + <!--</action>--> + + <!-- login action --> + <action name="login" class="fr.ifremer.echobase.ui.actions.LoginAction" + method="doLogin"> + <result name="input">/WEB-INF/jsp/login.jsp</result> + <result name="error">/WEB-INF/jsp/login.jsp</result> + <result name="redirect" type="redirect">${redirectAction}</result> + <!--<interceptor-ref name="internalTransaction"/>--> + <interceptor-ref name="paramsPrepareParamsStack"/> + </action> + + <!-- logout action --> + <action name="logout" class="fr.ifremer.echobase.ui.actions.LoginAction" + method="doLogout"> + <result type="redirectAction"> + <param name="namespace">/</param> + <param name="actionName">home</param> + </result> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="basicStack"/> + <interceptor-ref name="injectEchoBaseSession"/> + </action> + + <!-- get lists of users --> + <!--<action name="userList" class="fr.ird.t3.web.actions.admin.UserAction"--> + <!--method="input">--> + <!--<interceptor-ref name="internalBasicStackLoggued"/>--> + <!--<interceptor-ref name="checkUserIsAdmin"/>--> + <!--<result name="input">/WEB-INF/jsp/admin/userList.jsp</result>--> + <!--</action>--> + + <!-- get detail of a user --> + <!--<action name="userForm" class="fr.ird.t3.web.actions.admin.UserAction"--> + <!--method="input">--> + <!--<interceptor-ref name="internalParamsPrepareParamsStackLoggued"/>--> + <!--<result name="input">/WEB-INF/jsp/admin/userForm.jsp</result>--> + <!--<result name="error">/WEB-INF/jsp/admin/userForm.jsp</result>--> + <!--<result name="success">/WEB-INF/jsp/admin/userForm.jsp</result>--> + <!--<result name="backToList" type="redirectAction">userList</result>--> + <!--</action>--> + + <!-- download user log file --> + <!--<action name="getUserLog"--> + <!--class="fr.ifremer.echobase.web.actions.data.DownloadUserLogAction">--> + <!--<interceptor-ref name="internalBasicStackLoggued"/>--> + <!--<result name="success" type="stream">--> + <!--<param name="contentCharSet">UTF-8</param>--> + <!--</result>--> + <!--</action>--> + + </package> + +</struts> 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-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-03 16:20:03 UTC (rev 4) @@ -0,0 +1,10 @@ +echobase.label.language=Language +echobase.label.locale.english=Anglais +echobase.action.locale.english=Anglais +echobase.label.locale.french=Français +echobase.action.locale.french=Français +ecobase.label.welcome=Bienvenue +ecobase.label.login=Connection +ecobase.title.login=Connection +echobase.label.user.login=Login +echobase.action.logout=Déconnection \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-03 16:20:03 UTC (rev 4) @@ -57,15 +57,15 @@ <interceptor name="paramRemover" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/> - <!-- to manage the t3 topia transaction inside an action --> + <!-- to manage the Ecobase topia transaction inside an action --> <interceptor name="topiaTransaction" class="fr.ifremer.echobase.ui.interceptors.EchoBaseTransactionInterceptorImpl"/> - <!-- to inject the T3 session inside an action --> + <!-- to inject the ecobase session inside an action --> <interceptor name="injectEchoBaseSession" class="fr.ifremer.echobase.ui.interceptors.EchoBaseSessionInterceptor"/> - <!-- to clean some properties from the T3 session --> + <!-- to clean some properties from the ecobase session --> <interceptor name="cleanEchoBaseSession" class="fr.ifremer.echobase.ui.interceptors.CleanEchoBaseSessionInterceptor"/> @@ -81,7 +81,7 @@ <param name="redirectAction">/home</param> </interceptor> - <interceptor name="checkT3Session" + <interceptor name="checkEcobaseSession" class="fr.ifremer.echobase.ui.interceptors.CheckInUserSessionInterceptor"/> </interceptors> @@ -95,18 +95,18 @@ <interceptors> - <!-- t3 basic authenticated stack --> + <!-- ecobase basic authenticated stack --> <interceptor-stack name="echoBaseBasicStack"> <interceptor-ref name="injectEchoBaseSession"/> - <interceptor-ref name="checkT3DatabaseSelected"/> + <!--<interceptor-ref name="checkEchoBaseDatabaseSelected"/>--> <interceptor-ref name="topiaTransaction"/> <interceptor-ref name="basicStack"/> </interceptor-stack> - <!-- t3 stack with params--> + <!-- ecobase stack with params--> <interceptor-stack name="echoBaseParamsPrepareParamsStack"> <interceptor-ref name="injectEchoBaseSession"/> - <interceptor-ref name="checkT3DatabaseSelected"/> + <!--<interceptor-ref name="checkEchoBaseDatabaseSelected"/>--> <interceptor-ref name="topiaTransaction"/> <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> @@ -121,7 +121,7 @@ <interceptor-stack name="loginAndActionContext"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="checkT3Session"> + <interceptor-ref name="checkEcobaseSession"> <param name="parameters">actionContext</param> <param name="redirectAction">/missingActionContext</param> </interceptor-ref> @@ -167,7 +167,7 @@ <!--<include file="config/struts-json.xml"/>--> <!--<include file="config/struts-io.xml"/>--> - <!--<include file="config/struts-user.xml"/>--> + <include file="config/struts-user.xml"/> <!--<include file="config/struts-trip.xml"/>--> <!--<include file="config/struts-level0.xml"/>--> <!--<include file="config/struts-level1.xml"/>--> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2011-11-03 16:20:03 UTC (rev 4) @@ -31,7 +31,7 @@ <li> <a href="http://maven-site.forge.codelutin.com/echobase/" title="Documentation de l'application" target="_blank"> - T3+ + Echobase </a> </li> <li> @@ -41,7 +41,7 @@ </a> </li> <!--li> - <a href="mailto:t3-users at " title="Contacter un responsable"> + <a href="mailto:echobase-users at " title="Contacter un responsable"> Contact </a> </li--> @@ -53,7 +53,7 @@ </li> <li> Copyright 2011 - <a href="http://www.ifremer.fr">IRD</a> + <a href="http://www.ifremer.fr">Echobase</a> <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-11-03 16:20:03 UTC (rev 4) @@ -45,6 +45,7 @@ </ul> </div> <br/> + <%@ include file="menuPrincipal.jsp" %> <%@ include file="i18n.jsp" %> <br/> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2011-11-03 16:20:03 UTC (rev 4) @@ -23,7 +23,7 @@ --%> <%@ taglib prefix="s" uri="/struts-tags" %> <div class="cleanBoth"> - <s:text name="t3.label.language"/> + <s:text name="echobase.label.language"/> <ul> <li> <s:if Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-03 16:20:03 UTC (rev 4) @@ -0,0 +1,31 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:set var="userIsAdmin" value="%{#session.ecobaseSession.ecobaseUser.admin}"/> +<title><s:text name="ecobase.label.welcome"/></title> + +<h2><s:text name="ecobase.label.welcome"/></h2> + +<hr/> \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-03 16:20:03 UTC (rev 4) @@ -0,0 +1,69 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<html xmlns="http://www.w3.org/1999/xhtml"> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>Ecobase - <s:text name="ecobase.label.login"/></title> + <link rel="stylesheet" type="text/css" + href="<s:url value='/css/screen.css' />"/> + <link rel="icon" type="image/png" + href="<s:url value='/images/logo_codelutin.png' />"/> + <sj:head jqueryui="true" jquerytheme="start"/> +</head> + +<body> + +<%--header--%> + +<div class='displayBlock'> + <div class='floatLeft'> + <s:a action="home" namespace="/">Ecobase</s:a> + </div> + <div id='headerRight'> + <%@ include file="/WEB-INF/includes/i18n.jsp" %> + </div> +</div> +<div class="cleanBoth"></div> +<hr/> + +<%-- content --%> + +<h2><s:text name="ecobase.title.login"/></h2> + +<s:form method="POST" namespace="/user"> + <s:hidden key="redirectAction" label=""/> + <s:textfield name="login" key="ecobase.common.login" required="true"/> + <s:password name="password" key="ecobase.common.password" required="true"/> + <s:submit action="login" key="ecobase.action.login" align="right"/> +</s:form> + +<br/> +<%-- footer --%> +<%@ include file="/WEB-INF/includes/footer.jsp" %> + +</body> +</html> Modified: trunk/echobase-ui/src/site/site_fr.xml =================================================================== --- trunk/echobase-ui/src/site/site_fr.xml 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/echobase-ui/src/site/site_fr.xml 2011-11-03 16:20:03 UTC (rev 4) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - T3 :: Web + EchoBase :: UI $Id$ $HeadURL$ %% - Copyright (C) 2010 IRD, Codelutin, Tony Chemit + Copyright (C) 2011 Ifremer, Codelutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-11-03 16:09:54 UTC (rev 3) +++ trunk/src/site/site_fr.xml 2011-11-03 16:20:03 UTC (rev 4) @@ -70,7 +70,7 @@ </menu> <!--menu name="Modélisation"> - <item name="Télécharger le modèle" href="model/t3-persistence.zargo"/> + <item name="Télécharger le modèle" href="model/echobase-persistence.zargo"/> <item name="Données thématiques" href="model.html#donn-es-th-matiques"/> <item name="Données référentiel" href="model.html#r-f-rentiel"/> </menu-->