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

r973 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities/references echobase-services echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap
by tchemit＠users.forge.codelutin.com 07 Mar '14

07 Mar '14

Author: tchemit Date: 2014-03-08 00:16:42 +0100 (Sat, 08 Mar 2014) New Revision: 973 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/973 Log: refs-30 #2931 Do species export Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java Modified: trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-03-07 23:16:42 UTC (rev 973) @@ -0,0 +1,11 @@ +package fr.ifremer.echobase.entities.references; + +public class SpeciesImpl extends SpeciesAbstract { + + private static final long serialVersionUID = 1L; + + // used for coser species export + public String getTaxaCode() { + return ""; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/pom.xml 2014-03-07 23:16:42 UTC (rev 973) @@ -99,6 +99,11 @@ </dependency> <dependency> + <groupId>fr.ifremer.coser</groupId> + <artifactId>coser-business</artifactId> + </dependency> + + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:16:42 UTC (rev 973) @@ -582,9 +582,14 @@ } //------------------------------------------------------------------------// - //--- SpeciesCategory ----------------------------------------------------// + //--- Species ------------------------------------------------------------// //------------------------------------------------------------------------// + public List<Species> getSpecies() { + List<Species> species = persistenceContext.getSpeciesDao().findAll(); + return species; + } + public Optional<Species> getOptionalSpecies(String id) { Species species = persistenceContext.getSpeciesDao().findByTopiaId( id); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) @@ -59,7 +59,7 @@ /** * Id of voyage to export. */ - private String voyageId; + private String missionId; private JdbcConfiguration dbConfiguration; @@ -94,12 +94,12 @@ this.exportFile = exportFile; } - public String getVoyageId() { - return voyageId; + public String getMissionId() { + return missionId; } - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; + public void setMissionId(String missionId) { + this.missionId = missionId; } public JdbcConfiguration getDbConfiguration() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:16:42 UTC (rev 973) @@ -23,15 +23,24 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.coser.bean.EchoBaseProject; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.Export; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; +import javax.inject.Inject; import java.io.File; +import java.io.FilenameFilter; import java.io.IOException; /** @@ -47,41 +56,99 @@ public static final TimeLog timeLog = new TimeLog(ExportMapService.class); + @Inject + private UserDbPersistenceService persistenceService; + public void doExport(ExportMapConfiguration model) throws IOException { - String fileName = model.getFileName(); + Preconditions.checkNotNull(model); + Preconditions.checkNotNull(model.getFileName()); + Preconditions.checkNotNull(model.getDbConfiguration()); + Preconditions.checkNotNull(model.getMissionId()); + // compute nb steps (invoke EchoR + create archive tree + + int nbSteps = 3; + + if (log.isInfoEnabled()) { + log.info("NB steps: " + nbSteps); + } + model.setNbSteps(nbSteps); + + Mission mission = persistenceService.getMission(model.getMissionId()); + Preconditions.checkNotNull(mission); + + String missionName = mission.getName(); + File tempDirectory = model.getWorkingDirectory(); + File echoRBaseDir = new File(tempDirectory, "EchoR"); + FileUtil.createDirectoryIfNecessary(echoRBaseDir); - File zipFile = new File(tempDirectory, fileName + ".zip"); + // 1 - invoke EchoR + invokeEchoR(echoRBaseDir, model.getDbConfiguration(), missionName); + model.incrementsProgress(); + + // 2 - create archive tree + File archiveBaseDir = new File(tempDirectory, "echobase"); + FileUtil.createDirectoryIfNecessary(archiveBaseDir); if (log.isInfoEnabled()) { - log.info("Will export map to " + zipFile); + log.info("Will store maps in " + archiveBaseDir); } - model.setExportFile(zipFile); - File dir = new File(tempDirectory, "echobase"); + createArchiveContent(archiveBaseDir, echoRBaseDir, missionName); - FileUtil.createDirectoryIfNecessary(dir); + model.incrementsProgress(); + + // 3 - create archive + + String fileName = model.getFileName(); + File zipFile = new File(tempDirectory, fileName + ".zip"); + if (log.isInfoEnabled()) { - log.info("Will store maps in " + dir); + log.info("Will export map to " + zipFile); } + model.setExportFile(zipFile); + EchoBaseIOUtil.compressZipFile(zipFile, archiveBaseDir); + } - JdbcConfiguration dbConfiguration = model.getDbConfiguration(); + protected void invokeEchoR(File dir, JdbcConfiguration dbConfiguration, String missionName) { if (log.isInfoEnabled()) { + log.info("Will invoke EchoR on mission: " + missionName); log.info("Will connect to db: " + dbConfiguration.getUrl()); } + } - // compute nb steps - int nbSteps = 0; + protected void createArchiveContent(File archiveBaseDir, File echoRBaseDir, String missionName) throws IOException { - if (log.isInfoEnabled()) { - log.info("NB steps: " + nbSteps); + EchoBaseProject coserProject = new EchoBaseProject(archiveBaseDir); + + coserProject.setFacadeName("Atlantique"); + coserProject.setZoneName("gdgciem8"); + coserProject.setAuthor("EchoBase"); + coserProject.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); + + coserProject.save(); + + File mapDir = coserProject.getMapsDirectory(); + + FileUtil.createDirectoryIfNecessary(mapDir); + + FilenameFilter filter = EchoBaseProject.newMapSpeciesFilenameFilter(missionName); + + // files are in echoRBaseDir-meanMaps + // copy all of them in mapDir + File[] files = new File(echoRBaseDir, "invoke-meanMaps").listFiles(filter); + for (File file : files) { + FileUtils.copyFileToDirectory(file, mapDir); } - model.setNbSteps(nbSteps); - // TODO Export - - EchoBaseIOUtil.compressZipFile(zipFile, dir); + // create species.csv + File speciesFile = coserProject.getSpeciesDefinitionFile(); + SpeciesExportModel speciesExportModel = new SpeciesExportModel(getCsvSeparator()); + try { + Export.exportToFile(speciesExportModel, persistenceService.getSpecies(), speciesFile); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export species list to " + speciesFile, e); + } } } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-07 23:16:42 UTC (rev 973) @@ -0,0 +1,26 @@ +package fr.ifremer.echobase.services.service.exportMap; + +import fr.ifremer.echobase.entities.references.Species; +import org.nuiton.csv.ext.AbstractExportModel; + +/** + * Created on 3/5/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since XXX + */ +public class SpeciesExportModel extends AbstractExportModel<Species> { + + public SpeciesExportModel(char separator) { + super(separator); + newColumnForExport(Species.PROPERTY_TAXON_CODE, "C_Perm"); + newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_ORDER, "NumSys"); + newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_LEVEL, "NivSys"); + newColumnForExport(Species.PROPERTY_CODE_MEMO, "C_VALIDE"); + newColumnForExport(Species.PROPERTY_GENUS_SPECIES, "L_VALIDE"); + newColumnForExport(Species.PROPERTY_AUTHOR_REFERENCE, "AA_VALIDE"); + newColumnForExport(Species.PROPERTY_TAXON_FATHER_MEMOCODE, "C_TxPère"); + newColumnForExport("taxaCode", "Taxa"); + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:16:42 UTC (rev 973) @@ -23,7 +23,7 @@ * #L% */ -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; import fr.ifremer.echobase.ui.EchoBaseSession; @@ -51,14 +51,14 @@ private static final Log log = LogFactory.getLog(Configure.class); /** Universe of voyages to export in db. */ - protected Map<String, String> voyages; + protected Map<String, String> missions; public Configure() { super(ExportMapConfiguration.class); } - public Map<String, String> getVoyages() { - return voyages; + public Map<String, String> getMissions() { + return missions; } public void setFileName(String fileName) { @@ -79,7 +79,7 @@ @Override protected void prepareInputAction(ExportMapConfiguration model) { - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); } @Override @@ -95,6 +95,6 @@ log.info("Temporary directory to use : " + dataDirectory); } - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); } } Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:16:42 UTC (rev 973) @@ -25,9 +25,9 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="model.missionId"> <field-validator type="requiredstring"> - <message key="echobase.error.exportMap.voyage.required"/> + <message key="echobase.error.exportMap.mission.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-07 23:16:42 UTC (rev 973) @@ -169,7 +169,7 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire echobase.error.exportMap.filename.required=Export filename required -echobase.error.exportMap.voyage.required=No voyage selected +echobase.error.exportMap.mission.required=No mission selected echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné 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 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-07 23:16:42 UTC (rev 973) @@ -169,7 +169,7 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire echobase.error.exportMap.filename.required=Le nom d'un fichier d'export est obligatoire -echobase.error.exportMap.voyage.required=La sélection d'une campagne est obligatoire +echobase.error.exportMap.mission.required=La sélection d'une série est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -321,7 +321,7 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base -echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne +echobase.legend.exportMap.resume=Résumé de l'export des cartes echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission @@ -343,7 +343,7 @@ echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base -echobase.menu.exportMap=Exporter les cartes d'une campagne +echobase.menu.exportMap=Exporter les cartes echobase.menu.importData=Importer des données echobase.menu.importDb=Importer une base echobase.menu.logs=Journal des modifications @@ -384,9 +384,9 @@ echobase.title.exportDb=Export complet de la base echobase.title.exportDbProgress=Export de la base de données en cours echobase.title.exportDbResult=Résultats de l'export de la base de données -echobase.title.exportMap=Export des cartes d'une campagne -echobase.title.exportMapProgress=Export des cartes d'une campagne en cours -echobase.title.exportMapResult=Résultats de l'export des cartes d'une campagne +echobase.title.exportMap=Export des cartes +echobase.title.exportMapProgress=Export des cartes en cours +echobase.title.exportMapResult=Résultats de l'export des cartes echobase.title.exportTable=Exporter une table echobase.title.importData.selectImportType=Sélection du type d'import echobase.title.importDb=Import d'une base Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) @@ -46,9 +46,9 @@ </div> <br/> - <s:select key="model.voyageId" requiredLabel="true" - label='%{getText("echobase.common.voyage")}' - list="voyages" headerKey="" headerValue=""/> + <s:select key="model.missionId" requiredLabel="true" + label='%{getText("echobase.common.mission")}' + list="missions" headerKey="" headerValue=""/> <div class="cleanBoth"></div> <br/>

