branch struts2.5 created (now 00ac42e3)
This is an automated email from the git hooks/post-receive script. New change to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 00ac42e3 Update struts from 2.3.x to 2.5.x This branch includes the following new commits: new 96ae9105 refs #10215 refs #10216 refs #10217 new b58e9683 fixes #10317 - La première espèce d'un echotype n'est pas liée new ad6b0432 fixes #8748 - Erreur à l'import des données d'opération (bis) fixes #10287 - Pas de size category dans le fichier d'import des echotypes new 29a35fb6 Update doc new 33601cb7 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base new a8f74cc9 Remove deprecated code calls new 29e69af2 fixes #10230 : Les opérations ne sont pas associées au bon transect new a2104351 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base new f087fe33 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas new 00ac42e3 Update struts from 2.3.x to 2.5.x The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 00ac42e32ec5d56cd1f2abd841e409c38529086e Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 20 15:58:22 2019 +0100 Update struts from 2.3.x to 2.5.x commit f087fe33b2bc5c14ef28e1c468337113bd4b95d8 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 18 15:06:03 2019 +0100 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas commit a21043517c7ec535fa263b8a9d16b048c350a847 Author: jcouteau <couteau@codelutin.com> Date: Fri Nov 15 09:27:38 2019 +0100 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base commit 29e69af2c0176c5eca51d2945af6a0ce9b68b15c Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 13:14:30 2019 +0100 fixes #10230 : Les opérations ne sont pas associées au bon transect commit a8f74cc93121ad52faf427dd75adb07bd7474000 Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 13:03:26 2019 +0100 Remove deprecated code calls commit 33601cb786121f119929f944e8381fba37fe8da6 Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 10:56:01 2019 +0100 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base commit 29a35fb64c5341c6e01a3dfd00f36d5eb8b997b5 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 30 15:01:06 2019 +0200 Update doc commit ad6b043206c3ca865c021d7ebd99cd737dacad4f Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 30 14:56:26 2019 +0200 fixes #8748 - Erreur à l'import des données d'opération (bis) fixes #10287 - Pas de size category dans le fichier d'import des echotypes commit b58e9683fbb4847258d95f848e56bc9dbd0bfa1d Author: jcouteau <couteau@codelutin.com> Date: Thu Apr 25 15:56:26 2019 +0200 fixes #10317 - La première espèce d'un echotype n'est pas liée commit 96ae910553a9a12727d50b0b2e8397c7319bdb75 Author: jcouteau <couteau@codelutin.com> Date: Fri Mar 1 11:45:37 2019 +0100 refs #10215 refs #10216 refs #10217 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 96ae910553a9a12727d50b0b2e8397c7319bdb75 Author: jcouteau <couteau@codelutin.com> Date: Fri Mar 1 11:45:37 2019 +0100 refs #10215 refs #10216 refs #10217 --- .../service/atlantos/xml/VocabularyExport.java | 51 +++++++++++++++++++--- .../service/atlantos/xml/XmlAccousticExport.java | 31 +++---------- .../service/atlantos/xml/XmlBioticExport.java | 8 ++-- 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java index 695e04ac..df15e2e3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java @@ -21,6 +21,9 @@ package fr.ifremer.echobase.services.service.atlantos.xml; * #L% */ +import fr.ifremer.echobase.entities.data.Category; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.service.UserDbPersistenceService; import java.io.IOException; @@ -31,7 +34,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; -import org.apache.commons.lang3.StringUtils; /** * @@ -45,6 +47,9 @@ public class VocabularyExport implements EchoBaseService { protected Map<String, String> vocabularyTags; protected Map<String, String> vocabulary; protected Map<String, Set<String>> cache; + + //used to deal with echotypes in vocabulary export + protected Map<String, Category> categories; protected XmlWriter writer; protected Pattern pattern; @@ -54,8 +59,10 @@ public class VocabularyExport implements EchoBaseService { this.writer = writer; - this.vocabularyTags = new HashMap<String, String>(); + this.vocabularyTags = new HashMap<>(); this.cache = new HashMap<>(); + //special mechanism for echotypes + this.categories = new HashMap<>(); this.vocabularyTags.put("AC_Survey", "Survey"); this.vocabularyTags.put("ISO_3166", "Country"); @@ -85,7 +92,7 @@ public class VocabularyExport implements EchoBaseService { // For Biotic this.vocabularyTags.put("Gear", "Gear"); this.vocabularyTags.put("AC_HaulValidity", "HaulValidity"); - this.vocabularyTags.put("AC_DepthStratum", "DepthStratum"); + this.vocabularyTags.put("AC_Stratum", "Stratum"); this.vocabularyTags.put("AC_GearExceptions", "GearExceptions"); this.vocabularyTags.put("AC_DoorType", "DoorType"); this.vocabularyTags.put("AC_CatchDataType", "DataType"); @@ -107,8 +114,15 @@ public class VocabularyExport implements EchoBaseService { } public void generate() throws IOException { + + //Special mechanism for echotypes + for (Map.Entry<String, Category> entry: this.categories.entrySet()){ + exportEchotype(entry.getValue()); + } + this.writer.open("Vocabulary"); - + + for (Map.Entry<String, Set<String>> entry : this.cache.entrySet()) { String tag = entry.getKey(); Set<String> codes = entry.getValue(); @@ -123,7 +137,7 @@ public class VocabularyExport implements EchoBaseService { this.writer.create("Code", "ID", code, - "CodeType", "http://acoustic.ices.dk/Services/Schema/XML/" + prefix + ".xml", + "CodeType", "https://acoustic.ices.dk/Services/Schema/XML/" + prefix + ".xml", value); } @@ -169,5 +183,32 @@ public class VocabularyExport implements EchoBaseService { codes.add(code); } + + public void addCategory(Category category){ + this.categories.put(category.getEchotype().getName(), category); + } + + public void exportEchotype(Category category) throws IOException { + this.writer.open("EchoType", + "ID", category.getEchotype().getName()); + this.writer.create("Stratum", "IDREF", + getVocabularyCode("AC_Stratum_" + category.getEchotype().getDepthStratum().getId())); + + for (Species species:category.getEchotype().getSpecies()){ + exportSpecies(species, category.getSpeciesCategory()); + } + + this.writer.close("EchoType"); + } + + public void exportSpecies(Species species, SpeciesCategory speciesCategory) throws IOException { + this.writer.open("Species"); + this.writer.create("SpeciesCode", "IDREF", + getVocabularyCode("SpecWoRMS_" + species.getWormsCode())); + if (speciesCategory != null && speciesCategory.getSizeCategory() != null) { + this.writer.create("SpeciesCategory", speciesCategory.getSizeCategory().getName()); + } + this.writer.close("Species"); + } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index 6eade348..91ab855b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -3,16 +3,10 @@ package fr.ifremer.echobase.services.service.atlantos.xml; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Data; -import fr.ifremer.echobase.entities.data.DataAcquisition; -import fr.ifremer.echobase.entities.data.DataProcessing; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.*; import fr.ifremer.echobase.entities.references.AcousticInstrument; import fr.ifremer.echobase.entities.references.Calibration; +import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; @@ -113,7 +107,7 @@ public class XmlAccousticExport implements EchoBaseService { } Collection<Cell> cells = dataProcessing.getCell(); - List<Cell> orderingCells = new ArrayList<Cell>(cells); + List<Cell> orderingCells = new ArrayList<>(cells); orderingCells.removeIf(new Predicate<Cell>() { @Override public boolean test(Cell cell) { @@ -168,17 +162,6 @@ public class XmlAccousticExport implements EchoBaseService { xmlCruise.close("Sample"); } -// // EXPORT SAMPLE -// exportSample(voyage, cell, null, xmlCruise); -// -// Collection<Result> results = cell.getResult(); -// for (Result result : results) { -// if ("NASC".equals(result.getDataMetadata().getName())) { -// // EXPORT DATA -// exportData(result, xmlCruise); -// } -// } -// xmlCruise.close("Sample"); xmlCruise.close("Log"); } } @@ -321,7 +304,7 @@ public class XmlAccousticExport implements EchoBaseService { xml.close("DataProcessing"); } - + public void exportCruise(Voyage voyage, Vessel vessel, Transect transect, XmlWriter xml) throws IOException { xml.open("Cruise"); @@ -468,9 +451,9 @@ public class XmlAccousticExport implements EchoBaseService { public void exportData(Voyage voyage, Result result, XmlWriter xml) throws IOException { if (!result.getResultValue().equals("NA")) { xml.open("Data"); - - xml.create("SaCategory", - "IDREF", vocabulary.getVocabularyCode(voyage.getName() + ":" + result.getCategory().getEchotype().getName(),"AC_SaCategory_D4")); + xml.create("EchoType", + "IDREF", result.getCategory().getEchotype().getName()); + vocabulary.addCategory(result.getCategory()); xml.create("Type", "IDREF", vocabulary.getVocabularyCode("AC_AcousticDataType_C")); xml.create("Unit", diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java index 6ff6c7e5..5faf1ade 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java @@ -400,22 +400,22 @@ public class XmlBioticExport implements EchoBaseService { (int)((operation.getGearShootingEndTime().getTime() - operation.getGearShootingStartTime().getTime()) / (1000 * 60))); xml.create("Validity", "IDREF", vocabulary.getVocabularyCode("AC_HaulValidity_V")); - xml.create("DepthStratum", - "IDREF", vocabulary.getVocabularyCode("AC_DepthStratum_" + depthStratum)); xml.create("StartLatitude", startLatitude); xml.create("StartLongitude", startLongitude); xml.create("StopLatitude", endLatitude); xml.create("StopLongitude", endLongitude); xml.create("MinTrawlDepth", minTrawlDepth); - xml.create("MaxTrawlDepth", + xml.create("MaxTrawlDepth", maxTrawlDepth); xml.create("BottomDepth", meanWaterDepth.intValue()); - xml.create("Distance", + xml.create("Distance", distance); xml.create("Netopening", netopening); + xml.create("Stratum", + "IDREF", vocabulary.getVocabularyCode("AC_Stratum_" + depthStratum)); } public void exportCatch(Sample subsample, Float subsampledWeight, Float speciesCategoryWeight, Integer subsampledNumber, Integer speciesCategoryNumber, XmlWriter xml) throws IOException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ad6b043206c3ca865c021d7ebd99cd737dacad4f Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 30 14:56:26 2019 +0200 fixes #8748 - Erreur à l'import des données d'opération (bis) fixes #10287 - Pas de size category dans le fichier d'import des echotypes --- .../WorkingDbMigrationCallBackForVersion3_914.java | 47 +++++++++++++++++++++ .../workingDb/3.914-1-importlog-importtext.sql | 1 + .../workingDb/h2/3.914-1-importlog-importtext.sql | 1 + .../workingDb/pg/3.914-1-importlog-importtext.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 3 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100538 -> 100709 bytes .../services/service/UserDbPersistenceService.java | 6 +++ .../importdata/csv/ResultsEchotypeImportRow.java | 9 ++++ ...yageResultsVoyageEchotypeImportExportModel.java | 2 + 9 files changed, 69 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_914.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_914.java new file mode 100644 index 00000000..18698371 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_914.java @@ -0,0 +1,47 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/*- + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2018 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.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.List; + +public class WorkingDbMigrationCallBackForVersion3_914 extends WorkingDbMigrationCallBackForVersionSupport { + + @Override + public Version getVersion() { + return Versions.valueOf("3.914"); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + addSpecificScript("3.914-1-importlog-importtext.sql", queries); + } + +} diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.914-1-importlog-importtext.sql b/echobase-domain/src/main/resources/migration/workingDb/3.914-1-importlog-importtext.sql new file mode 100644 index 00000000..97f6bf20 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/3.914-1-importlog-importtext.sql @@ -0,0 +1 @@ +alter table importlog alter column importtext VARCHAR(2147483647); \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.914-1-importlog-importtext.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.914-1-importlog-importtext.sql new file mode 100644 index 00000000..97f6bf20 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.914-1-importlog-importtext.sql @@ -0,0 +1 @@ +alter table importlog alter column importtext VARCHAR(2147483647); \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.914-1-importlog-importtext.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.914-1-importlog-importtext.sql new file mode 100644 index 00000000..97f6bf20 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.914-1-importlog-importtext.sql @@ -0,0 +1 @@ +alter table importlog alter column importtext VARCHAR(2147483647); \ No newline at end of file diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index 8b737e71..bc827666 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -23,7 +23,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true -model.tagValue.version=3.913 +model.tagValue.version=3.914 model.tagValue.generatePropertyChangeSupport=false model.tagValue.generateBooleanGetMethods=false model.tagValue.indexForeignKeys=true @@ -54,6 +54,7 @@ fr.ifremer.echobase.entities.data.Voyage.attribute.echotype.stereotype=unique fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagValue.hibernateAttributeType=text fr.ifremer.echobase.entities.ImportFile.attribute.importText.tagValue.hibernateAttributeType=text +fr.ifremer.echobase.entities.ImportLog.attribute.importText.tagValue.hibernateAttributeType=text ############################################################################### ### Not null for transverse ################################################### diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index c9fa90dd..c41ee24f 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index bb4c11d7..bd52775b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -1040,6 +1040,12 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { ); } + public SizeCategory getSizeCategory(String name) { + return persistenceContext.getSizeCategoryDao().forProperties( + SizeCategory.PROPERTY_NAME, name + ).findAnyOrNull(); + } + //------------------------------------------------------------------------// //--- Transect -----------------------------------------------------------// //------------------------------------------------------------------------// diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/ResultsEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/ResultsEchotypeImportRow.java index ec88750a..80d0e7ae 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/ResultsEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/ResultsEchotypeImportRow.java @@ -38,6 +38,7 @@ public abstract class ResultsEchotypeImportRow<E extends TopiaEntity> implements private static final long serialVersionUID = 1L; public static final String PROPERTY_MEANING = Echotype.PROPERTY_MEANING; + public static final String PROPERTY_ID = Echotype.PROPERTY_ID; public static final String HEADER_ECHOTYPE_NAME = "echotypeName"; protected static final String HEADER_SPECIES = "baracoudaCode"; @@ -87,4 +88,12 @@ public abstract class ResultsEchotypeImportRow<E extends TopiaEntity> implements public void setDepthStratum(DepthStratum depthStratum) { echotype.setDepthStratum(depthStratum); } + + public int getId() { + return echotype.getId(); + } + + public void setId(int id) { + echotype.setId(id); + } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java index dfde0c40..8ec3d242 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java @@ -46,6 +46,7 @@ public class VoyageResultsVoyageEchotypeImportExportModel extends EchoBaseImport VoyageResultsVoyageEchotypeImportExportModel model = new VoyageResultsVoyageEchotypeImportExportModel(importDataContext.getCsvSeparator()); model.newMandatoryColumn(HEADER_ECHOTYPE_NAME, Echotype.PROPERTY_NAME); model.newMandatoryColumn(VoyageResultsVoyageEchotypeImportRow.PROPERTY_MEANING, Echotype.PROPERTY_MEANING); + model.newMandatoryColumn(VoyageResultsVoyageEchotypeImportRow.PROPERTY_ID, Echotype.PROPERTY_ID); model.newForeignKeyColumn(VoyageResultsVoyageEchotypeImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); model.newForeignKeyColumn(EchoBaseCsvUtil.DEPTH_STRATUM_ID, Echotype.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, importDataContext.getDepthStratumsById()); model.newForeignKeyColumn(HEADER_SPECIES, Echotype.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); @@ -58,6 +59,7 @@ public class VoyageResultsVoyageEchotypeImportExportModel extends EchoBaseImport VoyageResultsVoyageEchotypeImportExportModel model = new VoyageResultsVoyageEchotypeImportExportModel(importDataContext.getCsvSeparator()); model.newColumnForExport(HEADER_ECHOTYPE_NAME, Echotype.PROPERTY_NAME); model.newColumnForExport(VoyageResultsVoyageEchotypeImportRow.PROPERTY_MEANING, Echotype.PROPERTY_MEANING); + model.newColumnForExport(VoyageResultsVoyageEchotypeImportRow.PROPERTY_ID, Echotype.PROPERTY_ID); model.newColumnForExport(VoyageResultsVoyageEchotypeImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); model.newColumnForExport(EchoBaseCsvUtil.DEPTH_STRATUM_ID, Echotype.PROPERTY_DEPTH_STRATUM, EchoBaseCsvUtil.DEPTH_STRATUM_FORMATTER); model.newColumnForExport(HEADER_SPECIES, Echotype.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 29a35fb64c5341c6e01a3dfd00f36d5eb8b997b5 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 30 15:01:06 2019 +0200 Update doc --- src/site/en/rst/importData.rst | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index d3523674..f7ce6e9b 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -721,27 +721,29 @@ Required columns Columns formats --------------- -+-----------------+--------------------------+ -| Column | Type | -+=================+==========================+ -| echotypeName |text | -+-----------------+--------------------------+ -| meaning |text | -+-----------------+--------------------------+ -| voyage |FK(Voyage#name) | -+-----------------+--------------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------+--------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+-----------------+--------------------------+ ++-----------------+-------------------------------+ +| Column | Type | ++=================+===============================+ +| echotypeName |text | ++-----------------+-------------------------------+ +| meaning |text | ++-----------------+-------------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+-------------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+-------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+-------------------------------+ +| id |integer (species category code | ++-----------------+-------------------------------+ Example ------- :: - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + voyage;echotypeName;depthStratumId;meaning;baracoudaCode;id + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM;1 LengthWeightKey ~~~~~~~~~~~~~~~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 33601cb786121f119929f944e8381fba37fe8da6 Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 10:56:01 2019 +0100 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base --- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 1 + echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 1 + echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index 35e3c098..eee6b6b8 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -298,6 +298,7 @@ echobase.info.createEmbedded.failed=Portable application creation failed echobase.info.createEmbedded.succeded=Portable application creation succesful echobase.info.dbeditor.propertyDiffsResult=Data import results echobase.info.documentation=EchoBase online documentation +echobase.info.documentation.short=Online documentation echobase.info.downloadFiles=Download EchoBase or some import files echobase.info.echoR=EchoR project echobase.info.exportAtlantos.failed=ICES export failed diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index edd64061..a82622b7 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -300,6 +300,7 @@ echobase.info.createEmbedded.succeded=Création de l'application embarqué réus echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données echobase.info.delete.entity=La donnée de type '%s' a été supprimée echobase.info.documentation=Documentation en ligne d'EchoBase +echobase.info.documentation.short=Documentation en ligne echobase.info.downloadFiles=Télécharger l'application ou des fichiers d'imports echobase.info.echoR=Projet EchoR echobase.info.exportAtlantos.failed=L'export ICES a échoué diff --git a/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp b/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp index 9ea3f82c..03774334 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp @@ -53,5 +53,11 @@ <s:text name="echobase.info.userSupport"/> </s:a> </li> + + <li> + <s:a href="http://echobase.codelutin.com/v/latest/index.html" target='#doc'> + <s:text name="echobase.info.documentation.short"/> + </s:a> + </li> </ul> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a8f74cc93121ad52faf427dd75adb07bd7474000 Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 13:03:26 2019 +0100 Remove deprecated code calls --- .../fr/ifremer/echobase/ui/EchoBaseApplicationContext.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index ba070500..5a98be55 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -385,12 +385,9 @@ public class EchoBaseApplicationContext { RecursiveProperties properties = new RecursiveProperties(); - BufferedReader reader = Files.newReader(logFile, Charsets.UTF_8); - try { + + try (BufferedReader reader = Files.newReader(logFile, Charsets.UTF_8)) { properties.load(reader); - reader.close(); - } finally { - IOUtils.closeQuietly(reader); } // set default log directory @@ -406,12 +403,9 @@ public class EchoBaseApplicationContext { } p2.remove("echobase.log.dir"); // write back log configuration file - BufferedWriter writer = Files.newWriter(logFile, Charsets.UTF_8); - try { + + try (BufferedWriter writer = Files.newWriter(logFile, Charsets.UTF_8);) { p2.store(writer, "Generated by " + getClass().getName()); - writer.close(); - } finally { - IOUtils.closeQuietly(writer); } } // reste logger configuration -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 29e69af2c0176c5eca51d2945af6a0ce9b68b15c Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 13:14:30 2019 +0100 fixes #10230 : Les opérations ne sont pas associées au bon transect --- .../echobase/entities/data/TransitImpl.java | 15 +++++++++++++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 100709 -> 100662 bytes .../VoyageOperationsOperationImportAction.java | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java index 1762b939..6e5a2e18 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java @@ -41,4 +41,19 @@ public class TransitImpl extends TransitAbstract { } return result; } + + @Override + public Transect getTransect(Vessel vessel, String gearCode) { + Preconditions.checkNotNull(vessel); + Transect result = null; + if (!isTransectEmpty()) { + for (Transect t : transect) { + if (vessel.equals(t.getVessel()) && gearCode.equals(t.getTransectAbstract())) { + result = t; + break; + } + } + } + return result; + } } //TransitImpl diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index c41ee24f..c5ee64c8 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java index c0c31471..75d7634d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java @@ -95,7 +95,7 @@ public class VoyageOperationsOperationImportAction extends VoyageOperationsImpor Transit transit = voyage.getTransit(startTime, endTime); - Transect transect = transit.getTransect(vessel); + Transect transect = transit.getTransect(vessel, operation.getGear().getGearCode()); Operation createdOperation = persistenceService.createOperation(operation); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a21043517c7ec535fa263b8a9d16b048c350a847 Author: jcouteau <couteau@codelutin.com> Date: Fri Nov 15 09:27:38 2019 +0100 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base --- .../ifremer/echobase/services/service/UserDbPersistenceService.java | 3 ++- .../importdata/actions/VoyageResultsMapFishCellImportAction.java | 4 ++-- .../importdata/actions/VoyageResultsMapOtherCellImportAction.java | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index bd52775b..63f3dc0a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -259,10 +259,11 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { return persistenceContext.getCellDao().forTopiaIdEquals(id).findUnique(); } - public Cell getCellByNameAndType(String cellName, CellType cellType) { + public Cell getCellByVoyageNameAndType(String cellName, CellType cellType, Voyage voyage) { return persistenceContext.getCellDao() .forNameEquals(cellName) .addEquals(Cell.PROPERTY_CELL_TYPE, cellType) + .addEquals(Cell.PROPERTY_VOYAGE, voyage) .findUniqueOrNull(); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java index c2e7d752..e7e8e73e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java @@ -119,12 +119,12 @@ public class VoyageResultsMapFishCellImportAction extends VoyageResultsImportDat String cellName = rowCell.getName(); CellType cellType = rowCell.getCellType(); - Cell cell = persistenceService.getCellByNameAndType(cellName, cellType); + Cell cell = persistenceService.getCellByVoyageNameAndType(cellName, cellType, voyage); if (cell == null) { cell = persistenceService.createCell(rowCell); voyage.addPostCell(cell); } - + // collect ids addId(result, EchoBaseUserEntityEnum.Cell, cell, rowNumber); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java index f207dcba..9e2235ef 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java @@ -31,7 +31,6 @@ import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; -import fr.ifremer.echobase.services.service.importdata.DuplicatedMapCellException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; @@ -112,7 +111,7 @@ public class VoyageResultsMapOtherCellImportAction extends VoyageResultsImportDa String cellName = rowCell.getName(); CellType cellType = rowCell.getCellType(); - Cell cell = persistenceService.getCellByNameAndType(cellName, cellType); + Cell cell = persistenceService.getCellByVoyageNameAndType(cellName, cellType, voyage); if (cell == null) { cell = persistenceService.createCell(rowCell); voyage.addPostCell(cell); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f087fe33b2bc5c14ef28e1c468337113bd4b95d8 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 18 15:06:03 2019 +0100 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas --- .../fr/ifremer/echobase/services/service/DbEditorService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index 2d5976d4..e29e7f2a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -164,6 +164,14 @@ public class DbEditorService extends EchoBaseServiceSupport { pager.setRecords(count); PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + if (pager.getSortColumn() != null && !pager.getSortColumn().isEmpty()) { + if (pager.isSortAscendant()) { + hql += " Order by e." + pager.getSortColumn() + " asc"; + } else { + hql += " Order by e." + pager.getSortColumn() + " desc"; + } + } + if (!hql.toLowerCase().contains("order by")) { hql+=" Order By e.id"; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 00ac42e32ec5d56cd1f2abd841e409c38529086e Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 20 15:58:22 2019 +0100 Update struts from 2.3.x to 2.5.x --- echobase-ui/pom.xml | 4 ---- .../java/fr/ifremer/echobase/ui/actions/user/Login.java | 2 +- .../src/main/resources/config/struts-dbeditor.xml | 6 +++--- .../resources/config/struts-embeddedApplication.xml | 4 ++-- .../src/main/resources/config/struts-exportAtlantos.xml | 4 ++-- .../src/main/resources/config/struts-exportCoser.xml | 4 ++-- .../src/main/resources/config/struts-exportDb.xml | 4 ++-- .../src/main/resources/config/struts-exportQuery.xml | 10 +++++----- .../src/main/resources/config/struts-importData.xml | 4 ++-- .../src/main/resources/config/struts-importDb.xml | 4 ++-- .../src/main/resources/config/struts-removeData.xml | 4 ++-- .../src/main/resources/config/struts-spatial.xml | 4 ++-- echobase-ui/src/main/resources/config/struts-user.xml | 4 ++-- .../src/main/resources/config/struts-workingDb.xml | 8 ++++---- echobase-ui/src/main/resources/struts.xml | 6 +++--- echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp | 8 ++++---- .../src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/embeddedApplication/result.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportCoser/configure.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/exportDb/result.jsp | 2 +- .../WEB-INF/jsp/exportQuery/exportQueryResult.jsp | 2 +- .../main/webapp/WEB-INF/jsp/removeData/importLogs.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/user/userList.jsp | 8 ++++---- .../src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 4 ++-- .../main/webapp/WEB-INF/jsp/workingDb/modifications.jsp | 2 +- echobase-ui/src/main/webapp/WEB-INF/web.xml | 4 ++-- pom.xml | 17 +++-------------- 29 files changed, 61 insertions(+), 76 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index a3d98ac4..aef18e9b 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -250,10 +250,6 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java index d9e38fa5..64e87e2f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.user; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.interceptor.I18nInterceptor; +import org.apache.struts2.interceptor.I18nInterceptor; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.UserService; import fr.ifremer.echobase.ui.EchoBaseSession; diff --git a/echobase-ui/src/main/resources/config/struts-dbeditor.xml b/echobase-ui/src/main/resources/config/struts-dbeditor.xml index bba646d1..b57882bd 100644 --- a/echobase-ui/src/main/resources/config/struts-dbeditor.xml +++ b/echobase-ui/src/main/resources/config/struts-dbeditor.xml @@ -21,8 +21,8 @@ --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> @@ -30,7 +30,7 @@ <result-types> <result-type name="redirectToDbEditor" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> <param name="entityType">${entityType}</param> diff --git a/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml b/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml index dfb04cd4..f4c88d01 100644 --- a/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml +++ b/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml @@ -19,8 +19,8 @@ --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml b/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml index 98ea8f5a..64080a38 100644 --- a/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml +++ b/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml @@ -18,8 +18,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-exportCoser.xml b/echobase-ui/src/main/resources/config/struts-exportCoser.xml index ee925724..ad1a15b6 100644 --- a/echobase-ui/src/main/resources/config/struts-exportCoser.xml +++ b/echobase-ui/src/main/resources/config/struts-exportCoser.xml @@ -18,8 +18,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-exportDb.xml b/echobase-ui/src/main/resources/config/struts-exportDb.xml index 2176d530..1c29822b 100644 --- a/echobase-ui/src/main/resources/config/struts-exportDb.xml +++ b/echobase-ui/src/main/resources/config/struts-exportDb.xml @@ -18,8 +18,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-exportQuery.xml b/echobase-ui/src/main/resources/config/struts-exportQuery.xml index 5cead5ea..f6c13365 100644 --- a/echobase-ui/src/main/resources/config/struts-exportQuery.xml +++ b/echobase-ui/src/main/resources/config/struts-exportQuery.xml @@ -19,8 +19,8 @@ --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> @@ -29,18 +29,18 @@ <result-types> <result-type name="redirectToList" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">list</param> <param name="namespace">exportQuery</param> </result-type> <result-type name="redirectToEdit" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">edit</param> <param name="namespace">exportQuery</param> <param name="query.topiaId">${query.topiaId}</param> </result-type> <result-type name="showList" - class="org.apache.struts2.dispatcher.ServletDispatcherResult"> + class="org.apache.struts2.result.ServletDispatcherResult"> <param name="location">/WEB-INF/jsp/exportQuery/exportQuery.jsp</param> <param name="query.topiaId">${query.topiaId}</param> </result-type> diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index 92ced7c0..9f06d7f7 100644 --- a/echobase-ui/src/main/resources/config/struts-importData.xml +++ b/echobase-ui/src/main/resources/config/struts-importData.xml @@ -20,8 +20,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-importDb.xml b/echobase-ui/src/main/resources/config/struts-importDb.xml index 5057e3a5..76c71324 100644 --- a/echobase-ui/src/main/resources/config/struts-importDb.xml +++ b/echobase-ui/src/main/resources/config/struts-importDb.xml @@ -18,8 +18,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-removeData.xml b/echobase-ui/src/main/resources/config/struts-removeData.xml index 191c50fd..71e53958 100644 --- a/echobase-ui/src/main/resources/config/struts-removeData.xml +++ b/echobase-ui/src/main/resources/config/struts-removeData.xml @@ -17,8 +17,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-spatial.xml b/echobase-ui/src/main/resources/config/struts-spatial.xml index d4f20729..e966f917 100644 --- a/echobase-ui/src/main/resources/config/struts-spatial.xml +++ b/echobase-ui/src/main/resources/config/struts-spatial.xml @@ -18,8 +18,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-user.xml b/echobase-ui/src/main/resources/config/struts-user.xml index 898e4012..27483f42 100644 --- a/echobase-ui/src/main/resources/config/struts-user.xml +++ b/echobase-ui/src/main/resources/config/struts-user.xml @@ -21,8 +21,8 @@ --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> diff --git a/echobase-ui/src/main/resources/config/struts-workingDb.xml b/echobase-ui/src/main/resources/config/struts-workingDb.xml index 1e58547e..016231a9 100644 --- a/echobase-ui/src/main/resources/config/struts-workingDb.xml +++ b/echobase-ui/src/main/resources/config/struts-workingDb.xml @@ -19,8 +19,8 @@ #L% --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> @@ -29,14 +29,14 @@ <result-types> <result-type name="redirectToShowList" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">showList</param> <param name="namespace">/workingDb</param> <param name="conf.topiaId">${conf.topiaId}</param> </result-type> <result-type name="showList" - class="org.apache.struts2.dispatcher.ServletDispatcherResult"> + class="org.apache.struts2.result.ServletDispatcherResult"> <param name="location">/WEB-INF/jsp/workingDb/manage.jsp</param> <param name="conf.topiaId">${conf.topiaId}</param> </result-type> diff --git a/echobase-ui/src/main/resources/struts.xml b/echobase-ui/src/main/resources/struts.xml index a591b00c..11077cd3 100644 --- a/echobase-ui/src/main/resources/struts.xml +++ b/echobase-ui/src/main/resources/struts.xml @@ -22,8 +22,8 @@ <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> @@ -63,7 +63,7 @@ <result-types> <result-type name="redirectToHome" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">home</param> <param name="namespace">/</param> </result-type> diff --git a/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp b/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp index 8de419fb..195f510a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp @@ -19,10 +19,10 @@ #L% --%> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="usingEnglish"><s:text name='echobase.action.usingEnglish'/></s:set> -<s:set name="usingFrench"><s:text name='echobase.action.usingFrench'/></s:set> -<s:set name="toEnglish"><s:text name='echobase.action.toEnglish'/></s:set> -<s:set name="toFrench"><s:text name='echobase.action.toFrench'/></s:set> +<s:set var="usingEnglish"><s:text name='echobase.action.usingEnglish'/></s:set> +<s:set var="usingFrench"><s:text name='echobase.action.usingFrench'/></s:set> +<s:set var="toEnglish"><s:text name='echobase.action.toEnglish'/></s:set> +<s:set var="toFrench"><s:text name='echobase.action.toFrench'/></s:set> <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp index 79530b46..7a71ee41 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp @@ -26,9 +26,9 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id="getTableData" action="getTableData" namespace="/dbeditor"/> +<s:url var="getTableData" action="getTableData" namespace="/dbeditor"/> -<s:set name="tableSelected" value="%{entityType != null}"/> +<s:set var="tableSelected" value="%{entityType != null}"/> <title> <s:if test="admin"> @@ -261,7 +261,7 @@ <br class="clearBoth"/> <s:if test="tableSelected"> - <s:url id="loadUrl" action="getTableDatas" namespace="/dbeditor" + <s:url var="loadUrl" action="getTableDatas" namespace="/dbeditor" escapeAmp="false"> <s:param name="entityType" value="%{entityType}"/> </s:url> @@ -352,7 +352,7 @@ <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK"> - <s:url id="urlName" action="getForeignEntities" + <s:url var="urlName" action="getForeignEntities" namespace="/dbeditor" escapeAmp="false"> <s:param name="entityType" value="%{#meta.typeSimpleName}"/> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp index 71c80eb1..b2cdc33f 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp @@ -21,7 +21,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/embeddedApplication" action="download"/> +<s:url var="downloadUrl" namespace="/embeddedApplication" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp index 08541784..8cd328ff 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp @@ -19,7 +19,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportAtlantos" action="download"/> +<s:url var="downloadUrl" namespace="/exportAtlantos" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp index b38d4d03..7a6f9fda 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp @@ -21,7 +21,7 @@ <title><s:text name="echobase.title.exportCoser"/></title> -<s:url id="getZonesUrl" namespace="/exportCoser" action="getZones"/> +<s:url var="getZonesUrl" namespace="/exportCoser" action="getZones"/> <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp index 1e0c0a9a..ab4b94c9 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp @@ -19,7 +19,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportCoser" action="download"/> +<s:url var="downloadUrl" namespace="/exportCoser" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp index 0010f511..79c2cafc 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp @@ -21,7 +21,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportDb" action="download"/> +<s:url var="downloadUrl" namespace="/exportDb" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp index 5f025d9d..0360c036 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp @@ -42,7 +42,7 @@ </div> </s:if> <s:else> - <s:url id="loadUrl" action="getExportQueryResult" namespace="/exportQuery" + <s:url var="loadUrl" action="getExportQueryResult" namespace="/exportQuery" escapeAmp="false"> <s:param name="queryId" value="%{queryId}"/> </s:url> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp index 9dddb994..8ee3d8f6 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp @@ -76,7 +76,7 @@ </fieldset> <s:form method="post" namespace="/removeData" action="confirmDelete"> - <s:url id="loadUrl" action="getImportLogs" namespace="/removeData" + <s:url var="loadUrl" action="getImportLogs" namespace="/removeData" escapeAmp="false"> <s:param name="entityId" value="%{entityId}"/> </s:url> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp index 63325ede..35695ab1 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp @@ -26,13 +26,13 @@ <title><s:text name="echobase.title.users"/></title> -<s:url id="loadUrl" action="getUsers" namespace="/user" escapeAmp="false"/> +<s:url var="loadUrl" action="getUsers" namespace="/user" escapeAmp="false"/> -<s:url id="addUrl" action="user-Create" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="addUrl" action="user-Create" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="updateUrl" action="user-Update" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="updateUrl" action="user-Update" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="delUrl" action="user-Delete" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="delUrl" action="user-Delete" namespace="/user" escapeAmp="false" method="input"/> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp index 963c214b..dda8b710 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp @@ -212,7 +212,7 @@ <br/> <div id="voyagesTab"> - <s:url id="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> + <s:url var="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" viewrecords="true" @@ -236,7 +236,7 @@ </div> <div id ="mooringsTab"> - <s:url id="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> + <s:url var="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="moorings" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="false" rownumbers="false" viewrecords="true" diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp index 7fe62905..ca0dc73a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp @@ -47,7 +47,7 @@ </script> <title><s:text name="echobase.title.entityModificationLogs"/></title> -<s:url id="loadUrl" action="getEntityModificationLogs" namespace="/workingDb" +<s:url var="loadUrl" action="getEntityModificationLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" diff --git a/echobase-ui/src/main/webapp/WEB-INF/web.xml b/echobase-ui/src/main/webapp/WEB-INF/web.xml index e9ce7218..8f51b728 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/web.xml +++ b/echobase-ui/src/main/webapp/WEB-INF/web.xml @@ -43,7 +43,7 @@ <filter> <filter-name>struts-prepare</filter-name> <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + org.apache.struts2.dispatcher.filter.StrutsPrepareFilter </filter-class> </filter> @@ -55,7 +55,7 @@ <filter> <filter-name>struts-execute</filter-name> <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + org.apache.struts2.dispatcher.filter.StrutsExecuteFilter </filter-class> </filter> diff --git a/pom.xml b/pom.xml index b545b51c..9f8b0aff 100644 --- a/pom.xml +++ b/pom.xml @@ -154,13 +154,13 @@ <nuitonWebVersion>1.20</nuitonWebVersion> <!-- JC 180208 - Do not update Struts 2 - Breaks forms --> - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.5.20</struts2Version> <!-- JC 180214 - Do not update Jquery plugins, breaks startup --> - <jqueryPluginVersion>3.6.1</jqueryPluginVersion> + <jqueryPluginVersion>4.0.3</jqueryPluginVersion> <h2Version>1.3.175</h2Version> <postgresqlVersion>9.4.1211</postgresqlVersion> <slf4jVersion>1.7.25</slf4jVersion> - <coserVersion>1.5.6</coserVersion> + <coserVersion>1.6.1-SNAPSHOT</coserVersion> <!-- /!\ http://bengreen.eu/fancyhtml/quickreference/jettyjsp9error.html --> <jettyPluginVersion>9.1.6.v20160112</jettyPluginVersion> @@ -411,17 +411,6 @@ <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts2Version}</version> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>net.sourceforge.javacsv</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm