- Echobase-commits - mailman.cloud.codelutin.com

r132 - in trunk/echobase-ui/src/main: env/dev/resources java/fr/ifremer/echobase/ui/actions/export java/fr/ifremer/echobase/ui/actions/importData resources resources/config resources/fr/ifremer/echobase/ui/actions/importData resources/i18n webapp/WEB-INF/includes webapp/WEB-INF/jsp webapp/WEB-INF/jsp/import webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com 26 Nov '11

26 Nov '11

Author: tchemit Date: 2011-11-26 11:50:09 +0100 (Sat, 26 Nov 2011) New Revision: 132 Url: http://forge.codelutin.com/repositories/revision/echobase/132 Log: - usage of EchoBaseServiceSupport when possible - rename import package to importData (there will be a importacces package as well) - change voyage to mission in import data - remove log4j file (see the env directory) Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMission.java trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureMission-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importProgress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage.java trunk/echobase-ui/src/main/resources/config/struts-import.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage-validation.xml trunk/echobase-ui/src/main/resources/log4j.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureFiles.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureVoyage.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importResult.jsp Modified: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml 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/header.jsp Modified: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2011-11-26 10:50:09 UTC (rev 132) @@ -31,6 +31,5 @@ # package level log4j.logger.fr.ifremer.echobase=INFO -log4j.logger.fr.ifremer.echobase.services.ioc=WARN log4j.logger.org.nuiton=WARN log4j.logger.org.nuiton.topia.migration=INFO Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java 2011-11-26 10:50:09 UTC (rev 132) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.VoyageService; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.nuiton.util.Version; @@ -72,7 +72,8 @@ @Override public String execute() throws Exception { - VoyageService service = newService(VoyageService.class); + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); List<Voyage> allVoyages = service.getEntities(Voyage.class); voyages = sortAndDecorate(allVoyages, null); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java 2011-11-26 10:50:09 UTC (rev 132) @@ -25,9 +25,9 @@ import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.ImportDataConfiguration; -import fr.ifremer.echobase.services.VoyageService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -54,10 +54,10 @@ protected ImportDataConfiguration model; /** Id of selected voyage used in import. */ - protected String voyageId; + protected String missionId; - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; + public void setMissionId(String missionId) { + this.missionId = missionId; } public void setAcoustic(File file) { @@ -120,8 +120,8 @@ getModel().getTypeEchoSpeciesFile().setFileName(fileName); } - public String getVoyageId() { - return voyageId; + public String getMissionId() { + return missionId; } public ImportDataConfiguration getModel() { @@ -145,7 +145,9 @@ ImportDataConfiguration importModel = getModel(); File tempDirectory = FileUtils.getTempDirectory(); - File dataDirectory = new File(tempDirectory, "echobase-import" + System.currentTimeMillis()); + File dataDirectory = new File( + tempDirectory, + "echobase-import" + System.currentTimeMillis()); FileUtil.createDirectoryIfNecessary(dataDirectory); if (log.isInfoEnabled()) { log.info("Temporary directory to use : " + dataDirectory); @@ -163,13 +165,15 @@ @Override public void prepare() throws Exception { - VoyageService service = newService(VoyageService.class); + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); - Voyage voyage = service.getEntityById(Voyage.class, voyageId); - getModel().setVoyage(voyage); + Mission mission = service.getEntityById(Mission.class, missionId); + getModel().setMission(mission); } - protected void copyFile(InputFile inputFile, File dataDirectory) throws IOException { + protected void copyFile(InputFile inputFile, + File dataDirectory) throws IOException { File source = inputFile.getFile(); if (source != null) { Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMission.java (from rev 127, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMission.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMission.java 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,125 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.entities.references.MissionImpl; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.ImportDataService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.List; +import java.util.Map; + +/** + * Configure the mission to use in the data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ConfigureMission extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(ConfigureMission.class); + + /** Universe of existing missions. */ + protected Map<String, String> missions; + + /** Universe of possible import modes. */ + protected Map<String, String> importModes; + + /** Selected import mode. */ + protected ImportMode importMode; + + /** mission to use. */ + protected Mission mission; + + public Mission getMission() { + if (mission == null) { + mission = new MissionImpl(); + } + return mission; + } + + public Map<String, String> getImportModes() { + return importModes; + } + + public Map<String, String> getMissions() { + return missions; + } + + public ImportMode getImportMode() { + return importMode; + } + + public void setImportMode(ImportMode importMode) { + this.importMode = importMode; + } + + @Override + public String input() throws Exception { + importModes = Maps.newLinkedHashMap(); + for (ImportMode mode : ImportMode.values()) { + importModes.put(mode.name(), _(mode.getI18nKey())); + } + + if (importMode == null) { + importMode = ImportMode.USE_EXISTING_MISSION; + } + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + List<Mission> allMissions = service.getEntities(Mission.class); + missions = sortAndDecorate(allMissions, null); + + if (log.isInfoEnabled()) { + log.info("File errors : " + getFieldErrors()); + } + return INPUT; + } + + @InputConfig(methodName = "input") + @Override + public String execute() throws Exception { + + if (importMode == ImportMode.CREATE_NEW_MISSION) { + + // create voyage in db + ImportDataService service = newService(ImportDataService.class); + Mission missionToCreate = getMission(); + + mission = service.createMission(missionToCreate); + } + return SUCCESS; + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMission.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage.java 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage.java 2011-11-26 10:50:09 UTC (rev 132) @@ -1,170 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import com.google.common.collect.Maps; -import com.opensymphony.xwork2.interceptor.annotations.InputConfig; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.data.VoyageImpl; -import fr.ifremer.echobase.entities.references.AreaOfOperation; -import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.services.VoyageService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.List; -import java.util.Map; - -/** - * Configure the step 1 of import data (says which campagne to use). - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ConfigureVoyage extends EchoBaseActionSupport { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(ConfigureVoyage.class); - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing missions. */ - protected Map<String, String> missions; - - /** Universe of existing areaOfOperations. */ - protected Map<String, String> areaOfOperations; - - /** Universe of possible import modes. */ - protected Map<String, String> importModes; - - /** Selected import mode. */ - protected ImportMode importMode; - - /** Voyage to use. */ - protected Voyage voyage; - - /** Mission selected id. */ - protected String missionId; - - /** Area of operation selected id. */ - protected String areaOfOperationId; - - public Voyage getVoyage() { - if (voyage == null) { - voyage = new VoyageImpl(); - } - return voyage; - } - - public Map<String, String> getImportModes() { - return importModes; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getMissions() { - return missions; - } - - public Map<String, String> getAreaOfOperations() { - return areaOfOperations; - } - - public ImportMode getImportMode() { - return importMode; - } - - public void setMissionId(String missionId) { - this.missionId = missionId; - } - - public void setAreaOfOperationId(String areaOfOperationId) { - this.areaOfOperationId = areaOfOperationId; - } - - public void setImportMode(ImportMode importMode) { - this.importMode = importMode; - } - - @Override - public String input() throws Exception { - importModes = Maps.newLinkedHashMap(); - for (ImportMode mode : ImportMode.values()) { - importModes.put(mode.name(), _(mode.getI18nKey())); - } - - if (importMode == null) { - importMode = ImportMode.USE_EXISTING_VOYAGE; - } - - VoyageService service = newService(VoyageService.class); - List<Voyage> allVoyages = service.getEntities(Voyage.class); - voyages = sortAndDecorate(allVoyages, null); - - List<Mission> allMissions = service.getEntities(Mission.class); - missions = sortAndDecorate(allMissions, null); - - List<AreaOfOperation> allAreaOfOperations = - service.getEntities(AreaOfOperation.class); - areaOfOperations = sortAndDecorate(allAreaOfOperations, null); - if (log.isInfoEnabled()) { - log.info("File errors : "+getFieldErrors()); - } - return INPUT; - } - - @InputConfig(methodName = "input") - @Override - public String execute() throws Exception { - - if (importMode == ImportMode.CREATE_NEW_VOYAGE) { - - // create voyage in db - VoyageService service = newService(VoyageService.class); - Voyage voyageToCreate = getVoyage(); - //TODO Remove this test when references will be ok - if (StringUtils.isNotEmpty(missionId)) { - Mission mission = - service.getEntityById(Mission.class, missionId); - voyage.setMission(mission); - } - //TODO Remove this test when references will be ok - if (StringUtils.isNotEmpty(areaOfOperationId)) { - AreaOfOperation area = service.getEntityById(AreaOfOperation.class, - areaOfOperationId); - voyage.setAreaOfOperation(area); - } - voyage = service.createVoyage(voyageToCreate); - } - return SUCCESS; - } - -} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2011-11-26 10:50:09 UTC (rev 132) @@ -33,8 +33,8 @@ */ public enum ImportMode { - CREATE_NEW_VOYAGE(n_("echobase.common.importMode.createNewVoyage")), - USE_EXISTING_VOYAGE(n_("echobase.common.importMode.useExistingVoyage")); + CREATE_NEW_MISSION(n_("echobase.common.importMode.createNewMission")), + USE_EXISTING_MISSION(n_("echobase.common.importMode.useExistingMission")); private final String i18nKey; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java 2011-11-26 10:50:09 UTC (rev 132) @@ -66,7 +66,7 @@ public void prepare() throws Exception { model = getEchoBaseSession().getImportDataConfiguration(); - + service = newService(ImportDataService.class); } @@ -75,8 +75,8 @@ try { if (log.isInfoEnabled()) { - log.info("Start imports with voyage " + - model.getVoyage().getVoyageName()); + log.info("Start imports with mission " + + model.getMission().getMissionName()); } importResult = service.startImport(model); Deleted: trunk/echobase-ui/src/main/resources/config/struts-import.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-import.xml 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/config/struts-import.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - - - -<!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="import" extends="loggued" namespace="/import"> - -  - <action name="configureVoyage" - class="fr.ifremer.echobase.ui.actions.importData.ConfigureVoyage"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> - <result name="input">/WEB-INF/jsp/import/configureVoyage.jsp</result> - <result type="redirectAction"> - <param name="namespace">/import</param> - <param name="actionName">configureFiles</param> - <param name="method">input</param> - <param name="voyageId">${voyage.topiaId}</param> - </result> - </action> - -  - <action name="configureFiles" - class="fr.ifremer.echobase.ui.actions.importData.ConfigureFiles"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> - <result name="input">/WEB-INF/jsp/import/configureFiles.jsp</result> - <result type="redirectAction"> - <param name="namespace">/import</param> - <param name="actionName">doImport</param> - </result> - </action> - -  - <action name="doImport" - class="fr.ifremer.echobase.ui.actions.importData.LaunchImport" - method="execute"> - <interceptor-ref name="basicStackLoggued"/> - <interceptor-ref name="execAndWait"/> - <result name="wait">/WEB-INF/jsp/import/importProgress.jsp</result> - <result>/WEB-INF/jsp/import/importResult.jsp</result> - </action> - - </package> - -</struts> - Copied: trunk/echobase-ui/src/main/resources/config/struts-importData.xml (from rev 127, trunk/echobase-ui/src/main/resources/config/struts-import.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<!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="import" extends="loggued" namespace="/importData"> + +  + <action name="configureMission" + class="fr.ifremer.echobase.ui.actions.importData.ConfigureMission"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/importData/configureMission.jsp</result> + <result type="redirectAction"> + <param name="namespace">/importData</param> + <param name="actionName">configureFiles</param> + <param name="method">input</param> + <param name="missionId">${mission.topiaId}</param> + </result> + </action> + +  + <action name="configureFiles" + class="fr.ifremer.echobase.ui.actions.importData.ConfigureFiles"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/importData/configureFiles.jsp</result> + <result type="redirectAction"> + <param name="namespace">/importData</param> + <param name="actionName">doImport</param> + </result> + </action> + +  + <action name="doImport" + class="fr.ifremer.echobase.ui.actions.importData.LaunchImport" + method="execute"> + <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="execAndWait"/> + <result name="wait">/WEB-INF/jsp/importData/importProgress.jsp</result> + <result>/WEB-INF/jsp/importData/importResult.jsp</result> + </action> + + </package> + +</struts> + Property changes on: trunk/echobase-ui/src/main/resources/config/struts-importData.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -26,7 +26,7 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="voyageId"> + <field name="missionId"> <field-validator type="requiredstring"> <message key="echobase.error.import.voyage.required"/> </field-validator> Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureMission-validation.xml (from rev 127, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureMission-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureMission-validation.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,56 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="importMode"> + <field-validator type="required"> + <message key="echobase.error.import.importMode.required"/> + </field-validator> + </field> + + <field name="mission.topiaId"> + <field-validator type="requiredstring"> + <param name="skip">importMode.name() != "USE_EXISTING_MISSION"</param> + <message key="echobase.error.import.mission.required"/> + </field-validator> + </field> + + <field name="mission.missionName"> + <field-validator type="requiredstring"> + <param name="skip">importMode.name() != "CREATE_NEW_MISSION"</param> + <message key="echobase.error.import.missionName.required"/> + </field-validator> + </field> + + <field name="mission.missionAbstract"> + <field-validator type="requiredstring"> + <param name="skip">importMode.name() != "CREATE_NEW_MISSION"</param> + <message key="echobase.error.import.missionAbstract.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureMission-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage-validation.xml 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureVoyage-validation.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -1,92 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="importMode"> - <field-validator type="required"> - <message key="echobase.error.import.importMode.required"/> - </field-validator> - </field> - - <field name="voyage.topiaId"> - <field-validator type="requiredstring"> - <param name="skip">importMode.name() != "USE_EXISTING_VOYAGE"</param> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="voyage.voyageName"> - <field-validator type="requiredstring"> - <param name="skip">importMode.name() != "CREATE_NEW_VOYAGE"</param> - <message key="echobase.error.import.voyageName.required"/> - </field-validator> - </field> - - <field name="voyage.datum"> - <field-validator type="requiredstring"> - <param name="skip">importMode.name() != "CREATE_NEW_VOYAGE"</param> - <message key="echobase.error.import.datum.required"/> - </field-validator> - </field> - - <field name="voyage.voyageDescription"> - <field-validator type="requiredstring"> - <param name="skip">importMode.name() != "CREATE_NEW_VOYAGE"</param> - <message key="echobase.error.import.voyageDescription.required"/> - </field-validator> - </field> - -  -  - -  - - <field name="voyage.voyageStartDate"> - <field-validator type="required"> - <param name="skip">importMode.name() != "CREATE_NEW_VOYAGE"</param> - <message key="echobase.error.import.voyageStartDate.required"/> - </field-validator> - </field> - - <field name="voyage.voyageEndDate"> - <field-validator type="required"> - <param name="skip">importMode.name() != "CREATE_NEW_VOYAGE"</param> - <message key="echobase.error.import.voyageEndDate.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file 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-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-26 10:50:09 UTC (rev 132) @@ -18,14 +18,14 @@ echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête -echobase.action.validateImportVoyage=Valider la campagne +echobase.action.validateImportMission=Valider la mission echobase.common.admin=Administrateur echobase.common.comment=Commentaire echobase.common.email=Email echobase.common.entityType=Type d'entité -echobase.common.importMode=Type de campagne -echobase.common.importMode.createNewVoyage=Créer une nouvelle campagne -echobase.common.importMode.useExistingVoyage=Utiliser une campagne existante +echobase.common.importMode=Type de mission +echobase.common.importMode.createNewMission=Créer une nouvelle mission +echobase.common.importMode.useExistingMission=Utiliser une mission existante echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion @@ -37,9 +37,12 @@ echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide -echobase.error.fileDontExist= -echobase.error.fileNotFound= -echobase.error.import.selectedVoyageOrAccessImport.required=Merci de selectionner un campagne +echobase.error.fileDontExist=Fichier inexistant +echobase.error.fileNotFound=Fichier non trouvé +echobase.error.import.importMode.required=Le mode d'import est obligatoire +echobase.error.import.mission.required=La sélection d'une mission est obligatoire +echobase.error.import.missionAbstract.required=Le résumé de la mission est obligatoire +echobase.error.import.missionName.required=Le nom de la mission est obligatoire echobase.error.importArgument= echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.login.password.requiredstring=Le mot de passe est obligatoire @@ -83,8 +86,8 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.import=Import configuration echobase.legend.import.configuration.files=Choix des fichiers d'import -echobase.legend.import.configuration.voyage=Configurer la campagne -echobase.legend.import.configuration.voyage.resume=Résumé de la campagne à utiliser +echobase.legend.import.configuration.mission=Configurer la mission +echobase.legend.import.configuration.mission.resume=Résumé de la mission à utiliser echobase.legend.importFileResult=Résultat de l'import %s echobase.legend.sqlQuery.configuration=Configuration de la requête echobase.legend.sqlQuery.result=Résultats de la requête Deleted: trunk/echobase-ui/src/main/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/resources/log4j.properties 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/log4j.properties 2011-11-26 10:50:09 UTC (rev 132) @@ -1,35 +0,0 @@ -### -# #%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% -### -# Default to info level output; this is very handy if you eventually use Hibernate as well. -log4j.rootCategory=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n - -# Toute l'application -log4j.logger.fr.ifremer.echobase=INFO \ 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-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-26 10:50:09 UTC (rev 132) @@ -131,7 +131,7 @@ <include file="config/struts-dbeditor.xml"/> <include file="config/struts-user.xml"/> - <include file="config/struts-import.xml"/> + <include file="config/struts-importData.xml"/> <include file="config/struts-export.xml"/> </struts> 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-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -55,7 +55,7 @@ <div class="cleanBoth"> <ul> <li> - <s:a action="configureVoyage" namespace="/import" method="input"> + <s:a action="configureMission" namespace="/importData" method="input"> <s:text name="echobase.menu.import"/></s:a> </li> <li> Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureFiles.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureFiles.jsp 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureFiles.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -1,71 +0,0 @@ -<%-- - #%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 contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="echobase.title.import"/></title> - -<s:form namespace="/import" method="POST" enctype="multipart/form-data"> - - <fieldset> - <legend> - <s:text name="echobase.legend.import.configuration.voyage.resume"/> - </legend> - <s:label value="%{model.voyage.voyageName}" - key='echobase.common.voyageName'/> - - <s:label value="%{model.voyage.voyageDescription}" - key='echobase.common.voyageDescription'/> - </fieldset> - - <hr/> - <fieldset> - <legend> - <s:text name="echobase.legend.import.configuration.files"/> - </legend> - - <s:hidden key="voyageId" label=''/> - - <s:file name="acoustic" - key="echobase.label.import.accoustique"/> - - <s:file name="capture" - key="echobase.label.import.pecherie"/> - - <s:file name="lectureAgeGen" - key="echobase.label.import.lectureAgeGen"/> - - <s:file name="events" - key="echobase.label.import.events"/> - - <s:file name="typeEchoSpecies" - key="echobase.label.import.typeEchoSpecies"/> - - </fieldset> - <br/> - <s:submit id="addFilesSubmit" action="configureFiles" - value='%{getText("echobase.action.import")}'/> - - -</s:form> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureVoyage.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureVoyage.jsp 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureVoyage.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -1,127 +0,0 @@ -<%-- - #%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 contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<script type="text/javascript"> - - jQuery(document).ready(function () { - - var importMode = $('[name="importMode"]'); - importMode.change(function(event) { - $('[class="importMode"]').hide(); - $('#' + this.value).show(); - }); - var val = $('[name="importMode"][checked="checked"]').val(); - $('[class="importMode"]').hide(); - $("#"+val).show(); - }); -</script> -<title><s:text name="echobase.title.import.configuration"/></title> - -<s:form id="importForm" namespace="/import" method="POST"> - - <fieldset> - <legend> - <s:text name="echobase.legend.import.configuration.voyage"/> - </legend> - - <s:radio key='importMode' list="importModes" - label='%{getText("echobase.common.importMode")}' - required="true" /> - - <hr/> - - <div id='USE_EXISTING_VOYAGE' class='importMode'> - <s:select name="voyage.topiaId" value="''" - label='%{getText("echobase.common.voyage")}' - list="voyages" headerKey="" headerValue=""/> - </div> - - <div id='CREATE_NEW_VOYAGE' class='importMode'> - - <%-- - String PROPERTY_VOYAGE_NAME = "voyageName"; - - String PROPERTY_VOYAGE_START_DATE = "voyageStartDate"; - - String PROPERTY_VOYAGE_END_DATE = "voyageEndDate"; - - String PROPERTY_VOYAGE_START_HARBOUR = "voyageStartHarbour"; - - String PROPERTY_VOYAGE_END_HARBOUR = "voyageEndHarbour"; - - String PROPERTY_VOYAGE_DESCRIPTION = "voyageDescription"; - - String PROPERTY_DATUM = "datum"; - - String PROPERTY_MISSION = "mission"; - - String PROPERTY_AREA_OF_OPERATION = "areaOfOperation"; - - String PROPERTY_TRANSIT = "transit"; - - String PROPERTY_ECHOTYPE = "echotype"; - --%> - - <s:textfield key="voyage.voyageName" - label='%{getText("echobase.common.voyageName")}'/> - - <s:textfield key="voyage.voyageStartHarbour" - label='%{getText("echobase.common.voyageStartHarbour")}'/> - - <s:textfield key="voyage.voyageEndHarbour" - label='%{getText("echobase.common.voyageEndHarbour")}'/> - - <s:textfield key="voyage.datum" - label='%{getText("echobase.common.datum")}'/> - - <s:textarea key="voyage.voyageDescription" - label='%{getText("echobase.common.voyageDescription")}'/> - - <s:select name="missionId" value="''" - label='%{getText("echobase.common.mission")}' - list="missions" headerKey="" headerValue=""/> - - <s:select name="areaOfOperationId" value="''" - label='%{getText("echobase.common.areaOfOperation")}' - list="areaOfOperations" headerKey="" headerValue=""/> - - <sj:datepicker key="voyage.voyageStartDate" - label='%{getText("echobase.common.voyageStartDate")}' - value="%{new java.util.Date()}" - displayFormat="dd/mm/yy"/> - - <sj:datepicker key="voyage.voyageEndDate" - label='%{getText("echobase.common.voyageEndDate")}' - value="%{new java.util.Date()}" - displayFormat="dd/mm/yy"/> - </div> - - </fieldset> - <br/> - <s:submit value='%{getText("echobase.action.validateImportVoyage")}' - action="configureVoyage" /> -</s:form> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -1,61 +0,0 @@ -<%-- - #%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 contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="echobase.title.import"/></title> - -<s:form id="importForm" action="doImport" namespace="/import" method="POST" - enctype="multipart/form-data"> - - <fieldset> - <legend> - <s:text name="echobase.legend.import"/> - </legend> - <s:select key="selectedVoyageId" - label='%{getText("echobase.common.voyage")}' - list="voyages" - emptyOption="true" - headerKey="-1" - headerValue='%{getText("echobase.header.voyageSelect")}' /> - - <s:file name="importModel.accessImport" - key="echobase.label.import.access"/> - <s:file name="importModel.accousticImport" - key="echobase.label.import.accoustique"/> - <s:file name="importModel.pecherieImport" - key="echobase.label.import.pecherie"/> - <s:file name="importModel.lectureAgeGenImport" - key="echobase.label.import.lectureAgeGen"/> - <s:file name="importModel.eventsImport" - key="echobase.label.import.events"/> - <s:file name="importModel.typeEchoSpeciesImport" - key="echobase.label.import.typeEchoSpecies"/> - - <s:textarea name="importModel.comment" rows="4" cols="50" key="echobase.common.comment"/> - - </fieldset> - <br/> - <s:submit id="addFilesSubmit" value='%{getText("echobase.action.import")}'/> -</s:form> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -1,40 +0,0 @@ -<%-- - #%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 contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<s:url id="url" action="doImport" namespace="/import"/> -<meta http-equiv="refresh" content="1;url=${url}"/> - -<title><s:text name="echobase.title.importProgress"/></title> - -<%-- TODO letellier 20111104 : Add warn icon --%> -<p><s:text name="echobase.message.warnImportInProgress"/></p> - -<br/> - -<div> - <sj:progressbar value="%{model.progression}"/> -</div> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importResult.jsp 2011-11-26 10:46:13 UTC (rev 131) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importResult.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -1,48 +0,0 @@ -<%-- - #%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 contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="echobase.title.importResult"/></title> - -<s:iterator value="importResult" var="entry"> - <s:set var="inputFile" value="%{#entry.key}"/> - <s:set var="result" value="%{#entry.value}"/> - <fieldset> - <legend> - <s:text name="echobase.legend.importFileResult"> - <s:param><strong><s:property value="%{#inputFile.label}"/></strong></s:param> - </s:text> - </legend> - - <s:label value="%{#inputFile.fileName}" - label="%{getText('echobase.label.importFile')}"/> - - <s:label value="%{#result.numberCreated}" - label="%{getText('echobase.label.numberOfCreatedEntities')}"/> - - <s:label value="%{#result.numberUpdated}" - label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> - </fieldset> -</s:iterator> Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp (from rev 127, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureFiles.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,71 @@ +<%-- + #%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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="echobase.title.import"/></title> + +<s:form namespace="/importData" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text name="echobase.legend.import.configuration.mission.resume"/> + </legend> + <s:label value="%{model.mission.missionName}" + key='echobase.common.missionName'/> + + <s:label value="%{model.mission.missionAbstract}" + key='echobase.common.missionAbstract'/> + </fieldset> + + <hr/> + <fieldset> + <legend> + <s:text name="echobase.legend.import.configuration.files"/> + </legend> + + <s:hidden key="voyageId" label=''/> + + <s:file name="acoustic" + key="echobase.label.import.accoustique"/> + + <s:file name="capture" + key="echobase.label.import.pecherie"/> + + <s:file name="lectureAgeGen" + key="echobase.label.import.lectureAgeGen"/> + + <s:file name="events" + key="echobase.label.import.events"/> + + <s:file name="typeEchoSpecies" + key="echobase.label.import.typeEchoSpecies"/> + + </fieldset> + <br/> + <s:submit id="addFilesSubmit" action="configureFiles" + value='%{getText("echobase.action.import")}'/> + + +</s:form> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp (from rev 127, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/configureVoyage.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,156 @@ +<%-- + #%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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + $('[name="importMode"]').change(function(event) { + $('[class="importMode"]').hide(); + $('#' + this.value).show(); + }); + var val = $('[name="importMode"][checked="checked"]').val(); + $('[class="importMode"]').hide(); + $("#" + val).show(); + }); +</script> +<title><s:text name="echobase.title.import.configuration"/></title> + +<s:form id="importForm" namespace="/importData" method="POST"> + + <fieldset> + <legend> + <s:text name="echobase.legend.import.configuration.mission"/> + </legend> + + <s:radio key='importMode' list="importModes" + label='%{getText("echobase.common.importMode")}' + required="true"/> + + <hr/> + + <div id='USE_EXISTING_MISSION' class='importMode'> + <s:select name="mission.topiaId" value="''" + label='%{getText("echobase.common.mission")}' + list="missions" headerKey="" headerValue=""/> + </div> + + <div id='CREATE_NEW_MISSION' class='importMode'> + + <%-- + String PROPERTY_MISSION_NAME = "missionName"; + + String PROPERTY_LITTERATURE_REFERENCES = "litteratureReferences"; + + String PROPERTY_MISSION_ABSTRACT = "missionAbstract"; + + String PROPERTY_PROJECT = "project"; + + String PROPERTY_PLATFORM = "platform"; + + String PROPERTY_INSTITUTION = "institution"; + + String PROPERTY_KEYWORDS = "keywords"; + + String PROPERTY_DATA_CENTRE = "dataCentre"; + + String PROPERTY_DATA_CENTRE_EMAIL = "dataCentreEmail"; + + String PROPERTY_AUTHOR = "author"; + + String PROPERTY_AUTHOR_EMAIL = "authorEmail"; + + String PROPERTY_PRINCIPAL_INVESTIGATOR = "principalInvestigator"; + + String PROPERTY_PRINCIPAL_INVESTIGATOR_EMAIL = "principalInvestigatorEmail"; + + String PROPERTY_ORGANISATION_REFERENCES = "organisationReferences"; + + String PROPERTY_DISTRIBUTION_STATEMENT = "distributionStatement"; + + String PROPERTY_ORGANISATION_LEVEL_ACKNOWLEDGEMENTS = "organisationLevelAcknowledgements"; + + String PROPERTY_SOURCE = "source"; + --%> + + <s:textfield key="mission.missionName" size="40" required="true" + label='%{getText("echobase.common.missionName")}'/> + + <s:textfield key="mission.missionAbstract" size="40" required="true" + label='%{getText("echobase.common.missionAbstract")}'/> + + <s:textfield key="mission.litteratureReferences" size="40" + label='%{getText("echobase.common.litteratureReferences")}'/> + + <s:textfield key="mission.project" + label='%{getText("echobase.common.project")}'/> + + <s:textfield key="mission.platform" + label='%{getText("echobase.common.platform")}'/> + + <s:textfield key="mission.institution" + label='%{getText("echobase.common.institution")}'/> + + <s:textfield key="mission.keywords" + label='%{getText("echobase.common.keywords")}'/> + + <s:textfield key="mission.dataCentre" + label='%{getText("echobase.common.dataCentre")}'/> + + <s:textfield key="mission.dataCentreEmail" + label='%{getText("echobase.common.dataCentreEmail")}'/> + + <s:textfield key="mission.author" + label='%{getText("echobase.common.author")}'/> + + <s:textfield key="mission.authorEmail" + label='%{getText("echobase.common.authorEmail")}'/> + + <s:textfield key="mission.principalInvestigator" + label='%{getText("echobase.common.principalInvestigator")}'/> + + <s:textfield key="mission.principalInvestigatorEmail" + label='%{getText("echobase.common.principalInvestigatorEmail")}'/> + + <s:textfield key="mission.organisationReferences" + label='%{getText("echobase.common.organisationReferences")}'/> + + <s:textfield key="mission.distributionStatement" + label='%{getText("echobase.common.distributionStatement")}'/> + + <s:textfield key="mission.organisationLevelAcknowledgements" + label='%{getText("echobase.common.organisationLevelAcknowledgements")}'/> + + <s:textfield key="mission.source" + label='%{getText("echobase.common.source")}'/> + </div> + + </fieldset> + <br/> + <s:submit value='%{getText("echobase.action.validateImportMission")}' + action="configureMission"/> +</s:form> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importProgress.jsp (from rev 127, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importProgress.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importProgress.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,40 @@ +<%-- + #%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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="doImport" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importProgress.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp (from rev 127, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importResult.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp 2011-11-26 10:50:09 UTC (rev 132) @@ -0,0 +1,48 @@ +<%-- + #%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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="echobase.title.importResult"/></title> + +<s:iterator value="importResult" var="entry"> + <s:set var="inputFile" value="%{#entry.key}"/> + <s:set var="result" value="%{#entry.value}"/> + <fieldset> + <legend> + <s:text name="echobase.legend.importFileResult"> + <s:param><strong><s:property value="%{#inputFile.label}"/></strong></s:param> + </s:text> + </legend> + + <s:label value="%{#inputFile.fileName}" + label="%{getText('echobase.label.importFile')}"/> + + <s:label value="%{#result.numberCreated}" + label="%{getText('echobase.label.numberOfCreatedEntities')}"/> + + <s:label value="%{#result.numberUpdated}" + label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> + </fieldset> +</s:iterator> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r131 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 26 Nov '11