1 0

r972 - trunk
by tchemit＠users.forge.codelutin.com 07 Mar '14

07 Mar '14

Author: tchemit Date: 2014-03-08 00:12:58 +0100 (Sat, 08 Mar 2014) New Revision: 972 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/972 Log: revert struts version (some trouble with jquery plugins) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-04 08:24:07 UTC (rev 971) +++ trunk/pom.xml 2014-03-07 23:12:58 UTC (rev 972) @@ -143,7 +143,9 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> <struts2Version>2.3.16</struts2Version> + <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.7.0</jqueryPluginVersion> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <h2Version>1.3.175</h2Version> <postgresqlVersion>9.3-1101-jdbc41</postgresqlVersion> <slf4jVersion>1.7.6</slf4jVersion> @@ -178,6 +180,12 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>fr.ifremer.coser</groupId> + <artifactId>coser-business</artifactId> + <version>1.5-SNAPSHOT</version> + </dependency> +  <dependency>

1 0

Build failed in Jenkins: echobase-nightly #12
by admin+ci-codelutin.com＠codelutin.com 04 Mar '14

04 Mar '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/12/changes> Changes: [Tony CHEMIT] refs #2931: Export de cartes au format image vers le site des indicateurs ------------------------------------------ [...truncated 2501 lines...] INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965292', 0, '2014-02-27 17:01:48.355', 0.0, 'No. of data samples in a grid map cell in a block averaging procedure', 0, 'No. of samples in map cell', 'NsampleMapcell', 1.0, 'tons', 999999999, 0); -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965290', 0, '2014-02-27 17:01:48.355', 0.0, 'Mean biomass averaged in a grid map cell using a block averaging procedure', 0, 'Mean biomass in map cell', 'meanMapcellBiomass', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965291', 0, '2014-02-27 17:01:48.355', 0.0, 'Biomass standard deviation in a grid map cell produced from a block averaging procedure', 0, 'Biomass standard deviation in map cell', 'stdevMapcellBiomass', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965292', 0, '2014-02-27 17:01:48.355', 0.0, 'No. of data samples in a grid map cell in a block averaging procedure', 0, 'No. of samples in map cell', 'NsampleMapcell', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (TopiaMigrationEngine.java:469) saveApplicationVersion - Saving new database version: 2.6 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646282#0.7508540402648546 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSIT: fr.ifremer.echobase.entities.ImportLog#1393801646285#0.9313201969689069 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSECT: fr.ifremer.echobase.entities.ImportLog#1393801646289#0.5741193309867241 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata OPERATION: fr.ifremer.echobase.entities.ImportLog#1393801646299#0.8633093627989219 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata CATCHES: fr.ifremer.echobase.entities.ImportLog#1393801646321#0.9112579888025033 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata ACOUSTIC: fr.ifremer.echobase.entities.ImportLog#1393801646336#0.20193240138338275 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646353#0.4192487366509965 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_ESDU: fr.ifremer.echobase.entities.ImportLog#1393801646360#0.07650404829379032 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_REGION: fr.ifremer.echobase.entities.ImportLog#1393801646368#0.5562531039567211 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_MAP_FISH: fr.ifremer.echobase.entities.ImportLog#1393801646374#0.6206668482229808 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_MAP_OTHER: fr.ifremer.echobase.entities.ImportLog#1393801646380#0.9521371320114684 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646386#0.8588556634196041 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSIT: fr.ifremer.echobase.entities.ImportLog#1393801646391#0.8088234335022448 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSECT: fr.ifremer.echobase.entities.ImportLog#1393801646399#0.04704371259879003 03 Mar 2014 00:07:26 INFO [main] (RemoveDataService.java:138) removeImport - Nb steps for importLog fr.ifremer.echobase.entities.ImportLog#1393801646368#0.5562531039567211: 1 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.534 sec - in fr.ifremer.echobase.ui.actions.removedata.ResultRegionRemoveDataServiceTest Results : Tests run: 23, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-services --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-services --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ echobase-services --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ echobase-services --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ echobase-services --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.4:sign (sign-artifacts) @ echobase-services --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ echobase-services --- [INFO] Used declared dependencies found: [INFO] fr.ifremer.echobase:echobase-domain:jar:2.6-SNAPSHOT:compile [INFO] javax.inject:javax.inject:jar:1:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [INFO] org.nuiton:nuiton-csv:jar:3.0-alpha-3:compile [INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.2.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-alpha-11:compile [INFO] org.nuiton.topia:topia-service-csv:jar:3.0-alpha-11:compile [INFO] org.hibernate:hibernate-core:jar:4.2.5.Final:compile [INFO] junit:junit:jar:4.11:test [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ echobase-services --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: UI 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 15.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (822 B at 6.3 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 36.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-ui --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-ui --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-struts2:1.15-20140228.175130-22 [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-web:1.15-20140228.175126-22 [INFO] 73 dependencies to check. [INFO] 72 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 4.518s [INFO] No artifact resolved by the repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] 1 artifact(s) resolved by repository https://nexus.nuiton.org/nexus/content/repositories/other-releases in 73.499ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-ui --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- i18n-maven-plugin:3.0:parserStruts2 (parseJsp) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserValidation (parseOthersAndGen) @ echobase-ui --- [INFO] Load rules file validation.rules [INFO] Load rules file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/s…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ echobase-ui --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-ui --- [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui --- [WARNING] bundle fr_FR contains 24/435 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 27/432 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:collect-i18n-artifacts (collect-i18n-artifacts) @ echobase-ui --- [INFO] collected 8 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] collected 8 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui --- [WARNING] bundle en_GB contains 3/547 empty entries! - 0/3 : echobase.error.showData.dataMetadataIdForLayer.required - 1/3 : echobase.error.showData.noLayer.selected - 2/3 : echobase.error.showData.voyage.required [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] EchoBase .......................................... SUCCESS [ 18.101 s] [INFO] EchoBase :: Domain ................................ SUCCESS [ 41.010 s] [INFO] EchoBase :: Services .............................. SUCCESS [ 31.795 s] [INFO] EchoBase :: UI .................................... FAILURE [ 7.731 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:40 min [INFO] Finished at: 2014-03-03T00:07:40+01:00 [INFO] Final Memory: 66M/547M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.i18n:i18n-maven-plugin:3.0:bundle (bundle) on project echobase-ui: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.i18n:i18n-maven-plugin:3.0:bundle (bundle) on project echobase-ui: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoFailureException: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. at org.nuiton.i18n.plugin.bundle.AbstractMakeI18nBundleMojo.failsIfWarning(AbstractMakeI18nBundleMojo.java:212) at org.nuiton.i18n.plugin.bundle.BundleMojo.doAction(BundleMojo.java:275) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :echobase-ui Sending e-mails to: echobase-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 1

