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
-
5208f502
by Pascal CAUQUIL at 2017-06-13T19:25:30+02:00
-
74fe13fd
by Tony CHEMIT at 2017-06-13T19:25:30+02:00
-
545386ec
by Tony CHEMIT at 2017-06-13T19:25:30+02:00
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:
| ... | ... | @@ -21,12 +21,12 @@ |
| 21 | 21 |
*/
|
| 22 | 22 |
package fr.ird.observe.application.swing;
|
| 23 | 23 |
|
| 24 |
-import java.util.Arrays;
|
|
| 25 |
-import java.util.Date;
|
|
| 26 |
-import java.util.TimeZone;
|
|
| 27 | 24 |
import org.apache.commons.logging.Log;
|
| 28 | 25 |
import org.apache.commons.logging.LogFactory;
|
| 29 | 26 |
|
| 27 |
+import java.util.Arrays;
|
|
| 28 |
+import java.util.Date;
|
|
| 29 |
+ |
|
| 30 | 30 |
|
| 31 | 31 |
import static org.nuiton.i18n.I18n.n;
|
| 32 | 32 |
|
| ... | ... | @@ -52,22 +52,6 @@ public class RunObserve extends ObserveRunner { |
| 52 | 52 |
|
| 53 | 53 |
public static void main(String... args) {
|
| 54 | 54 |
|
| 55 |
- String property = System.getProperty("user.timezone");
|
|
| 56 |
- System.setProperty("user.timezone", "UTC");
|
|
| 57 |
- TimeZone timeZone = TimeZone.getDefault();
|
|
| 58 |
- TimeZone.setDefault(null);
|
|
| 59 |
- |
|
| 60 |
- try {
|
|
| 61 |
- Class.forName("org.h2.Driver");
|
|
| 62 |
- } catch (ClassNotFoundException e) {
|
|
| 63 |
- e.printStackTrace();
|
|
| 64 |
- } finally {
|
|
| 65 |
- |
|
| 66 |
- if (property != null) {
|
|
| 67 |
- System.setProperty("user.timezone", property);
|
|
| 68 |
- }
|
|
| 69 |
- TimeZone.setDefault(timeZone);
|
|
| 70 |
- }
|
|
| 71 | 55 |
log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args));
|
| 72 | 56 |
|
| 73 | 57 |
new RunObserve(args).launch();
|
| ... | ... | @@ -1295,7 +1295,7 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMo |
| 1295 | 1295 |
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.
|
| 1296 | 1296 |
observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante
|
| 1297 | 1297 |
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.
|
| 1298 |
-observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant
|
|
| 1298 |
+observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel d'un serveur distant
|
|
| 1299 | 1299 |
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.
|
| 1300 | 1300 |
observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale
|
| 1301 | 1301 |
observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2
|
| ... | ... | @@ -47,7 +47,6 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { |
| 47 | 47 |
hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10");
|
| 48 | 48 |
hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false");
|
| 49 | 49 |
hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true");
|
| 50 |
-// hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC");
|
|
| 51 | 50 |
|
| 52 | 51 |
// hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider");
|
| 53 | 52 |
// hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500");
|
| ... | ... | @@ -69,7 +69,7 @@ public class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> |
| 69 | 69 |
|
| 70 | 70 |
public DateAdapter() {
|
| 71 | 71 |
this.iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
|
| 72 |
- this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC"));
|
|
| 72 |
+// this.iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC"));
|
|
| 73 | 73 |
}
|
| 74 | 74 |
|
| 75 | 75 |
// These methods need to be synchronized since JDK DateFormat classes are not thread-safe
|