Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java
    1 1 
     package fr.ird.observe;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Entities
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import java.io.IOException;
    4 26 
     import java.nio.file.Files;
    5 27 
     import java.nio.file.Path;

  • services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java
    ... ... @@ -58,7 +58,7 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf
    58 58 
         }
    59 59
    60 60 
         public File getDatabaseFile() {
    61 
    -        return new File(directory, dbName + ".h2.db");
    61 
    +        return new File(directory, dbName + ".mv.db");
    62 62 
         }
    63 63
    64 64 
         public File getLockFile() {

  • services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java
    ... ... @@ -117,7 +117,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest {
    117 117
    118 118 
             File databasesRootDirectory = topiaTestMethodResource.getDataSourceConfiguration().getDatabaseFile();
    119 119
    120 
    -        while (!"observe".equals(databasesRootDirectory.getName())) {
    120 
    +        while (!"ird-observe".equals(databasesRootDirectory.getName())) {
    121 121 
                 databasesRootDirectory = databasesRootDirectory.getParentFile();
    122 122 
             }
    123 123

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.