Build failed in Jenkins: echobase-nightly » EchoBase :: UI #12
by admin+ci-codelutin.com＠codelutin.com 04 Mar '14

04 Mar '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> Changes: [Tony CHEMIT] refs #2931: Export de cartes au format image vers le site des indicateurs ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: UI 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 15.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (822 B at 6.3 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 36.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-ui --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-ui --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-struts2:1.15-20140228.175130-22 [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-web:1.15-20140228.175126-22 [INFO] 73 dependencies to check. [INFO] 72 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 4.518s [INFO] No artifact resolved by the repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] 1 artifact(s) resolved by repository https://nexus.nuiton.org/nexus/content/repositories/other-releases in 73.499ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-ui --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- i18n-maven-plugin:3.0:parserStruts2 (parseJsp) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserValidation (parseOthersAndGen) @ echobase-ui --- [INFO] Load rules file validation.rules [INFO] Load rules file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ echobase-ui --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-ui --- [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui --- [WARNING] bundle fr_FR contains 24/435 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 27/432 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:collect-i18n-artifacts (collect-i18n-artifacts) @ echobase-ui --- [INFO] collected 8 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] collected 8 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui --- [WARNING] bundle en_GB contains 3/547 empty entries! - 0/3 : echobase.error.showData.dataMetadataIdForLayer.required - 1/3 : echobase.error.showData.noLayer.selected - 2/3 : echobase.error.showData.voyage.required [JENKINS] Archiving disabled

1 1

