[Coser-commits] r543 - in trunk/coser-web: . src/main/java/fr/ifremer/coser/web src/main/java/fr/ifremer/coser/web/actions src/main/java/fr/ifremer/coser/web/actions/com src/main/java/fr/ifremer/coser/web/actions/common src/main/java/fr/ifremer/coser/web/actions/map src/main/java/fr/ifremer/coser/web/actions/pop src/main/java/fr/ifremer/coser/web/actions/source src/main/resources/i18n src/main/webapp/WEB-INF/content/source src/main/webapp/WEB-INF/decorators

Author: chatellier Date: 2011-01-23 21:03:33 +0000 (Sun, 23 Jan 2011) New Revision: 543 Log: ACtion commune avec code commun et code layout. Modified: trunk/coser-web/pom.xml trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/pom.xml 2011-01-23 21:03:33 UTC (rev 543) @@ -71,6 +71,22 @@ <build> <finalName>coser-${project.version}</finalName> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>coserweb.properties</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>coserweb.properties</exclude> + </excludes> + </resource> + </resources> + <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-01-23 21:03:33 UTC (rev 543) @@ -46,6 +46,11 @@ } } + public String getApplicationVersion() { + String result = getOption(CoserWebOption.APPLICATION_VERSION.key); + return result; + } + /** * Get administrator email. * @@ -79,6 +84,7 @@ public enum CoserWebOption { CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), + APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie at ifremer.fr"), ADMIN_LOGIN("coser.admin.login", _("coser.config.admin.login.description"), null), ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null); Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,25 +22,17 @@ package fr.ifremer.coser.web.actions; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.Date; -import java.util.Properties; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.io.IOUtils; import org.apache.struts2.ServletActionContext; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; -import fr.ifremer.coser.web.CoserWebConfig; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la date de derniere mise à jour. @@ -51,7 +43,7 @@ * Last update : $Date$ * By : $Author$ */ -public class IndexAction extends ActionSupport { +public class IndexAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -25,7 +25,7 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -36,7 +36,7 @@ * Last update : $Date$ * By : $Author$ */ -public class LocaleAction extends ActionSupport { +public class LocaleAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,11 +22,8 @@ package fr.ifremer.coser.web.actions; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; -import fr.ifremer.coser.web.CoserWebConfig; -import fr.ifremer.coser.web.ServiceFactory; - /** * Quality action. * @@ -36,19 +33,9 @@ * Last update : $Date$ * By : $Author$ */ -public class QualityAction extends ActionSupport { +public class QualityAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; - /** - * Recupere l'email dans la configuration. - * - * @return admin email - */ - public String getAdminEmail() { - CoserWebConfig config = ServiceFactory.getCoserConfig(); - String email = config.getAdminEmail(); - return email; - } } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Survey description action. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SurveyAction extends ActionSupport { +public class SurveyAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = -7450643911834502103L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,13 +31,12 @@ import org.apache.struts2.ServletActionContext; import org.nuiton.util.StringUtil; -import com.opensymphony.xwork2.Action; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebConfig; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Upload results action. @@ -50,7 +49,7 @@ * Last update : $Date$ * By : $Author$ */ -public class UploadResultAction implements Action { +public class UploadResultAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3887268253160622587L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, affiche la liste des facades majeures. @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends ActionSupport { +public class FacadeAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.com; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -35,7 +35,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphAction extends ActionSupport { +public class GraphAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Télécharge les données qui ont servi a généré le graph au format CSV. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphCsvAction extends ActionSupport { +public class GraphCsvAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphDataAction extends ActionSupport { +public class GraphDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,8 +24,6 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; @@ -40,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonFacade extends ActionSupport { +public abstract class CommonFacade extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-01-23 21:03:33 UTC (rev 543) @@ -28,8 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; @@ -45,7 +43,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonIndicator extends ActionSupport { +public abstract class CommonIndicator extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,8 +24,6 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; @@ -41,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonZone extends ActionSupport { +public abstract class CommonZone extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.map; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MapAction extends ActionSupport { +public class MapAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -30,12 +30,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Appéle par le navigateur pour recuperer le contenu de l'image. @@ -46,7 +45,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MapDataAction extends ActionSupport { +public class MapDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -27,12 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Recupere la liste des especes correspondant a une campagne. @@ -43,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SpeciesAction extends ActionSupport { +public class SpeciesAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche la liste des sous zones (zone). @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SurveyAction extends ActionSupport { +public class SurveyAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, affiche la liste des facades majeures. @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends ActionSupport { +public class FacadeAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.pop; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -35,7 +35,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphAction extends ActionSupport { +public class GraphAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Télécharge les données qui ont servi a généré le graph au format CSV. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphCsvAction extends ActionSupport { +public class GraphCsvAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphDataAction extends ActionSupport { +public class GraphDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.pop; -import fr.ifremer.coser.web.actions.common.CommonIndicator; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class IndicatorAction extends CommonIndicator { +public class IndicatorAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -27,12 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -43,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SpeciesAction extends ActionSupport { +public class SpeciesAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,12 +22,11 @@ package fr.ifremer.coser.web.actions.source; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche les liens de téléchargement du zip pour le projet choisit. @@ -38,7 +37,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceAction extends ActionSupport { +public class SourceAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Force le téléchargement du zip. @@ -47,7 +46,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceDataAction extends ActionSupport { +public class SourceDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.source; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche l'avertissement qualité avant le téléchargement du zip. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceQualityAction extends ActionSupport { +public class SourceQualityAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2011-01-23 21:03:33 UTC (rev 543) @@ -1,3 +1,4 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2011-01-23 21:03:33 UTC (rev 543) @@ -1,3 +1,4 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -35,7 +35,7 @@ <p><s:text name="message.source.paragraph1" /></p> <p> <s:text name="message.source.paragraph2"> - <s:param><a href="mailto:harmonie at ifremer.fr">harmonie at ifremer.fr</a></s:param> + <s:param><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> </s:text> </p> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -74,8 +74,8 @@ <div class="mgt20"> <h3><s:text name="message.layout.oceanicdatatitle" /></h3> <ul> - <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien"><s:text name="message.layout.oceanicdata1" /></a></li> - <li><a href="http://www.ifremer.fr/sih/" class="lien"><s:text name="message.layout.oceanicdata2" /></a></li> + <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien" target="_blank"><s:text name="message.layout.oceanicdata1" /></a></li> + <li><a href="http://www.ifremer.fr/sih/" class="lien" target="_blank"><s:text name="message.layout.oceanicdata2" /></a></li> </ul> </div> </div> @@ -83,8 +83,31 @@ </div> <div id="footer"> <ul class="clearfix"> - <li><a href="harmonie at ifremer.fr">Contact</a></li> - <li><a href="#">Mentions Légales</a></li> + <li> + <a href="http://coser.labs.libre-entreprise.org/" title="Documentation de l'application" target="_blank"> + Coser + </a> + </li> + <li> + <a href="http://coser.labs.libre-entreprise.org/coser/release-note.html" title="Modifications faites pour cette version" target="_blank"> + <s:property value='applicationVersion' /> + </a> + </li> + <li> + <a href="mailto:harmonie at ifremer.fr" title="Contacter un responsable"> + Contact + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="Licence AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2010 - 2011 + <a href="http://www.ifremer.fr" title="Ifremer" target="blank">Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank">Code Lutin</a> + </li> </ul> </div> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -85,8 +85,31 @@ </div> <div id="footer"> <ul class="clearfix"> - <li><a href="harmonie at ifremer.fr">Contact</a></li> - <li><a href="#">Mentions Légales</a></li> + <li> + <a href="http://coser.labs.libre-entreprise.org/" title="Documentation de l'application" target="_blank"> + Coser + </a> + </li> + <li> + <a href="http://coser.labs.libre-entreprise.org/coser/release-note.html" title="Modifications faites pour cette version" target="_blank"> + <s:property value='applicationVersion' /> + </a> + </li> + <li> + <a href="mailto:harmonie at ifremer.fr" title="Contacter un responsable"> + Contact + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="Licence AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2010 - 2011 + <a href="http://www.ifremer.fr" title="Ifremer" target="blank">Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank">Code Lutin</a> + </li> </ul> </div> </body>