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/9e560d0d5e0930082e74e8242c7... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9e560d0d5e0930082e74e8242c7... You're receiving this email because of your account on gitlab.com.