26 Nov '11

Author: tchemit Date: 2011-11-26 11:46:13 +0100 (Sat, 26 Nov 2011) New Revision: 131 Url: http://forge.codelutin.com/repositories/revision/echobase/131 Log: use mission instead of voyage in importData service + prefer use a support service (not abstract at all and can be use for generci db requests Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java Deleted: 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-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -1,128 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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% - */ -package fr.ifremer.echobase.services; - -import com.google.common.base.Preconditions; -import fr.ifremer.echobase.EchoBaseConfiguration; -import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.entities.EchoBaseDAOHelper; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.meta.DbMeta; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.Date; -import java.util.List; -import java.util.Locale; - -/** - * @author sletellier <letellier(a)codelutin.com> - * @since 0.1 - */ -public class AbstractEchoBaseService implements EchoBaseService { - - protected EchoBaseServiceContext serviceContext; - - @Override - public void setServiceContext(EchoBaseServiceContext serviceContext) { - this.serviceContext = serviceContext; - } - - public <E extends TopiaEntity> List<E> getEntities(Class<E> entityType) { - Preconditions.checkNotNull(entityType); - try { - List<E> result = getDAO(entityType).findAll(); - return result; - } catch (TopiaException eee) { - throw new EchoBaseTechnicalException( - "Could not obtain data for type " + entityType, eee); - } - } - - public <E extends TopiaEntity> E getEntityById(Class<E> entityType, String id) { - Preconditions.checkNotNull(entityType); - Preconditions.checkArgument(StringUtils.isNotEmpty(id)); - try { - E result = getDAO(entityType).findByTopiaId(id); - return result; - } catch (TopiaException eee) { - throw new EchoBaseTechnicalException( - "Could not obtain data of id [" + id + "] for type " + - entityType, eee); - } - } - - protected TopiaContext getTransaction() { - return serviceContext.getTransaction(); - } - - protected Locale getLocale() { - return serviceContext.getLocale(); - } - - protected DbMeta getDbMeta() { - return serviceContext.getDbMeta(); - } - - protected EchoBaseConfiguration getConfiguration() { - return serviceContext.getConfiguration(); - } - - protected <E extends EchoBaseService> E newService(Class<E> serviceClass) { - E e = serviceContext.newService(serviceClass); - return e; - } - - protected <E extends TopiaEntity> TopiaDAO<E> getDAO(EchoBaseEntityEnum entityEnum) throws TopiaException { - TopiaDAO<E> dao = getDAO((Class<E>) entityEnum.getContract()); - return dao; - } - - protected <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityType) throws TopiaException { - TopiaDAO<E> dao = EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO( - getTransaction(), - entityType); - - return dao; - } - - protected void commitTransaction(String errorMessage) { - try { - getTransaction().commitTransaction(); - } catch (TopiaException eee) { - throw new EchoBaseTechnicalException(errorMessage, eee); - } - } - - protected Date newDate() { - Date result = new Date(); - DateUtils.setMilliseconds(result, 0); - return result; - } - -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -62,7 +62,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class DbEditorService extends AbstractEchoBaseService { +public class DbEditorService extends EchoBaseServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(DbEditorService.class); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.decorator.Decorator; @@ -47,7 +48,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class DecoratorService extends AbstractEchoBaseService { +public class DecoratorService extends EchoBaseServiceSupport { protected final DecoratorMulti18nProvider decoratorProvider; @@ -121,6 +122,9 @@ // user decorator registerJXPathDecorator(locale, EchoBaseUser.class, "${email}$s"); + // mission decorator + registerJXPathDecorator(locale, Mission.class, "${missionName}$s"); + // voyage decorator registerJXPathDecorator(locale, Voyage.class, "${voyageName}$s"); Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java (from rev 129, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchoBaseService.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2011-11-26 10:46:13 UTC (rev 131) @@ -0,0 +1,128 @@ +/* + * #%L + * EchoBase :: Services + * + * $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% + */ +package fr.ifremer.echobase.services; + +import com.google.common.base.Preconditions; +import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.EchoBaseDAOHelper; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.meta.DbMeta; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Date; +import java.util.List; +import java.util.Locale; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class EchoBaseServiceSupport implements EchoBaseService { + + protected EchoBaseServiceContext serviceContext; + + @Override + public void setServiceContext(EchoBaseServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public <E extends TopiaEntity> List<E> getEntities(Class<E> entityType) { + Preconditions.checkNotNull(entityType); + try { + List<E> result = getDAO(entityType).findAll(); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException( + "Could not obtain data for type " + entityType, eee); + } + } + + public <E extends TopiaEntity> E getEntityById(Class<E> entityType, String id) { + Preconditions.checkNotNull(entityType); + Preconditions.checkArgument(StringUtils.isNotEmpty(id)); + try { + E result = getDAO(entityType).findByTopiaId(id); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException( + "Could not obtain data of id [" + id + "] for type " + + entityType, eee); + } + } + + protected TopiaContext getTransaction() { + return serviceContext.getTransaction(); + } + + protected Locale getLocale() { + return serviceContext.getLocale(); + } + + protected DbMeta getDbMeta() { + return serviceContext.getDbMeta(); + } + + protected EchoBaseConfiguration getConfiguration() { + return serviceContext.getConfiguration(); + } + + protected <E extends EchoBaseService> E newService(Class<E> serviceClass) { + E e = serviceContext.newService(serviceClass); + return e; + } + + protected <E extends TopiaEntity> TopiaDAO<E> getDAO(EchoBaseEntityEnum entityEnum) throws TopiaException { + TopiaDAO<E> dao = getDAO((Class<E>) entityEnum.getContract()); + return dao; + } + + protected <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityType) throws TopiaException { + TopiaDAO<E> dao = EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO( + getTransaction(), + entityType); + + return dao; + } + + protected void commitTransaction(String errorMessage) { + try { + getTransaction().commitTransaction(); + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(errorMessage, eee); + } + } + + protected Date newDate() { + Date result = new Date(); + DateUtils.setMilliseconds(result, 0); + return result; + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -56,7 +56,7 @@ * @author sletellier <letellier(a)codelutin.com> * @since 0.1 */ -public class EmbeddedApplicationService extends AbstractEchoBaseService { +public class EmbeddedApplicationService extends EchoBaseServiceSupport { /** Logger. */ private static final Log log = Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -39,7 +39,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -50,7 +49,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class ExportSqlService extends AbstractEchoBaseService { +public class ExportSqlService extends EchoBaseServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(ExportSqlService.class); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java 2011-11-26 10:46:13 UTC (rev 131) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services; import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; import java.io.Serializable; import java.util.Locale; @@ -41,8 +41,8 @@ private static final long serialVersionUID = 1L; - /** Voyage used for the import (may not be in db if needed to be created). */ - protected Voyage voyage; + /** Mission used for the import (may not be in db if needed to be created). */ + protected Mission mission; protected InputFile acousticFile; @@ -68,8 +68,8 @@ typeEchoSpeciesFile = new InputFile(l_(locale, "echobase.common.typeEchoSpeciesImport")); } - public Voyage getVoyage() { - return voyage; + public Mission getMission() { + return mission; } public InputFile getAcousticFile() { @@ -100,8 +100,8 @@ return progression; } - public void setVoyage(Voyage voyage) { - this.voyage = voyage; + public void setMission(Mission mission) { + this.mission = mission; } public void setProgression(float progression) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -26,9 +26,10 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import java.io.File; import java.util.Map; @@ -39,23 +40,34 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class ImportDataService extends AbstractEchoBaseService { +public class ImportDataService extends EchoBaseServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(ImportDataService.class); + public Mission createMission(Mission mission) { + try { + Mission result = getDAO(Mission.class).create(mission); + commitTransaction("Could not create mission " + + mission.getMissionName()); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(eee); + } + } + public Map<InputFile, CsvImportResult> startImport(ImportDataConfiguration configuration) { Map<InputFile, CsvImportResult> result = Maps.newHashMap(); - Voyage voyage = configuration.getVoyage(); + Mission mission = configuration.getMission(); // compute nb step to treate (means nb imports to do) configuration.computeSteps(); if (log.isInfoEnabled()) { - log.info("Starts data import with voyage " + - voyage.getVoyageName()); + log.info("Starts data import with mission " + + mission.getMissionName()); } InputFile acousticFile = configuration.getAcousticFile(); @@ -63,7 +75,8 @@ // do acoustic import try { - CsvImportResult importResult = importAcoustic(voyage, acousticFile); + CsvImportResult importResult = + importAcoustic(mission, acousticFile); configuration.incrementsProgression(); result.put(acousticFile, importResult); } finally { @@ -76,7 +89,8 @@ // do capture import try { - CsvImportResult importResult = importCapture(voyage, captureFile); + CsvImportResult importResult = + importCapture(mission, captureFile); configuration.incrementsProgression(); result.put(captureFile, importResult); } finally { @@ -89,7 +103,8 @@ // do events import try { - CsvImportResult importResult = importEvents(voyage, eventsFile); + CsvImportResult importResult = + importEvents(mission, eventsFile); configuration.incrementsProgression(); result.put(eventsFile, importResult); } finally { @@ -102,7 +117,8 @@ // do lecture age gen import try { - CsvImportResult importResult = importLectureAgeGen(voyage, lectureAgeGenFile); + CsvImportResult importResult = + importLectureAgeGen(mission, lectureAgeGenFile); configuration.incrementsProgression(); result.put(lectureAgeGenFile, importResult); } finally { @@ -115,7 +131,8 @@ // do echo species import try { - CsvImportResult importResult = importTypeEchoSpecies(voyage, typeEchoSpeciesFile); + CsvImportResult importResult = + importTypeEchoSpecies(mission, typeEchoSpeciesFile); configuration.incrementsProgression(); result.put(typeEchoSpeciesFile, importResult); } finally { @@ -138,7 +155,8 @@ } } - protected CsvImportResult importAcoustic(Voyage voyage, InputFile importFile) { + protected CsvImportResult importAcoustic(Mission mission, + InputFile importFile) { if (log.isInfoEnabled()) { log.info("Starts " + importFile.getLabel() + " with file " + importFile.getFile()); @@ -148,7 +166,8 @@ return result; } - protected CsvImportResult importCapture(Voyage voyage, InputFile importFile) { + protected CsvImportResult importCapture(Mission mission, + InputFile importFile) { if (log.isInfoEnabled()) { log.info("Starts " + importFile.getLabel() + " with file " + importFile.getFile()); @@ -158,7 +177,8 @@ return result; } - protected CsvImportResult importEvents(Voyage voyage, InputFile importFile) { + protected CsvImportResult importEvents(Mission mission, + InputFile importFile) { if (log.isInfoEnabled()) { log.info("Starts " + importFile.getLabel() + " with file " + importFile.getFile()); @@ -168,7 +188,8 @@ return result; } - protected CsvImportResult importLectureAgeGen(Voyage voyage, InputFile importFile) { + protected CsvImportResult importLectureAgeGen(Mission mission, + InputFile importFile) { if (log.isInfoEnabled()) { log.info("Starts " + importFile.getLabel() + " with file " + importFile.getFile()); @@ -178,7 +199,8 @@ return result; } - protected CsvImportResult importTypeEchoSpecies(Voyage voyage, InputFile importFile) { + protected CsvImportResult importTypeEchoSpecies(Mission mission, + InputFile importFile) { if (log.isInfoEnabled()) { log.info("Starts " + importFile.getLabel() + " with file " + importFile.getFile()); 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-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -41,7 +41,7 @@ * @author sletellier <letellier(a)codelutin.com> * @since 0.1 */ -public class UserService extends AbstractEchoBaseService { +public class UserService extends EchoBaseServiceSupport { public static final String DEFAULT_ADMIN_EMAIL = "admin"; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java 2011-11-26 10:45:07 UTC (rev 130) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java 2011-11-26 10:46:13 UTC (rev 131) @@ -1,48 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.entities.data.Voyage; -import org.nuiton.topia.TopiaException; - -/** - * Service to manage all concerning voyages. - * - * @author sletellier <letellier(a)codelutin.com> - */ -public class VoyageService extends AbstractEchoBaseService { - - public Voyage createVoyage(Voyage voyage) { - try { - Voyage result = getDAO(Voyage.class).create(voyage); - commitTransaction("Could not create voyage " + - voyage.getVoyageName()); - return result; - } catch (TopiaException eee) { - throw new EchoBaseTechnicalException(eee); - } - } - -}