r971 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/converter echobase-domain/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: tchemit Date: 2014-03-04 09:24:07 +0100 (Tue, 04 Mar 2014) New Revision: 971 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/971 Log: utilisation du float converter recopie depuis celui de l'ird Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java 2014-03-04 08:24:07 UTC (rev 971) @@ -0,0 +1,87 @@ +package fr.ifremer.echobase.converter; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.Converter; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/3/14. + * <p/> + * A float converter which is not dependant on user locale to obtain the locale + * {@code dot} representation. + * <p/> + * It can transform {@code 0.2} and also {@code 0,2}. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class FloatConverter implements Converter { + + @Override + public <T> T convert(Class<T> aClass, Object value) { + if (value == null) { + throw new ConversionException( + t("echobase.error.convertor.noValue", this)); + } + if (isEnabled(aClass)) { + T result; + if (isEnabled(value.getClass())) { + result = (T) value; + return result; + } + if (value instanceof String) { + result = (T) valueOf((String) value); + return result; + } + } + throw new ConversionException( + t("echobase.error.no.convertor", aClass.getName(), value)); + } + + protected Float valueOf(String value) { + try { + if (value.contains(",")) { + value = value.replaceAll(",", "."); + } + Float result; + result = Float.valueOf(value); + return result; + } catch (NumberFormatException e) { + throw new ConversionException( + t("echobase.error.float.convertor", value, this, e.getMessage())); + } + } + + + protected boolean isEnabled(Class<?> aClass) { + return Float.class.equals(aClass); + } + + public Class<?> getType() { + return Float.class; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -38,3 +38,6 @@ echobase.config.version.description=Application version echobase.config.war.location.description=Location of the war used to create embedded applications echobase.configuration.description=EchoBase configuration +echobase.error.convertor.noValue=Can not convert a null value +echobase.error.float.convertor=a problem occurs while converting value '%s' with float convertor %s for reason %s +echobase.error.no.convertor=Can not convert a float from type %s (value to convert\: %s) Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -38,3 +38,6 @@ echobase.config.version.description=Version de l'application echobase.config.war.location.description=Chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées echobase.configuration.description=Configuration d'EchoBase +echobase.error.convertor.noValue=Impossible de conertir une valeur nulle +echobase.error.float.convertor=Un problème est apparu lors de la convertion en float de '%s' avec le convertisseur %s pour la raison suivante \: %s +echobase.error.no.convertor=Impossible de convertir un float à partir de ce type %s (valeur à convertir %s) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-04 08:24:07 UTC (rev 971) @@ -29,6 +29,7 @@ import com.google.common.io.Files; import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.config.EchoBaseConfiguration; +import fr.ifremer.echobase.converter.FloatConverter; import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseInternalPersistenceContext; import fr.ifremer.echobase.entities.EchoBaseInternalTopiaApplicationContext; @@ -44,7 +45,6 @@ import fr.ifremer.echobase.services.service.UserService; import fr.ifremer.echobase.services.service.embeddedapplication.EmbeddedApplicationService; import fr.ifremer.echobase.services.service.workingDb.WorkingDbConfigurationService; -import fr.ird.converter.FloatConverter; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.apache.commons.collections4.CollectionUtils; Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -14,7 +14,6 @@ echobase.action.delete=Delete echobase.action.delete.selectedImport=Delete selected imports echobase.action.deleteConfiguration=Delete -echobase.action.display=Display spatial data echobase.action.downloadEmbeddedApplicationFile=Download the portable database echobase.action.downloadExportDbFile=Download database export file echobase.action.downloadExportMapFile=Download voyage maps export file @@ -66,21 +65,14 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= -echobase.common.cellType=Cell type echobase.common.dataCentre=Data center echobase.common.dataCentreEmail=Data center email -echobase.common.dataMetadata=Data Metadata -echobase.common.dataMetadata.forEsduDataLayer=Data Metadata for Esdu - Data layer -echobase.common.dataMetadata.forEsduResultLayer=Data Metadata for Esdu - Result layer -echobase.common.dataMetadata.forMapDataLayer=Data Metadata for Map - Data layer -echobase.common.dataMetadata.forMapResultLayer=Data Metadata for Map - Result layer echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Data processing notes echobase.common.datum=Datum echobase.common.description=Description echobase.common.digitThreshold=Digitization threshold echobase.common.distributionStatement=Distribution statement -echobase.common.echotype=Echotype echobase.common.echotypeFile= echobase.common.email=E-mail echobase.common.entityId=ID @@ -143,17 +135,11 @@ echobase.common.processingTemplate=Data processing template echobase.common.project=Project echobase.common.resultLabel=Results label -echobase.common.showCellEsduDataLayer=Show Cell Esdu data layer -echobase.common.showCellEsduResultLayer=Show Cell Esdu result layer -echobase.common.showCellMapDataLayer=Show Cell map data layer -echobase.common.showCellMapResultLayer=Show Cell map result layer -echobase.common.showOperationLayer=Show operation layer echobase.common.soundSpeedCalculationsER60=Sound speed calculations method (ER60 instrument) echobase.common.soundSpeedCalculationsME70=Sound speed calculation method (ME70 instrument) echobase.common.sounderConstant=Sounder constant (if relevant) echobase.common.source=Source echobase.common.spatialAware=Is database spatial aware ? -echobase.common.species=Species echobase.common.startEndDate=Start - End date echobase.common.startEndPort=Start - End port echobase.common.subSampleFile= @@ -173,7 +159,6 @@ echobase.confirm.delete.query=Delete query echobase.confirm.delete.selected.importData=Delete selected imports echobase.confirm.delete.workingDbConfiguration=Delete working database configuration -echobase.error.bad.password=Invalid password echobase.error.email.already.used=The user name already exists echobase.error.export.description.requiredstring=Export description required echobase.error.export.name.requiredstring=Export name required @@ -230,7 +215,6 @@ echobase.error.importDb.input.required=Le fichier d'import est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.invalid.sql=Invalid query\: %s -echobase.error.login.unknown=Unkwown user echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=The mission name already exists echobase.error.no.embeddedApplication.configurationFound=Portable database configuration not found @@ -243,9 +227,6 @@ echobase.error.query.name.already.exists=Query name already exists echobase.error.required.email=E-mail address required echobase.error.required.password=Password is required -echobase.error.showData.dataMetadataIdForLayer.required= -echobase.error.showData.noLayer.selected= -echobase.error.showData.voyage.required= echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type @@ -278,7 +259,6 @@ echobase.info.new.sqlQuery.inprogress=Query creation in progress echobase.info.new.workingDbConfiguration.inprogress=New working database configuration in progress echobase.info.no.sqlQuery.saved=No saved SQL query -echobase.info.no.sqlQuery.selected=No SQL query selected echobase.info.no.table.selected=No table selected echobase.info.no.voyagee.found=No survey selected echobase.info.no.workingDb.selected=No working database selected @@ -341,7 +321,6 @@ echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration echobase.legend.exportDb.resume=Resume of database export -echobase.legend.exportMap.configuration.files=Export configuration echobase.legend.exportMap.resume=Resume of voyage maps export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration 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 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -14,7 +14,6 @@ echobase.action.delete=Suppression echobase.action.delete.selectedImport=Supprimer les imports sélectionnés echobase.action.deleteConfiguration=Supprimer -echobase.action.display=Afficher les données echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète echobase.action.downloadExportMapFile=Télécharger le fichier d'export des cartes d'une campagne @@ -66,21 +65,14 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= -echobase.common.cellType=Type de cellule echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données -echobase.common.dataMetadata=Type de donnée -echobase.common.dataMetadata.forEsduDataLayer=Méta data à utiliser pour la couche Esdu - Data -echobase.common.dataMetadata.forEsduResultLayer=Méta data à utiliser pour la couche Esdu - Result -echobase.common.dataMetadata.forMapDataLayer=Méta data à utiliser pour la couche Map - Data -echobase.common.dataMetadata.forMapResultLayer=Méta data à utiliser pour la couche Map - Result echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Notes sur le pré-traitement des données echobase.common.datum=Référenciel echobase.common.description=Description echobase.common.digitThreshold=Seuil de numérisation echobase.common.distributionStatement=Conditions de diffusion des données -echobase.common.echotype=Échotype echobase.common.echotypeFile= echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité @@ -143,17 +135,11 @@ echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet echobase.common.resultLabel=Intitulé des résultats -echobase.common.showCellEsduDataLayer=Voir la couche Esdu - Data -echobase.common.showCellEsduResultLayer=Voir la couche Esdu - Result -echobase.common.showCellMapDataLayer=Voir la couche Map - Data -echobase.common.showCellMapResultLayer=Voir la couche Map - Result -echobase.common.showOperationLayer=Voir la couche Operation echobase.common.soundSpeedCalculationsER60=Méthode de calcul de la célérité du son (ER60) echobase.common.soundSpeedCalculationsME70=Méthode de calcul de la célérité du son (ME70) echobase.common.sounderConstant=Constante sondeur (si besoin) echobase.common.source=Source echobase.common.spatialAware=Base spatialisée ? -echobase.common.species=Espèce echobase.common.startEndDate=Date de début - fin echobase.common.startEndPort=Port de départ - arrivé echobase.common.subSampleFile= @@ -173,7 +159,6 @@ echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.selected.importData=Confirmer la suppression des imports sélectionnés echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante -echobase.error.bad.password=Mot de passe incorrect echobase.error.email.already.used=Nom d'utilisateur déjà utilisé echobase.error.export.description.requiredstring=La description de l'export est obligatoire echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire @@ -230,7 +215,6 @@ echobase.error.importDb.input.required=Le fichier d'import est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.invalid.sql=Requête non valide \: %s -echobase.error.login.unknown=Utilisateur inconnu echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=Nom de mission déjà utilisé echobase.error.no.embeddedApplication.configurationFound=Configuration de création d'application embarquée non trouvée @@ -243,12 +227,6 @@ echobase.error.query.name.already.exists=Nom de requête déjà utilisé echobase.error.required.email=Courriel obligatoire echobase.error.required.password=Le mot de passe est obligatoire -echobase.error.showData.cellType.required=La sélection d'un type de cellule est obligatoire -echobase.error.showData.dataMetadata.required=La sélection d'un type de donnée est obligatoire -echobase.error.showData.dataMetadataIdForLayer.required=Il faut sélectionner la méta-donnée à utiliser sur la couche -echobase.error.showData.echoTypeOrSpecies.required=La sélection d'un echotype ou (et) d'une espèces est obligatoire -echobase.error.showData.noLayer.selected=Aucune couche de présentation sélectionnée -echobase.error.showData.voyage.required=La sélection d'une campagne est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvée à l'emplacement suivant %s echobase.error.workingDbConfiguration.couldNotConnect=Impossible de se connecter (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=La création d'une base n'est possible que pour le type *Postgresql* @@ -281,7 +259,6 @@ echobase.info.new.sqlQuery.inprogress=Nouvelle requête en cours de création echobase.info.new.workingDbConfiguration.inprogress=Nouvelle configuration de base de travail en cours de création echobase.info.no.sqlQuery.saved=Aucune requête d'export SQL enregistrée -echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter echobase.info.no.workingDb.selected=Aucune base de travail sélectionnée @@ -344,7 +321,6 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base -echobase.legend.exportMap.configuration.files=Configuration de l'export echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import

1 0

r970 - trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions
by tchemit＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: tchemit Date: 2014-03-04 09:21:49 +0100 (Tue, 04 Mar 2014) New Revision: 970 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/970 Log: remove no more used validation file Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/spatial/

1 0

r969 - in trunk: . echobase-ui
by tchemit＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: tchemit Date: 2014-03-04 09:18:20 +0100 (Tue, 04 Mar 2014) New Revision: 969 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/969 Log: updates some dependencies + remove ird dep Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-01 23:20:47 UTC (rev 968) +++ trunk/echobase-ui/pom.xml 2014-03-04 08:18:20 UTC (rev 969) @@ -186,10 +186,10 @@ <version>${project.version}</version> </dependency> - <dependency> +  <dependency> <groupId>org.nuiton.web</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-01 23:20:47 UTC (rev 968) +++ trunk/pom.xml 2014-03-04 08:18:20 UTC (rev 969) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0</version> + <version>5.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -138,15 +138,15 @@  - <topiaVersion>3.0-alpha-11</topiaVersion> + <topiaVersion>3.0-alpha-13</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> - <struts2Version>2.3.15.3</struts2Version> - <jqueryPluginVersion>3.6.1</jqueryPluginVersion> - <h2Version>1.3.174</h2Version> - <postgresqlVersion>9.2-1003-jdbc4</postgresqlVersion> - <slf4jVersion>1.7.5</slf4jVersion> + <struts2Version>2.3.16</struts2Version> + <jqueryPluginVersion>3.7.0</jqueryPluginVersion> + <h2Version>1.3.175</h2Version> + <postgresqlVersion>9.3-1101-jdbc41</postgresqlVersion> + <slf4jVersion>1.7.6</slf4jVersion> <licensePluginVersion>1.6</licensePluginVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -178,20 +178,6 @@ <dependencyManagement> <dependencies> -  - <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> - <version>1.4.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.healthmarketscience.jackcess</groupId> - <artifactId>jackcess</artifactId> - <version>1.2.14.3</version> - </dependency> -  <dependency> @@ -215,7 +201,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-3</version> + <version>3.0-rc-1</version> </dependency> <dependency> @@ -270,7 +256,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.2.5.Final</version> + <version>4.2.10.Final</version> </dependency>  @@ -293,6 +279,12 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

r968 - in trunk: echobase-domain/src/main/data echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb echobase-domain/src/main/resources/migration echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/u
by tchemit＠users.forge.codelutin.com 01 Mar '14

01 Mar '14

Author: tchemit Date: 2014-03-02 00:20:47 +0100 (Sun, 02 Mar 2014) New Revision: 968 Url: http://codelutin.com/projects/echobase/repository/revisions/968 Log: refs #2931: Export de cartes au format image vers le site des indicateurs Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 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 Property changes on: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-03-01 23:20:47 UTC (rev 968) @@ -4,7 +4,7 @@ * #%L * EchoBase :: Domain * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-03-01 23:20:47 UTC (rev 968) @@ -1,8 +1,8 @@ --- -- #%L -- EchoBase :: Domain --- $Id:$ --- $HeadURL:$ +-- $Id$ +-- $HeadURL$ -- %% -- Copyright (C) 2011 - 2014 Ifremer, Codelutin -- %% Property changes on: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,119 @@ +package fr.ifremer.echobase.services.service.exportMap; + +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.services.ProgressModel; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since XXX + */ +public class ExportMapConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** + * File of of export file. + */ + private String fileName; + + /** + * Working directory. + */ + private File workingDirectory; + + /** + * Final export file. + */ + private File exportFile; + + /** + * Id of voyage to export. + */ + private String voyageId; + + private JdbcConfiguration dbConfiguration; + + public ExportMapConfiguration() { + } + + public ExportMapConfiguration(ProgressModel progressModel) { + super(progressModel); + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getExportFile() { + return exportFile; + } + + public void setExportFile(File exportFile) { + this.exportFile = exportFile; + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public JdbcConfiguration getDbConfiguration() { + return dbConfiguration; + } + + public void setDbConfiguration(JdbcConfiguration dbConfiguration) { + this.dbConfiguration = dbConfiguration; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,87 @@ +package fr.ifremer.echobase.services.service.exportMap; + +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import fr.ifremer.echobase.io.EchoBaseIOUtil; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import org.nuiton.util.TimeLog; + +import java.io.File; +import java.io.IOException; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class ExportMapService extends EchoBaseServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportMapService.class); + + public static final TimeLog timeLog = new TimeLog(ExportMapService.class); + + public void doExport(ExportMapConfiguration model) throws IOException { + + String fileName = model.getFileName(); + + File tempDirectory = model.getWorkingDirectory(); + + File zipFile = new File(tempDirectory, fileName + ".zip"); + + if (log.isInfoEnabled()) { + log.info("Will export map to " + zipFile); + } + model.setExportFile(zipFile); + + File dir = new File(tempDirectory, "echobase"); + + FileUtil.createDirectoryIfNecessary(dir); + if (log.isInfoEnabled()) { + log.info("Will store maps in " + dir); + } + + JdbcConfiguration dbConfiguration = model.getDbConfiguration(); + if (log.isInfoEnabled()) { + log.info("Will connect to db: " + dbConfiguration.getUrl()); + } + + // compute nb steps + int nbSteps = 0; + + if (log.isInfoEnabled()) { + log.info("NB steps: " + nbSteps); + } + model.setNbSteps(nbSteps); + + // TODO Export + + EchoBaseIOUtil.compressZipFile(zipFile, dir); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,100 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.ui.EchoBaseSession; +import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; +import java.util.Map; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Configure extends AbstractConfigureAction<ExportMapConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Configure.class); + + /** Universe of voyages to export in db. */ + protected Map<String, String> voyages; + + public Configure() { + super(ExportMapConfiguration.class); + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setFileName(String fileName) { + getModel().setFileName(fileName); + } + + @Override + protected ExportMapConfiguration createModel() { + ExportMapConfiguration result = new ExportMapConfiguration(); + result.setFileName("echobase"); + + EchoBaseSession userSession = getEchoBaseSession(); + JdbcConfiguration workingDbConfiguration = userSession.getWorkingDbConfiguration(); + result.setDbConfiguration(workingDbConfiguration); + return result; + } + + @Override + protected void prepareInputAction(ExportMapConfiguration model) { + + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + } + + @Override + protected void prepareExecuteAction(ExportMapConfiguration model) throws IOException { + + File tempDirectory = FileUtils.getTempDirectory(); + File dataDirectory = new File(tempDirectory, + "echobase-exportMap-" + + System.currentTimeMillis()); + FileUtil.createDirectoryIfNecessary(dataDirectory); + model.setWorkingDirectory(dataDirectory); + if (log.isInfoEnabled()) { + log.info("Temporary directory to use : " + dataDirectory); + } + + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,96 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Download extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + /** File name of the download. */ + protected String fileName; + + /** Length of the file to download. */ + protected long contentLength; + + /** Content type of the file to download. */ + protected String contentType; + + public InputStream getInputStream() { + return inputStream; + } + + public String getFileName() { + return fileName; + } + + public long getContentLength() { + return contentLength; + } + + public String getContentType() { + return contentType; + } + + @Override + public String execute() throws Exception { + + ExportMapConfiguration model = + getEchoBaseSession().getActionConfiguration(ExportMapConfiguration.class); + + if (model == null) { + addFlashError(t("echobase.error.no.exportMap.configurationFound")); + return ERROR; + } + + File exportFile = model.getExportFile(); + if (exportFile == null) { + addFlashError(t("echobase.error.no.exportMap.exportFileFound")); + return ERROR; + } + + fileName = exportFile.getName(); + contentType = "application/zip"; + contentLength = exportFile.length(); + inputStream = new BufferedInputStream(new FileInputStream(exportFile)); + + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,85 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + +import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.services.service.exportMap.ExportMapService; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Export extends AbstractWaitAndExecAction<ExportMapConfiguration, ExportMapService> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Export.class); + + public Export() { + super(ExportMapConfiguration.class, ExportMapService.class); + } + + @Override + protected void startAction(ExportMapService service, + ExportMapConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start export map to file " + model.getFileName()); + } + service.doExport(model); + } + + @Override + protected String getSuccesMessage() { + return t("echobase.info.exportMap.succeded"); + } + + @Override + protected String getErrorMessage() { + return t("echobase.info.exportMap.failed"); + } + + @Override + public String getActionResumeTitle() { + return t("echobase.legend.exportMap.resume"); + } + + @Override + protected String getResultMessage(ExportMapConfiguration model) { + String result = t("echobase.message.exportMap.result", + model.getFileName(), + model.getActionTime()); + + if (log.isInfoEnabled()) { + log.info("Result: " + result); + } + return result; + } + +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-03-01 23:20:47 UTC (rev 968) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.spatial; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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% + */ + import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" + "http://struts.apache.org/dtds/struts-2.3.dtd"> + +<struts> + + <package name="exportMap" extends="logguedAndWithDb" namespace="/exportMap"> + +  + <action name="configureInput" method="input" + class="fr.ifremer.echobase.ui.actions.exportMap.Configure"> + <result name="input">/WEB-INF/jsp/exportMap/configure.jsp</result> + </action> + +  + <action name="configure" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Configure"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result name="input">/WEB-INF/jsp/exportMap/configure.jsp</result> + <result type="redirectAction"> + <param name="namespace">/exportMap</param> + <param name="actionName">export</param> + </result> + </action> + +  + <action name="export" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Export"> + <interceptor-ref name="basicStackLogguedWithdb"/> + <interceptor-ref name="execAndWait"/> + <result name="wait">/WEB-INF/jsp/exportMap/progress.jsp</result> + <result type="redirectAction"> + <param name="namespace">/exportMap</param> + <param name="actionName">result</param> + </result> + </action> + +  + <action name="result" method="result" + class="fr.ifremer.echobase.ui.actions.exportMap.Export"> + <result>/WEB-INF/jsp/exportMap/result.jsp</result> + </action> + +  + <action name="download" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Download"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="contentLength">${contentLength}</param> + <param name="contentDisposition">filename="${fileName}"</param> + </result> + </action> + + </package> + +</struts> + Property changes on: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,40 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportMap.voyage.required"/> + </field-validator> + </field> + + <field name="model.fileName"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportMap.filename.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/exportMap/Configure-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-01 23:20:47 UTC (rev 968) @@ -17,6 +17,7 @@ echobase.action.display=Display spatial data echobase.action.downloadEmbeddedApplicationFile=Download the portable database echobase.action.downloadExportDbFile=Download database export file +echobase.action.downloadExportMapFile=Download voyage maps export file echobase.action.export=Export echobase.action.exportSqlData=Data export echobase.action.exportTable=Export @@ -36,6 +37,7 @@ echobase.action.saveSqlQuery=Update query echobase.action.show.embedded.documentation=How to use a portable database echobase.action.show.exportDb.documentation=How to export a database +echobase.action.show.exportMap.documentation=How to export voyage maps (Coser) echobase.action.show.import.documentation=How to import data echobase.action.show.importDb.documentation=How to import a database echobase.action.show.showSpatialData.documentation=How to display spatial data @@ -173,14 +175,16 @@ echobase.confirm.delete.workingDbConfiguration=Delete working database configuration echobase.error.bad.password=Invalid password echobase.error.email.already.used=The user name already exists -echobase.error.export.description.requiredstring=La description de l'export est obligatoire -echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire +echobase.error.export.description.requiredstring=Export description required +echobase.error.export.name.requiredstring=Export name required echobase.error.export.sqlQuery.forbidden.alter.word=La requète contient le mot 'ALTER', ce qui est interdit echobase.error.export.sqlQuery.forbidden.delete.word=La requète contient le mot 'DELETE', ce qui est interdit echobase.error.export.sqlQuery.forbidden.drop.word=La requète contient le mot 'DROP', ce qui est interdit echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.filename.required=Export filename required +echobase.error.exportMap.voyage.required=No voyage selected echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -233,16 +237,15 @@ echobase.error.no.embeddedApplication.exportFileFound=New portable database not found echobase.error.no.exportDb.configurationFound=Database export configuration not found echobase.error.no.exportDb.exportFileFound=Database export archive not found +echobase.error.no.exportMap.configurationFound=Voyage maps export configuration not found +echobase.error.no.exportMap.exportFileFound=Voyage maps archive not found echobase.error.query.invalid.name=\=Query names must only contains alphanumeric characters echobase.error.query.name.already.exists=Query name already exists echobase.error.required.email=E-mail address required echobase.error.required.password=Password is required -echobase.error.showData.cellType.required=CellType required -echobase.error.showData.dataMetadata.required=DataMetadata required -echobase.error.showData.dataMetadataIdForLayer.required=Il faut sélectionner la méta-donnée à utiliser sur la couche -echobase.error.showData.echoTypeOrSpecies.required=Echotype or (and) Species is required -echobase.error.showData.noLayer.selected=Aucune couche de présentation sélectionnée -echobase.error.showData.voyage.required=Voyage required +echobase.error.showData.dataMetadataIdForLayer.required= +echobase.error.showData.noLayer.selected= +echobase.error.showData.voyage.required= echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type @@ -260,9 +263,12 @@ echobase.info.documentation=EchoBase online documentation echobase.info.downloadFiles=Download EchoBase or some import files echobase.info.echoR=EchoR project -echobase.info.exportDb.archive=Basebame of the archive, extension <strong>.echobase</strong> will be added to it. +echobase.info.exportDb.archive=Basename of the archive, extension <strong>.echobase</strong> will be added to it. echobase.info.exportDb.failed=Database export failed echobase.info.exportDb.succeded=Database export successful +echobase.info.exportMap.archive=Basename of the archive, extension <strong>.zip</strong> will be added to it. +echobase.info.exportMap.failed=Voyage maps export failed +echobase.info.exportMap.succeded=Voyage maps export successful echobase.info.import.failed=Import failed echobase.info.importData.failed=Data import failed echobase.info.importData.succeded=Data import sucessful @@ -311,6 +317,7 @@ echobase.label.exportAsSeen=Export as displayed on the screen echobase.label.exportDbFileName=Name of export file echobase.label.exportFileName=Name of export file +echobase.label.exportMapFileName=Name of export file echobase.label.importFile=File to export echobase.label.login=Connection echobase.label.numberOfCreatedEntities=No. of fields created @@ -334,6 +341,8 @@ echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration echobase.legend.exportDb.resume=Resume of database export +echobase.legend.exportMap.configuration.files=Export configuration +echobase.legend.exportMap.resume=Resume of voyage maps export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics @@ -355,6 +364,7 @@ echobase.menu.editData=Modify data echobase.menu.export=Export data echobase.menu.exportDb=Database export +echobase.menu.exportMap=Voyage maps export echobase.menu.importData=Import data echobase.menu.importDb=Database import echobase.menu.logs=Change log @@ -366,6 +376,7 @@ echobase.message.createEmbedded.result=Portable application was successful in %s. echobase.message.download.link=If download did not start by itself, you can start it manually from this link\: echobase.message.exportDb.result=Export of database (mode %s) was successful (file %s) in %s. +echobase.message.exportMap.result=Export of voyage maps was successful (file %s) in %s. echobase.message.importData.result=Data import successful in %s \:\n%s echobase.message.no.row.selected=No data selected echobase.message.no.spatial.database.support=The working db you are using is not compatible with postgis 2. @@ -394,6 +405,9 @@ echobase.title.exportDb=Export a complete database echobase.title.exportDbProgress=Export database in progress echobase.title.exportDbResult=Database export results +echobase.title.exportMap=Export voyage maps +echobase.title.exportMapProgress=Voyage maps export in progress +echobase.title.exportMapResult=Voyage maps export results echobase.title.exportTable=Export a table echobase.title.importData.selectImportType=Select type of import echobase.title.importDb=Database import 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 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-01 23:20:47 UTC (rev 968) @@ -17,6 +17,7 @@ echobase.action.display=Afficher les données echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète +echobase.action.downloadExportMapFile=Télécharger le fichier d'export des cartes d'une campagne echobase.action.export=Exporter echobase.action.exportSqlData=Exporter les données echobase.action.exportTable=Exporter @@ -36,6 +37,7 @@ echobase.action.saveSqlQuery=Mettre à jour echobase.action.show.embedded.documentation=Comment utiliser une application embarquée echobase.action.show.exportDb.documentation=Comment exporter une base +echobase.action.show.exportMap.documentation=Comment exporter les cartes d'une campagne (Coser) echobase.action.show.import.documentation=Comment importer des données echobase.action.show.importDb.documentation=Comment importer une base echobase.action.show.showSpatialData.documentation=Comment visualiser des données spatiales @@ -181,6 +183,8 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.filename.required=Le nom d'un fichier d'export est obligatoire +echobase.error.exportMap.voyage.required=La sélection d'une campagne est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -233,6 +237,8 @@ echobase.error.no.embeddedApplication.exportFileFound=Application embarquée générée non trouvée echobase.error.no.exportDb.configurationFound=Configuration de l'export de la base non trouvée echobase.error.no.exportDb.exportFileFound=Archive d'export de la base introuvable +echobase.error.no.exportMap.configurationFound=Configuration de l'export des cartes d'une campagne +echobase.error.no.exportMap.exportFileFound=Archive d'export des cartes d'une campagne introuvable echobase.error.query.invalid.name=Le nom de la requête doit être constitué uniquement de caractères alphanumériques echobase.error.query.name.already.exists=Nom de requête déjà utilisé echobase.error.required.email=Courriel obligatoire @@ -263,6 +269,9 @@ echobase.info.exportDb.archive=Il s'agit du nom de l'archive, l'extension <strong>.echobase</strong> sera automatiquement rajoutée. echobase.info.exportDb.failed=L'export de la base de données a échoué echobase.info.exportDb.succeded=L'export de la base de données a réussi +echobase.info.exportMap.archive=Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée. +echobase.info.exportMap.failed=L'export des cartes d'une campagne a échoué +echobase.info.exportMap.succeded=L'export des cartes d'une campagne a réussi echobase.info.import.failed=L'import a échoué echobase.info.importData.failed=L'import des données a échoué echobase.info.importData.succeded=L'import des données a réussi @@ -311,6 +320,7 @@ echobase.label.exportAsSeen=Exporter "comme à l'écran" echobase.label.exportDbFileName=Nom du fichier d'export echobase.label.exportFileName=Nom du fichier d'export +echobase.label.exportMapFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion echobase.label.numberOfCreatedEntities=Nombre de champs créés @@ -334,6 +344,8 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base +echobase.legend.exportMap.configuration.files=Configuration de l'export +echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission @@ -355,6 +367,7 @@ echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base +echobase.menu.exportMap=Exporter les cartes d'une campagne echobase.menu.importData=Importer des données echobase.menu.importDb=Importer une base echobase.menu.logs=Journal des modifications @@ -366,6 +379,7 @@ echobase.message.createEmbedded.result=La création de l'application embarqué a réussi en %s echobase.message.download.link=Si le téléchargement n'a pas démarré automatiquement, suivez ce lien \: echobase.message.exportDb.result=L'export de la base (mode %s) a réussi (fichier %s) en %s +echobase.message.exportMap.result=L'export des cartes a réussi (fichier %s) en %s echobase.message.importData.result=Import de données réussi en %s \:\n%s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.no.spatial.database.support=La base de travail que vous utilisez ne possède pas de support spatiale. @@ -394,6 +408,9 @@ echobase.title.exportDb=Export complet de la base echobase.title.exportDbProgress=Export de la base de données en cours echobase.title.exportDbResult=Résultats de l'export de la base de données +echobase.title.exportMap=Export des cartes d'une campagne +echobase.title.exportMapProgress=Export des cartes d'une campagne en cours +echobase.title.exportMapResult=Résultats de l'export des cartes d'une campagne echobase.title.exportTable=Exporter une table echobase.title.importData.selectImportType=Sélection du type d'import echobase.title.importDb=Import d'une base Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -292,6 +292,7 @@ <include file="config/struts-importDb.xml"/> <include file="config/struts-exportDb.xml"/> + <include file="config/struts-exportMap.xml"/> <include file="config/struts-removeData.xml"/> <include file="config/struts-spatial.xml"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -149,6 +149,13 @@ </span> </s:a> </li> + <li> + <s:a action="configureInput" namespace="/exportMap" cssClass="spatial"> + <span> + <s:text name="echobase.menu.exportMap"/> + </span> + </s:a> + </li> </s:if> <li> <s:a action="userList" namespace="/user" cssClass="user"> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,65 @@ +<%-- + #%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.exportMap"/></title> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + }); +</script> + +<s:form namespace="/exportMap" method="POST"> + <fieldset> + <legend> + <s:text name="echobase.legend.exportDb.configuration.files"/> + </legend> + + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('exportMap.html', null)}" target="doc"> + <s:text name="echobase.action.show.exportMap.documentation"/> + </s:a> + </div> + <br/> + + <s:select key="model.voyageId" requiredLabel="true" + label='%{getText("echobase.common.voyage")}' + list="voyages" headerKey="" headerValue=""/> + + <div class="cleanBoth"></div> + <br/> + <s:textfield key="model.fileName" requiredLabel="true" size="100" + label="%{getText('echobase.label.exportMapFileName')} (*)"/> + + <div class="cleanBoth"> + <br/> + (*) <s:text name="echobase.info.exportMap.archive"/> + </div> + </fieldset> + <br/> + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> +</s:form> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,39 @@ +<%-- + #%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" %> + +<meta http-equiv="refresh" content='10;url=<s:url action="export" namespace="/exportMap"/>'/> + +<title><s:text name="echobase.title.exportMapProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnExportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progress}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,54 @@ +<%-- + #%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" %> + +<s:url id="downloadUrl" namespace="/exportMap" action="download"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + // start to download by it-self the result of import + window.open("${downloadUrl}"); + }); + +</script> +<title><s:text name="echobase.title.exportMapResult"/></title> + +<%@ include file="/WEB-INF/includes/actionResult.jsp" %> + +<div> + L'export des cartes de la campagne a réussi en <s:property value="model.actionTime"/>. +</div> + +<br/> + +<div> + Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : + <a href="${downloadUrl}" target="download"> + <s:text name="echobase.action.downloadExportMapFile"/> + </a> +</div> + Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0