June 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch release/5.4
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed new branch release/5.4 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/5.4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 4 commits: Correction pb timeZone sur couche http (See #769)"
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 046c05fb by Tony CHEMIT at 2017-06-13T19:25:19+02:00 Correction pb timeZone sur couche http (See #769)" - - - - - 5208f502 by Pascal CAUQUIL at 2017-06-13T19:25:30+02:00 Correction d'un libellé - - - - - 74fe13fd by Tony CHEMIT at 2017-06-13T19:25:30+02:00 Revert "Essaie de correction des problèmes de timezone (see #769)" This reverts commit 68463971a5e4ed99e617c7a6223c6b5761b36c0a. - - - - - 545386ec by Tony CHEMIT at 2017-06-13T19:25:30+02:00 Revert "Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates selon le calendrier grégorien (See #769)" This reverts commit ecc6002a1f44db6082a4421d2b8e5a18adb083d4. - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java - services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,12 +21,12 @@ */ package fr.ird.observe.application.swing; -import java.util.Arrays; -import java.util.Date; -import java.util.TimeZone; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Arrays; +import java.util.Date; + import static org.nuiton.i18n.I18n.n; @@ -52,22 +52,6 @@ public class RunObserve extends ObserveRunner { public static void main(String... args) { - String property = System.getProperty("user.timezone"); - System.setProperty("user.timezone", "UTC"); - TimeZone timeZone = TimeZone.getDefault(); - TimeZone.setDefault(null); - - try { - Class.forName("org.h2.Driver"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } finally { - - if (property != null) { - System.setProperty("user.timezone", property); - } - TimeZone.setDefault(timeZone); - } log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args)); new RunObserve(args).launch(); ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1295,7 +1295,7 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMo observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel d'un serveur distant observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2 ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -47,7 +47,6 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10"); hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false"); hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true"); -// hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java ===================================== --- a/services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java @@ -69,7 +69,7 @@ public class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> public DateAdapter() { this.iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC")); +// this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC")); } // These methods need to be synchronized since JDK DateFormat classes are not thread-safe View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9e560d0d5e0930082e74e8242c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9e560d0d5e0930082e74e8242c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: Revert "Essaie de correction des problèmes de timezone (see #769)"
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: c13966b9 by Tony CHEMIT at 2017-06-13T19:24:20+02:00 Revert "Essaie de correction des problèmes de timezone (see #769)" This reverts commit 68463971a5e4ed99e617c7a6223c6b5761b36c0a. - - - - - 9e560d0d by Tony CHEMIT at 2017-06-13T19:24:20+02:00 Revert "Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates selon le calendrier grégorien (See #769)" This reverts commit ecc6002a1f44db6082a4421d2b8e5a18adb083d4. - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,12 +21,12 @@ */ package fr.ird.observe.application.swing; -import java.util.Arrays; -import java.util.Date; -import java.util.TimeZone; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Arrays; +import java.util.Date; + import static org.nuiton.i18n.I18n.n; @@ -52,22 +52,6 @@ public class RunObserve extends ObserveRunner { public static void main(String... args) { - String property = System.getProperty("user.timezone"); - System.setProperty("user.timezone", "UTC"); - TimeZone timeZone = TimeZone.getDefault(); - TimeZone.setDefault(null); - - try { - Class.forName("org.h2.Driver"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } finally { - - if (property != null) { - System.setProperty("user.timezone", property); - } - TimeZone.setDefault(timeZone); - } log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args)); new RunObserve(args).launch(); ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -47,7 +47,6 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10"); hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false"); hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true"); -// hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/405cdf49582f5c7fbacc962075… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/405cdf49582f5c7fbacc962075… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Correction d'un libellé
by Pascal Cauquil June 13, 2017

June 13, 2017

Pascal Cauquil pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 405cdf49 by Pascal CAUQUIL at 2017-06-13T19:14:58+02:00 Correction d'un libellé - - - - - 1 changed file: - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1295,7 +1295,7 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMo observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel d'un serveur distant observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/405cdf49582f5c7fbacc962075f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/405cdf49582f5c7fbacc962075f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] correction pb timeZone sur couche http
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 67116021 by Tony CHEMIT at 2017-06-13T19:00:31+02:00 correction pb timeZone sur couche http - - - - - 1 changed file: - services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java Changes: ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java ===================================== --- a/services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java @@ -69,7 +69,7 @@ public class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> public DateAdapter() { this.iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC")); +// this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC")); } // These methods need to be synchronized since JDK DateFormat classes are not thread-safe View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67116021d853fe1c99df31a5cff… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67116021d853fe1c99df31a5cff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Essaie de correction des problèmes de timezone (see #769)
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 68463971 by Tony CHEMIT at 2017-06-13T11:17:01-04:00 Essaie de correction des problèmes de timezone (see #769) - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,11 +21,11 @@ */ package fr.ird.observe.application.swing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Arrays; import java.util.Date; +import java.util.TimeZone; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; @@ -52,6 +52,22 @@ public class RunObserve extends ObserveRunner { public static void main(String... args) { + String property = System.getProperty("user.timezone"); + System.setProperty("user.timezone", "UTC"); + TimeZone timeZone = TimeZone.getDefault(); + TimeZone.setDefault(null); + + try { + Class.forName("org.h2.Driver"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } finally { + + if (property != null) { + System.setProperty("user.timezone", property); + } + TimeZone.setDefault(timeZone); + } log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args)); new RunObserve(args).launch(); ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -47,7 +47,7 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10"); hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false"); hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true"); - hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); +// hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/68463971a5e4ed99e617c7a6223… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/68463971a5e4ed99e617c7a6223… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: Set charset when possible (See #729)
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: c6fc9e22 by Tony CHEMIT at 2017-06-13T12:36:45+02:00 Set charset when possible (See #729) - - - - - 782aabb9 by Tony CHEMIT at 2017-06-13T13:06:49+02:00 Amélioration des libellés espagnols (See #775) - - - - - 10 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java - application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java - services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -109,7 +109,7 @@ observe.type.maturityStatuses=Maturidades observe.type.mitigationType=Tipo de medida de atenuación observe.type.mitigationTypes=Tipos de medida de atenuación observe.type.nonTargetCatch=Fauna accesoria conservada o descartada -observe.type.nonTargetCatches=Faunas accesorias conservadas o descartadas +observe.type.nonTargetCatches=Fauna accesoria conservada o descartada observe.type.nonTargetLength=Longitud (cm inf.) observe.type.nonTargetLengths=Longitudes (cm inf.) observe.type.nonTargetSample=Muestreo de fauna accesoria @@ -119,8 +119,8 @@ observe.type.objectFates=Futuros del objeto observe.type.objectObservedSpecies=Fauna observada observe.type.objectOperation=Operación sobre el objeto observe.type.objectOperations=Operaciones sobre el objeto -observe.type.objectSchoolEstimate=Estimación banco de objetos -observe.type.objectSchoolEstimates=Estimaciones banco de objetos +observe.type.objectSchoolEstimate=Estimación del banco +observe.type.objectSchoolEstimates=Estimaciones del banco observe.type.objectType=Tipo de objeto observe.type.objectTypes=Tipos de objeto observe.type.observedSystem=Sistema observado ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -66,11 +66,11 @@ observe.common.gearUseFeaturesSeine=Equipamiento observe.common.gonadeWeight=Peso de las gonadas (g) observe.common.haulingBreaks=Número de cortes observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitude +observe.common.haulingEndLatitude=Arrastre Latitud observe.common.haulingEndLongitude=Arrastre Longitud observe.common.haulingEndQuadrant=Arrastre quadrant observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitude +observe.common.haulingStartLatitude=Arrastre Latitud observe.common.haulingStartLongitude=Arrastre Longitud observe.common.haulingStartQuadrant=Arrastre quadrant observe.common.haulingStartTimeStamp=Timestamp del inicio @@ -141,13 +141,13 @@ observe.common.sensorBrand=Marca de sensor observe.common.sensorDataFormat=Formato de los datos del sensor observe.common.sensorSerialNo=Número de serie observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada latitude +observe.common.settingEndLatitude=Calada latitud observe.common.settingEndLongitude=Calada longitud observe.common.settingEndQuadrant=Calada quadrant observe.common.settingEndTimeStamp=Timestamp de fin observe.common.settingIdentifier=Calada observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada latitude +observe.common.settingStartLatitude=Calada latitud observe.common.settingStartLongitude=Calada longitud observe.common.settingStartQuadrant=Calada quadrant observe.common.settingStartTimeStamp=Timestamp de inicio @@ -166,7 +166,7 @@ observe.common.startLogValue=Corredera de mañana (millas) observe.common.startTime=Fecha - Heuro de inicio de validez observe.common.status=Estado observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del supply +observe.common.supportVesselName=Nombre del Macicero observe.common.surroundingActivity=Actividad circundante observe.common.swivelWeight=Peso de el destorcedor (kg) observe.common.targetCatch=Captura de atún ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -27,6 +27,9 @@ import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.Date; + +import static org.nuiton.i18n.I18n.n; + /** * Pour lancer le client swing {@code ObServe} en mode administrateur. * @@ -54,4 +57,9 @@ public class RunObserve extends ObserveRunner { new RunObserve(args).launch(); } + static { + //TODO Apply this modification in jaxx project + n("jaxx.common.latitude"); + } + } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationDataSourcesManage import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; +import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -231,7 +232,7 @@ public class BackupsManager implements Closeable { private void storeBackups() throws IOException { log.info(String.format("Store %d backups to %s", backups.size(), storePath)); - try (BufferedWriter writer = Files.newBufferedWriter(storePath)) { + try (BufferedWriter writer = Files.newBufferedWriter(storePath, StandardCharsets.UTF_8)) { new Gson().toJson(backups, writer); } } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1,4 +1,5 @@ aboutframe.changelog=Changelog +jaxx.common.latitude=Latitude observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/>Application de saisie des données observateurs et de consultation de telles données depuis une base Obstuna. Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code\=2008.11">project spirale</a>.Il a été réalisé par la société <a href\="http\://codelutin.com">Code Lutin</a> en 2009. <hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://observe.codelutin.com">site du projet</a>. observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/> <ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire i18n</li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: |</li><li>encoding UTF-8</li><li>texte encapsulé par des "</li></ul></li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul> Vos modifications seront prises en compte avant la prochaine version. observe.about.translate.title=translate ObServe ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1,4 +1,5 @@ aboutframe.changelog=Changelog +jaxx.common.latitude=Latitud observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base Obstuna. Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code\=2008.11">project spirale</a>.Realizado por la sociedad <a href\="http\://codelutin.com">Code Lutin</a> en 2009. <hr/>Para mas información puede visitar el <a href\="http\://observe.codelutin.com">sitio web del proyecto</a>. observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/> <ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire i18n</li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: |</li><li>encoding UTF-8</li><li>texte encapsulé par des "</li></ul></li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul> Vos modifications seront prises en compte avant la prochaine version. observe.about.translate.title=Traducir ObServe @@ -490,7 +491,7 @@ observe.common.startLogValue=Corredera de mañana (millas) observe.common.status=Estado observe.common.step.description=Descripción de la etapa observe.common.storage.not.valid=Fuente de datos no configurada -observe.common.supportVesselName=Nombre del supply +observe.common.supportVesselName=Nombre del Macicero observe.common.surroundingActivity=Actividad circundante observe.common.taille=Talla (cm) observe.common.taillePoids.caracteristics=Características Talla-Peso @@ -1139,7 +1140,7 @@ observe.content.setSeine.schoolType.not.fill=vacío observe.content.setSeine.sonarUsed=Utilización del sonar durante el lance observe.content.setSeine.sonarUsedAvantSet=Utilización del sonar antes del lance observe.content.setSeine.startTime=Fecha - Hora comienzo lance -observe.content.setSeine.supportVesselName=Nombre Macicero +observe.content.setSeine.supportVesselName=Nombre de Macicero observe.content.setSeine.tab.general=Características generales observe.content.setSeine.tab.measurements=Parámetros observe.content.setSeine.targetDiscarded=Descarte de atún @@ -1523,7 +1524,7 @@ observe.storage.action.apply.tip=Utilizar la fuente de datos configuarada observe.storage.action.canMigrate=Actualización de la base (versión actual %1$s) observe.storage.action.cancel=Cancelar el cambio de la fuente de datos observe.storage.action.cancel.tip=Cancelar el cambio de la fuente de datos -observe.storage.activityLongline.coordinate=Coordenadas +observe.storage.activityLongline.coordinate=Coordenada observe.storage.activityLongline.fpaZone=Zona FPA observe.storage.activityLongline.message.active.found=Actividad abierta observe.storage.activityLongline.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1,4 +1,5 @@ aboutframe.changelog=Historique +jaxx.common.latitude=Latitude observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/>Application de saisie des données observateurs et de consultation de telles données depuis une base Obstuna. Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code\=2008.11">project spirale</a>.Il a été réalisé par la société <a href\="http\://codelutin.com">Code Lutin</a> en 2009. <hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://observe.codelutin.com">site du projet</a>. observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/> <ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire i18n</li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: |</li><li>encoding UTF-8</li><li>texte encapsulé par des "</li></ul></li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul> Vos modifications seront prises en compte avant la prochaine version. observe.about.translate.title=Traduire ObServe ===================================== application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java ===================================== --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java @@ -32,17 +32,17 @@ import fr.ird.observe.application.web.configuration.db.impl.ObserveWebDatabaseBe import fr.ird.observe.application.web.configuration.db.impl.ObserveWebDatabaseRoleBean; import fr.ird.observe.application.web.configuration.db.impl.ObserveWebDatabasesBean; import fr.ird.observe.application.web.configuration.db.impl.ObserveWebDatabasesImmutable; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.BufferedWriter; import java.io.File; import java.io.Reader; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Created on 30/08/15. @@ -164,7 +164,7 @@ public class ObserveWebDatabasesHelper { log.info("Store databases to " + file); } - try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) { + try (BufferedWriter writer = Files.newWriter(file, StandardCharsets.UTF_8)) { store(databases, writer); ===================================== application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java ===================================== --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java @@ -35,18 +35,18 @@ import fr.ird.observe.application.web.configuration.user.impl.ObserveWebUserBean import fr.ird.observe.application.web.configuration.user.impl.ObserveWebUserPermissionBean; import fr.ird.observe.application.web.configuration.user.impl.ObserveWebUsersBean; import fr.ird.observe.application.web.configuration.user.impl.ObserveWebUsersImmutable; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.BufferedWriter; import java.io.File; import java.io.Reader; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Created on 30/08/15. @@ -158,7 +158,7 @@ public class ObserveWebUsersHelper { log.info("Store users to " + file); } - try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) { + try (BufferedWriter writer = Files.newWriter(file, StandardCharsets.UTF_8)) { store(users, writer); @@ -170,7 +170,6 @@ public class ObserveWebUsersHelper { public void store(ObserveWebUsers users, Writer writer) throws YamlException { - YamlWriter yamlWriter = new YamlWriter(writer, createConfig()); if (users instanceof ObserveWebUsersImmutable) { ===================================== services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties ===================================== --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -159,7 +159,7 @@ observe.common.startLogValue=Corredera de mañana (millas) observe.common.startTime=Fecha - Heuro de inicio de validez observe.common.status=Estado observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del supply +observe.common.supportVesselName=Nombre del Macicero observe.common.surroundingActivity=Actividad circundante observe.common.swivelWeight=Peso de el destorcedor (kg) observe.common.targetCatch=Captura de atún View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/857afc9ad536f878b98fff2f71… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/857afc9ad536f878b98fff2f71… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Set charset when creating a delete script (See #729)
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 857afc9a by Tony CHEMIT at 2017-06-13T12:10:46+02:00 Set charset when creating a delete script (See #729) - - - - - 1 changed file: - services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java @@ -31,7 +31,14 @@ import fr.ird.observe.services.service.AddSqlScriptProducerResult; import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.zip.GZIPOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.service.sql.batch.SqlRequests; @@ -40,13 +47,6 @@ import org.nuiton.topia.service.sql.batch.TopiaSqlBatchService; import org.nuiton.topia.service.sql.batch.actions.BlobsContainer; import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.zip.GZIPOutputStream; import static fr.ird.observe.entities.Entities.IS_LONGLINE_ID; import static fr.ird.observe.entities.Entities.IS_SEINE_ID; @@ -98,7 +98,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { - try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out))) { + try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out), StandardCharsets.UTF_8)) { TopiaSqlBatchService sqlBatchService = serviceContext.getTopiaApplicationContext().getSqlBatchService(); SqlRequests.Builder builder = sqlBatchService.requestBuilder().to(writer); @@ -115,7 +115,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } } - protected SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) { + private SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) { boolean h2 = request.isH2(); @@ -193,7 +193,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement return builder.build(); } - protected SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) { + private SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) { ObserveTopiaApplicationContext topiaApplicationContext = serviceContext.getTopiaApplicationContext(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/857afc9ad536f878b98fff2f713… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/857afc9ad536f878b98fff2f713… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Set charset when creating a dump (See #729)
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 62644877 by Tony CHEMIT at 2017-06-13T12:05:26+02:00 Set charset when creating a dump (See #729) - - - - - 1 changed file: - services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java @@ -31,6 +31,7 @@ import fr.ird.observe.services.service.AddSqlScriptProducerResult; import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; +import java.nio.charset.StandardCharsets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.service.sql.batch.SqlRequests; @@ -67,7 +68,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { ImmutableSet.Builder<ObserveBlobsContainer> observeBlobContainers = ImmutableSet.builder(); - try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out))) { + try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out), StandardCharsets.UTF_8)) { TopiaSqlBatchService sqlBatchService = serviceContext.getTopiaApplicationContext().getSqlBatchService(); SqlRequests.Builder builder = sqlBatchService.requestBuilder().to(writer); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6264487766df9e2a84821b25ef2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6264487766df9e2a84821b25ef2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Add charset option to h2 restore sql command (See #729)
by Tony CHEMIT June 13, 2017

June 13, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 005c946b by Tony CHEMIT at 2017-06-13T11:24:54+02:00 Add charset option to h2 restore sql command (See #729) - - - - - 1 changed file: - entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java Changes: ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -24,8 +24,24 @@ package fr.ird.observe; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.entities.migration.ObserveMigrationEngine; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.EnumSet; +import java.util.LinkedHashSet; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.zip.GZIPInputStream; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; @@ -43,17 +59,6 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTablesFactory; import org.nuiton.util.StringUtil; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.EnumSet; -import java.util.LinkedHashSet; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; - public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicationContext implements TopiaMetadataModelSupport { /** @@ -61,9 +66,9 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat */ private static final Log log = LogFactory.getLog(ObserveTopiaApplicationContext.class); - public static final String MIGRATION_SERVICE_NAME = "migration"; + static final String MIGRATION_SERVICE_NAME = "migration"; - public static final String SQL_BATCH_SERVICE_NAME = "sqlBatch"; + static final String SQL_BATCH_SERVICE_NAME = "sqlBatch"; private static final String CREATE_SCHEMA_SCRIPT = "CREATE SCHEMA OBSERVE_COMMON;\n" @@ -78,19 +83,17 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat protected boolean open; protected final String authenticationToken; - protected final TopiaMetadataModelSupport topiaMetadataModelSupport; - protected final TopiaSqlTablesFactory topiaSqlTablesFactory; - protected final ObserveMigrationConfigurationProvider observeMigrationConfigurationProvider; - protected TopiaSqlTables tripSeineTables; - protected TopiaSqlTables tripLonglineTables; - protected TopiaSqlTables referentialTables; + private final TopiaMetadataModelSupport topiaMetadataModelSupport; + private final TopiaSqlTablesFactory topiaSqlTablesFactory; + private TopiaSqlTables tripSeineTables; + private TopiaSqlTables tripLonglineTables; + private TopiaSqlTables referentialTables; public ObserveTopiaApplicationContext(ObserveTopiaConfiguration topiaConfiguration) { super(topiaConfiguration); this.authenticationToken = UUID.randomUUID().toString(); this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe", "Observe"); this.topiaSqlTablesFactory = new TopiaSqlTablesFactory(getMetadataModel(), this); - this.observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get(); } @Override @@ -146,8 +149,8 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat try (ObserveTopiaPersistenceContext topiaPersistenceContext = newPersistenceContext()) { String sql = Stream.concat(Entities.REFERENCE_ENTITIES_LIST.stream(), Entities.DATA_ENTITIES_LIST.stream()) - .map(entity -> String.format(INSERT_LAST_UPDATE_PATTERN, entity.ordinal(), entity.getContract().getCanonicalName())) - .collect(Collectors.joining("\n")); + .map(entity -> String.format(INSERT_LAST_UPDATE_PATTERN, entity.ordinal(), entity.getContract().getCanonicalName())) + .collect(Collectors.joining("\n")); topiaPersistenceContext.getSqlSupport().executeSql(sql); topiaPersistenceContext.commit(); @@ -170,7 +173,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat } - protected void executeSqlStatements0(byte... content) throws IOException { + private void executeSqlStatements0(byte... content) throws IOException { if (getConfiguration().isH2Configuration()) { @@ -178,7 +181,32 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat log.info(String.format("Restore script size: %s to h2 from file : %s", StringUtil.convertMemory(content.length), tempFile.toString())); try { Files.write(tempFile, content); - JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration); + JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration) { + @Override + public void restore(File file) throws FileNotFoundException { + String options = ""; + InputStream in = null; + try { + in = new BufferedInputStream(new FileInputStream(file)); + in.mark(2); + // read header to see if is compressed file + int b = in.read(); + // redundant cast : int magic = ((int) in.read() << 8) | b; + int magic = in.read() << 8 | b; + in.reset(); + if (magic == GZIPInputStream.GZIP_MAGIC) { + options += " COMPRESSION GZIP"; + } + in.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + IOUtils.closeQuietly(in); + } + options += " CHARSET 'UTF8'"; + runUpdate("RUNSCRIPT FROM '" + file.getAbsolutePath() + "'" + options); + } + }; jdbcH2Helper.restore(tempFile.toFile()); } finally { Files.delete(tempFile); @@ -462,8 +490,8 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat private static class TripReplicateTablesPredicate implements TopiaSqlTablesFactory.TopiaSqlTablesPredicate { - protected final Set<TopiaMetadataEntity> dones = new LinkedHashSet<>(); - protected final Set<String> sectionsHolders = ImmutableSet.of( + final Set<TopiaMetadataEntity> dones = new LinkedHashSet<>(); + final Set<String> sectionsHolders = ImmutableSet.of( ObserveEntityEnum.CatchLongline.name(), ObserveEntityEnum.Tdr.name() ); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/005c946b96e9373eece221e2ed5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/005c946b96e9373eece221e2ed5… You're receiving this email because of your account on gitlab.com.

1 0