1 0

r130 - trunk/echobase-entities/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 26 Nov '11

26 Nov '11

Author: tchemit Date: 2011-11-26 11:45:07 +0100 (Sat, 26 Nov 2011) New Revision: 130 Url: http://forge.codelutin.com/repositories/revision/echobase/130 Log: i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 19:11:42 UTC (rev 129) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-26 10:45:07 UTC (rev 130) @@ -15,8 +15,8 @@ echobase.common.altCallsign= echobase.common.areaOfOperation=areaOfOperation echobase.common.areaOfOperationName= -echobase.common.author= -echobase.common.authorEmail= +echobase.common.author=Auteur +echobase.common.authorEmail=Courriel de l'auteur echobase.common.axis= echobase.common.b= echobase.common.bathymetre= @@ -48,8 +48,8 @@ echobase.common.commonName= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition -echobase.common.dataCentre= -echobase.common.dataCentreEmail= +echobase.common.dataCentre=Centre de données +echobase.common.dataCentreEmail=Courriel du centre de données echobase.common.dataMetadata= echobase.common.dataMetadataName= echobase.common.dataName= @@ -122,8 +122,8 @@ echobase.common.impacte= echobase.common.individual= echobase.common.individualValue= -echobase.common.institution= -echobase.common.keywords= +echobase.common.institution=Institution +echobase.common.keywords=Môts clefs echobase.common.label= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification @@ -131,7 +131,7 @@ echobase.common.licence= echobase.common.linestring= echobase.common.litteratureReference= -echobase.common.litteratureReferences= +echobase.common.litteratureReferences=Références echobase.common.localisation= echobase.common.locationMaxLatitude= echobase.common.locationMaxLongitude= @@ -150,9 +150,8 @@ echobase.common.measurementUnit= echobase.common.metadata=metadata echobase.common.mission=mission -echobase.common.missionAbstract= -echobase.common.missionName= -echobase.common.missionReferences= +echobase.common.missionAbstract=Résumé de la mission +echobase.common.missionName=Nom de la mission echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur @@ -178,12 +177,12 @@ echobase.common.pingDutyCycle= echobase.common.platform= echobase.common.positive= -echobase.common.principalInvestigator= -echobase.common.principalInvestigatorEmail= +echobase.common.principalInvestigator=Chercheur +echobase.common.principalInvestigatorEmail=Courriel du chercheur echobase.common.processingDescription= echobase.common.processingSoftwareVersion= echobase.common.processingTemplate= -echobase.common.project= +echobase.common.project=Projet echobase.common.qualityDataFlagValues= echobase.common.referenceDatum=referenceDatum echobase.common.referenceDatumId= @@ -206,7 +205,7 @@ echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= -echobase.common.source= +echobase.common.source=Source echobase.common.species=espèce echobase.common.sqlQuery=requête SQL echobase.common.standardName=

1 0

r129 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi src/doc/reunions
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 20:11:42 +0100 (Fri, 25 Nov 2011) New Revision: 129 Url: http://forge.codelutin.com/repositories/revision/echobase/129 Log: add reunion CR + do reference model updates Added: trunk/src/doc/reunions/reunion-2011-11-25.txt Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-25 19:11:22 UTC (rev 128) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-25 19:11:42 UTC (rev 129) @@ -44,8 +44,6 @@ List<EchoBaseEntityEnum> result = Lists.newLinkedList(); result.add(EchoBaseEntityEnum.Voyage); - result.add(EchoBaseEntityEnum.Echotype); - result.add(EchoBaseEntityEnum.EchotypeDepthStratum); result.add(EchoBaseEntityEnum.Transit); result.add(EchoBaseEntityEnum.TransitVessel); result.add(EchoBaseEntityEnum.Transect); @@ -54,6 +52,7 @@ result.add(EchoBaseEntityEnum.DataProcessing); result.add(EchoBaseEntityEnum.Cell); result.add(EchoBaseEntityEnum.Data); + result.add(EchoBaseEntityEnum.Result); result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.OperationMetadataValue); result.add(EchoBaseEntityEnum.OperationMeasurementMetadataValue); @@ -75,6 +74,9 @@ public static EchoBaseEntityEnum[] getReferenceTypes() { List<EchoBaseEntityEnum> result = Lists.newLinkedList(); result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.TSParameters); + result.add(EchoBaseEntityEnum.EchotypeCategory); result.add(EchoBaseEntityEnum.AcousticInstrument); result.add(EchoBaseEntityEnum.AreaOfOperation); result.add(EchoBaseEntityEnum.Calibration); @@ -85,7 +87,7 @@ result.add(EchoBaseEntityEnum.CellMethod); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.DataMetadata); - result.add(EchoBaseEntityEnum.DataMetadataName); + result.add(EchoBaseEntityEnum.DataType); result.add(EchoBaseEntityEnum.DataQuality); result.add(EchoBaseEntityEnum.DepthStratum); result.add(EchoBaseEntityEnum.DepthStratumType); @@ -100,10 +102,12 @@ result.add(EchoBaseEntityEnum.OperationMetadata); result.add(EchoBaseEntityEnum.OperationType); result.add(EchoBaseEntityEnum.ReferenceDatum); + result.add(EchoBaseEntityEnum.ReferenceDatumType); result.add(EchoBaseEntityEnum.ReferencingMethod); result.add(EchoBaseEntityEnum.Species); result.add(EchoBaseEntityEnum.Station); result.add(EchoBaseEntityEnum.Vessel); + result.add(EchoBaseEntityEnum.VesselType); return result.toArray(new EchoBaseEntityEnum[result.size()]); } Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 19:11:22 UTC (rev 128) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 19:11:42 UTC (rev 129) @@ -1,6 +1,8 @@ +echobase.common.TSParameters= echobase.common.acknowledgement= echobase.common.acousticDensityUnit= echobase.common.acousticInstrument= +echobase.common.acousticInstrumentId= echobase.common.acquisitionSoftwareVersion= echobase.common.addOffset= echobase.common.admin=Administrateur @@ -16,6 +18,7 @@ echobase.common.author= echobase.common.authorEmail= echobase.common.axis= +echobase.common.b= echobase.common.bathymetre= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= @@ -55,12 +58,16 @@ echobase.common.dataQualityFlagMeaning= echobase.common.dataQualityFlagNote= echobase.common.dataQualityFlagValue= +echobase.common.dataType= echobase.common.dataValue= echobase.common.dateCreated= echobase.common.datum=datum +echobase.common.datumType= echobase.common.depthStratum=depthStratum +echobase.common.depthStratumId= echobase.common.depthStratumMeaning= echobase.common.depthStratumType= +echobase.common.depthStratumTypeName= echobase.common.description=Description echobase.common.digitThreshold= echobase.common.distributionStatement= @@ -69,6 +76,8 @@ echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= echobase.common.echotype= +echobase.common.echotypeCategory= +echobase.common.echotypeCategoryName= echobase.common.echotypeDepthStratum= echobase.common.echotypeGeniusSpecies= echobase.common.echotypeLengthCategory= @@ -85,6 +94,7 @@ echobase.common.exportQuery=Requête d'export echobase.common.exportQueryDTO= echobase.common.fillValue= +echobase.common.flagMeanings= echobase.common.frequency= echobase.common.gear= echobase.common.gearMetadata= @@ -108,6 +118,7 @@ echobase.common.history= echobase.common.iMO= echobase.common.id=Identifiant +echobase.common.imo= echobase.common.impacte= echobase.common.individual= echobase.common.individualValue= @@ -119,6 +130,8 @@ echobase.common.length= echobase.common.licence= echobase.common.linestring= +echobase.common.litteratureReference= +echobase.common.litteratureReferences= echobase.common.localisation= echobase.common.locationMaxLatitude= echobase.common.locationMaxLongitude= @@ -127,6 +140,7 @@ echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= +echobase.common.m= echobase.common.meaning= echobase.common.measureType= echobase.common.measurementBinSize= @@ -142,6 +156,7 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur +echobase.common.mz= echobase.common.name=Nom echobase.common.notes= echobase.common.numberAtAge= @@ -169,12 +184,18 @@ echobase.common.processingSoftwareVersion= echobase.common.processingTemplate= echobase.common.project= +echobase.common.qualityDataFlagValues= echobase.common.referenceDatum=referenceDatum +echobase.common.referenceDatumId= +echobase.common.referenceDatumType= +echobase.common.referenceDatumTypeName= echobase.common.referenceMeaning= echobase.common.referenceType= echobase.common.referenceValue= echobase.common.referencingMethod= echobase.common.relatedActivity= +echobase.common.result= +echobase.common.resultvalue= echobase.common.sample= echobase.common.sampleAge= echobase.common.sampleAggregation= @@ -248,6 +269,7 @@ echobase.common.vesselNoiseDesign= echobase.common.vesselTonnage= echobase.common.vesselType= +echobase.common.vesselTypeName= echobase.common.voyage=Campagne echobase.common.voyageDescription=Description de campagne echobase.common.voyageEndDate=Date de fin de campagne Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Added: trunk/src/doc/reunions/reunion-2011-11-25.txt =================================================================== --- trunk/src/doc/reunions/reunion-2011-11-25.txt (rev 0) +++ trunk/src/doc/reunions/reunion-2011-11-25.txt 2011-11-25 19:11:42 UTC (rev 129) @@ -0,0 +1,229 @@ +=============== +projet echobase +=============== + +Vendredi 25-11-2011 (Ifremer) + +Présents : Mathieu, Tony + +Planning +-------- + +Finaliser le modèle d'import du référentiel. + +Référentiel (acoustic) +---------------------- + +Reprise des documents écrits par Mathieu. + +Entité TSparameters +~~~~~~~~~~~~~~~~~~~ + +Copie de la table *COEFFICIENT_ACOUSTIQUE* : + +- *Genre_esp* -> geniusSpecies (à remplacer par une FK sur Species) +- *Id_sondeur* -> acousticInstrumentId (FK sur AcousticInstrument) +- *CAC* -> m (F) +- *BAC* -> b (F) + +Nouveaux champs : + +- mz (F) +- litteratureReference (S) + +Entité Mission +~~~~~~~~~~~~~~ + +Vient de la table *CAMPAGNE* : + +Le seul champs à récupérer est *TYPE_CAMPAGNE* + +Nouveaux champs : + +- missionAbstract (S) +- project (S) +- platform (S) +- institution (S) +- keywords (S) +- litteratureReferences (S) +- dataCentre (S) +- dataCentreEmail (S) +- authorEmail (S) +- author (S) +- principalInvestigatorEmail (S) +- organisationReferences (S) +- distributionStatement (S) +- organisationLevelAcknowledgements (S) +- source (S) + +Entité Echotype +~~~~~~~~~~~~~~~ + +Vient de trois tables access. + +Nouveaux champs : + +- *echotypeLengthCategory* (S) + +table ESPECES_ECHOS +___________________ + +- *LIBELLE_DEVIATION* -> echotypeName (S) +- *ID_DESCRIPTION_DEVIATION* -> echotypeId (S) (clef métier à conserver pour les imports). + +table EIT_DESCRIPT_ECHOS +________________________ + +- *ID_DESCRIPTION_DEVIATION* -> La clef métier à utiliser + +- *LIBELLE_DESCRIPTION_DEVIATION* -> echotypeMeaning (S) +- *TYPE_DEVIATION* -> FK vers l'entité EchotypeCategory +- *IMAGES* -> FK vers l'entité DepthStratum + +table ESPECES_ECHOS +___________________ + +- *CODE_DESCRIPTION_DEVIATION* -> La clef métier à utiliser +- *GENRE_ESP* -> FK vers l'entité Species + +Entité AreaOfOperation +~~~~~~~~~~~~~~~~~~~~~~ + +Copie de la table *ZONE* + +- *CODE_ZONE* -> areaOfOperationName (S) (clef métier utiliser pour les imports) + +Entité Vessel +~~~~~~~~~~~~~ + +Vient de la table *CAMPAGNE* + +- *NAVIRE* -> *vesselName* + +Nouveaux champs : + +- VesselType (FK sur la table VesselType) +- vesselCode (S) +- callsign (S) +- altCallsign (S) +- IMO (I) +- operator (S) +- vesselLength (F) +- vesselTonnage (F) +- vesselEnginePower (I) +- vesselNoiseDesign (S) +- acknowledgement (S) + +Entité DepthStratum +~~~~~~~~~~~~~~~~~~~ + +Copie de la table *TYPE_IMAGE* + +- *Type_Image* -> depthStratumId (S) (clef métier à conserver) +- *Libelle_image* -> depthStratumMeaning (S) + +*Question* : Utilise-t-on alors un DepthStratumType? + +Entité AcousticInstrument +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Copie de la table *EI_SONDEUR* + +- *ID_REFSONDEUR* -> AcousticInstrumentID (S) (clef métier à conserver pour les imports) +- *SONDEUR* -> TransceiverModel (S) +- *FREQUENCE* -> frequency (I) + +Nouveaux champs : + +- transceiverManufacturer (S) +- transceiverBeams (S) +- transceiverAperture (S) +- transceiverSerial (S) +- transceiverFirmware (S) +- transducerLocation (S) +- transducerModel (S) +- transducerBeams (S) +- transducerSerial (S) +- transducerDepth (F) +- transducerOrientation (F) +- transducerAperture (S) + +Entité ReferenceDatum +~~~~~~~~~~~~~~~~~~~~~ + +Copie de la table *TYPE_AFFECTATION* + +- *Code_affectation* -> referenceDatumId (S) (clef métier à conserver pour les imports) +- *Libelle_affectation* -> referenceMeaning (S) + +Nouveau champ : + +- *referenceType* FK sur la table referenceDatumType + ++ Ajouter les données suivantes : (à mettre dans un fichier csv à importer) + +referenceDatumId referenceMeaning referenceDatumType +WGS84 Geographical coordinates, WGS84 projection GeographicPositions +Sea Surface Cell depth referenced to the sea surface Depth +Sea Floor Cell depth referenced to the sea floor Depth +Expert Biomass results computed using the « Expert » methodology Biomass + +Entité DataMetadata +~~~~~~~~~~~~~~~~~~~ + +Nouvelle entité dont voici les champs : + +- longName (S) +- standardName (S) +- units (S) +- referenceDatumId (ID) (FK sur ReferenceDatum) +- positive (S) +- calendar (S) +- axis (S) +- validMin (I) +- validMax (I) +- scaleFactor (F) +- addOffset (F) +- fillValue (I) +- cellMethods (ID) (FK sur CellMethod) +- comment (S) + +Ajout d'une entité *DataType* + +- label (S) +- datumType (S) : le type de la valeur de la donnée + +Les données sont dans le fichier (à mettre dans un fichier csv à importer) + +Entité DataQuality +~~~~~~~~~~~~~~~~~~ + +Nouvelle entité dont voici les champs : + +- qualityDataFlagValues (N) +- flagMeanings (S) +- notes (S) + +Les données sont dans le fichier (à mettre dans un fichier csv à importer) + +Formulaire d'import +------------------- + +- on doit pouvoir sélectionner une mission (et non pas une campagne) + et aussi pouvoir créer une nouvelle mission + +Divers +------ + +- Faire attention à la table Species qui doit être compatible pour le modèle + acoustique et captures. + +- Ne pas traduire les colonnes en francais dans dbeditor +- Au final pas forcer d'avoir une table *VoyageEchotype pour réutiliser les + données *Echotype*. + +Actions +------- + +- faire l'import du référentiel depuis la base access (Codelutin) +- définir les scénarii d'imports (Ifremer) Property changes on: trunk/src/doc/reunions/reunion-2011-11-25.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r128 - trunk
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 20:11:22 +0100 (Fri, 25 Nov 2011) New Revision: 128 Url: http://forge.codelutin.com/repositories/revision/echobase/128 Log: update jquery version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-25 12:52:19 UTC (rev 127) +++ trunk/pom.xml 2011-11-25 19:11:22 UTC (rev 128) @@ -112,7 +112,7 @@ <nuitonWebVersion>1.6</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.2.3.1</struts2Version> - <jqueryPluginVersion>3.1.0</jqueryPluginVersion> + <jqueryPluginVersion>3.2.0</jqueryPluginVersion> <seleniumVersion>2.5.0</seleniumVersion> <h2Version>1.3.157</h2Version> <postgresqlVersion>9.0-801.jdbc4</postgresqlVersion>

1 0

r127 - trunk/src/site/rst
by sletellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: sletellier Date: 2011-11-25 13:52:19 +0100 (Fri, 25 Nov 2011) New Revision: 127 Url: http://forge.codelutin.com/repositories/revision/echobase/127 Log: Correct documentation Modified: trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-11-25 12:45:20 UTC (rev 126) +++ trunk/src/site/rst/install.rst 2011-11-25 12:52:19 UTC (rev 127) @@ -37,16 +37,16 @@ Configuration d'Echobase ------------------------ -La configuration personalisée d'Echobase ce trouve par défaut dans /etc/echobase.properties. +La configuration personnalisée d'Echobase ce trouve par défaut dans /etc/echobase.properties. -Par defaut le répertoire de travail ce trouve dans /var/local/echobase. Le war du projet (pour créer une application embarqué) est stoqué dans le repertoire war du répertoire de travail. Voici la configuration par défaut:: +Par défaut le répertoire de travail ce trouve dans /var/local/echobase. Le war du projet (pour créer une application embarquée) ce trouve dans le repertoire "war" du répertoire de travail. Voici contenu de celui-ci par défaut:: data.directory=/var/local/echobase # Repertoire de l'application war.directory=${data.directory}/war # Répertoire où est stoqué le war war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war -Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. -Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée. +Vous pouvez surcharger toutes les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. +Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée(s). Une base de donnée h2 est crée dans le répertoire de travail (data.directory) mais il est possible de configurer une base Postgres. @@ -54,8 +54,8 @@ --------------------- Pré-requis : - - postgres doit être installé sur la machine (exemple pour un sytème Debian : apt-get install postgresql) - - être connecté avec l'utilisateur (postgres par défaut) qui à les droits d'administrer cette base de donnée. + - postgres doit être installé sur la machine (exemple pour un système Debian : apt-get install postgresql) + - être connecté avec l'utilisateur (postgres par défaut) qui a les droits d'administrer cette base de donnée. 1. Création de l'utilisateur Postgres @@ -81,4 +81,4 @@ login : admin mot de passe : admin -Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs. +Pour des raisons de sécurité, il est conseillé de modifier le mot de passe via l'interface de gestion des utilisateurs. \ No newline at end of file

1 0

r126 - trunk/src/site/rst
by sletellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: sletellier Date: 2011-11-25 13:45:20 +0100 (Fri, 25 Nov 2011) New Revision: 126 Url: http://forge.codelutin.com/repositories/revision/echobase/126 Log: Update documentation Modified: trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-11-25 12:26:38 UTC (rev 125) +++ trunk/src/site/rst/install.rst 2011-11-25 12:45:20 UTC (rev 126) @@ -34,21 +34,13 @@ :start: 1 :depth: 2 -Première utilisation --------------------- - -Un utilisateur par défaut est crée si la base est vide (première utilisation):: - - login : admin - mot de passe : admin - -Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs. - Configuration d'Echobase ------------------------ -Voici la configuration par défaut:: +La configuration personalisée d'Echobase ce trouve par défaut dans /etc/echobase.properties. +Par defaut le répertoire de travail ce trouve dans /var/local/echobase. Le war du projet (pour créer une application embarqué) est stoqué dans le repertoire war du répertoire de travail. Voici la configuration par défaut:: + data.directory=/var/local/echobase # Repertoire de l'application war.directory=${data.directory}/war # Répertoire où est stoqué le war war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war @@ -56,17 +48,37 @@ Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée. +Une base de donnée h2 est crée dans le répertoire de travail (data.directory) mais il est possible de configurer une base Postgres. + Installation Postgres --------------------- -Création de l'utilisateur Postgres:: +Pré-requis : + - postgres doit être installé sur la machine (exemple pour un sytème Debian : apt-get install postgresql) + - être connecté avec l'utilisateur (postgres par défaut) qui à les droits d'administrer cette base de donnée. - createuser -P echobase +1. Création de l'utilisateur Postgres -Création de la base de donnée "echobase":: +:: - createdb -E utf8 echobase -O echobase + createuser -P echobase -Il faut positionner le fichier de configuration echobase.properties_ dans /etc et remplacer le mot de passe (hibernate.connection.password) par celui rentré lors de la création de l'utilisateur Postgres. +2. Création de la base de donnée "echobase" -.. _echobase.properties: echobase.properties \ No newline at end of file +:: + + createdb -E utf8 echobase -O echobase + +3. Il faut positionner le fichier de configuration echobase.properties_ dans /etc et remplacer le mot de passe (hibernate.connection.password) par celui rentré lors de la création de l'utilisateur Postgres. + +.. _echobase.properties: echobase.properties + +Première utilisation +-------------------- + +Un utilisateur par défaut est crée si la base est vide (première utilisation):: + + login : admin + mot de passe : admin + +Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs.

1 0

r125 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 13:26:38 +0100 (Fri, 25 Nov 2011) New Revision: 125 Url: http://forge.codelutin.com/repositories/revision/echobase/125 Log: fix javascript Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-25 12:26:36 UTC (rev 124) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-25 12:26:38 UTC (rev 125) @@ -289,7 +289,7 @@ <s:hidden key="entityType" label=''/> - <s:hidden key="id" label=''/> + <s:hidden id="id" name='id' label=''/> <s:iterator value="columnMetas" var="meta" status="status"> <s:if test="#meta.fK">

1 0

r124 - trunk/src/site/rst
by sletellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: sletellier Date: 2011-11-25 13:26:36 +0100 (Fri, 25 Nov 2011) New Revision: 124 Url: http://forge.codelutin.com/repositories/revision/echobase/124 Log: Partial fix documentation Modified: trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-11-25 12:14:20 UTC (rev 123) +++ trunk/src/site/rst/install.rst 2011-11-25 12:26:36 UTC (rev 124) @@ -47,16 +47,14 @@ Configuration d'Echobase ------------------------ -Il faut éditer le fichier +Voici la configuration par défaut:: -Voici les configurations par défaut:: - data.directory=/var/local/echobase # Repertoire de l'application war.directory=${data.directory}/war # Répertoire où est stoqué le war war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war -Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est nécessaire. -Pour ce faire, il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la ligne ci-dessus modifiée. +Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. +Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée. Installation Postgres ---------------------

1 0

r123 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/webapp/WEB-INF/jsp
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 13:14:20 +0100 (Fri, 25 Nov 2011) New Revision: 123 Url: http://forge.codelutin.com/repositories/revision/echobase/123 Log: -fix model rename user to modificationUser -fix modification message Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:14:20 UTC (rev 123) @@ -242,7 +242,7 @@ EchoBaseUser user) { TableMeta tableMeta = getTableMetas(entityType); DbEditorCsvModel<TopiaEntity> csvModel = buildForImport(tableMeta); - String messagePrefix = "Import du fichier " + importFileName; + String messagePrefix = "Import du fichier " + importFileName + " le " + newDate(); CsvImportResult result = new CsvImportResult(); result.setImportFileName(importFileName); @@ -421,12 +421,12 @@ targetValue = getDecoratorService().decorate( getLocale(), targetValue, null); } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", - propertyName, - sourceValue, - targetValue - )); } + buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", + propertyName, + sourceValue, + targetValue + )); } } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:14:20 UTC (rev 123) @@ -67,8 +67,8 @@ title="%{getText('echobase.common.modificationDate')}"/> <sjg:gridColumn name="modificationText" sortable="true" title="%{getText('echobase.common.modificationText')}"/> - <sjg:gridColumn name="user" sortable="true" formatter="formatEntityLabel" - title="%{getText('echobase.common.user')}"/> + <sjg:gridColumn name="modificationUser" sortable="true" formatter="formatEntityLabel" + title="%{getText('echobase.common.modificationUser')}"/> </sjg:grid> <br/>

1 0