This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c571621c3d1ba89f78cb11dc99fccd98d1e277a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 13:06:45 2015 +0200 ajout d'une migration 4.0 pour que la base soit sur la version final 4.0 (refs #7196) --- .../main/java/fr/ird/converter/FloatConverter.java | 2 +- .../java/fr/ird/converter/FloatConverterTest.java | 2 +- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_0.java | 52 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC4.java | 5 --- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 --- .../main/java/fr/ird/type/CoordinateHelper.java | 2 +- .../src/main/resources/db/4.0/empty-H2.sql | 2 + .../src/main/resources/db/4.0/empty-PG.sql | 2 + .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 12 files changed, 64 insertions(+), 17 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/converter/FloatConverter.java b/observe-business/src/main/java/fr/ird/converter/FloatConverter.java index 6b6b779..0ca73a8 100644 --- a/observe-business/src/main/java/fr/ird/converter/FloatConverter.java +++ b/observe-business/src/main/java/fr/ird/converter/FloatConverter.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; * <p/> * It can transform {@code 0.2} and also {@code 0, 2}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 1.3 */ public class FloatConverter implements NuitonConverter { diff --git a/observe-business/src/test/java/fr/ird/converter/FloatConverterTest.java b/observe-business/src/test/java/fr/ird/converter/FloatConverterTest.java index 837148e..c1876c3 100644 --- a/observe-business/src/test/java/fr/ird/converter/FloatConverterTest.java +++ b/observe-business/src/test/java/fr/ird/converter/FloatConverterTest.java @@ -33,7 +33,7 @@ import org.nuiton.converter.ConverterUtil; /** * To test the {@link FloatConverter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 1.3 */ public class FloatConverterTest { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index f5fbe9b..388a070 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -84,10 +84,11 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_RC6 = Versions.valueOf("4.0-RC6"); public static final Version V_4_0_RC7 = Versions.valueOf("4.0-RC7"); + public static final Version V_4_0 = Versions.valueOf("4.0"); /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ - V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7 + V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java new file mode 100644 index 0000000..8b87d86 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java @@ -0,0 +1,52 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.util.List; + +/** + * Created on 6/8/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0 + */ +public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_0(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_0, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + // See https://forge.codelutin.com/issues/7013 + addScript("empty", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + + +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java index 38d8868..f7424d4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java @@ -26,8 +26,6 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -41,9 +39,6 @@ import java.util.List; */ public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrationCallBack { - /** Logger. */ - private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); - public DataSourceMigrationForVersion_4_0_RC4(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_4_0_RC4, callBack, scriptSuffix); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java index 1fad493..eb8b9c7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java @@ -26,8 +26,6 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -41,9 +39,6 @@ import java.util.List; */ public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObserveMigrationCallBack { - /** Logger. */ - private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC7.class); - public DataSourceMigrationForVersion_4_0_RC7(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_4_0_RC7, callBack, scriptSuffix); } diff --git a/observe-entities/src/main/java/fr/ird/type/CoordinateHelper.java b/observe-entities/src/main/java/fr/ird/type/CoordinateHelper.java index 007ea10..5a519ab 100644 --- a/observe-entities/src/main/java/fr/ird/type/CoordinateHelper.java +++ b/observe-entities/src/main/java/fr/ird/type/CoordinateHelper.java @@ -24,7 +24,7 @@ package fr.ird.type; /** * Helper to deal with coordinates. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 1.2 */ public class CoordinateHelper { diff --git a/observe-entities/src/main/resources/db/4.0/empty-H2.sql b/observe-entities/src/main/resources/db/4.0/empty-H2.sql new file mode 100644 index 0000000..9b00240 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0/empty-H2.sql @@ -0,0 +1,2 @@ +-- only to set tms_version to 4.0 +-- no real migration \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0/empty-PG.sql b/observe-entities/src/main/resources/db/4.0/empty-PG.sql new file mode 100644 index 0000000..9b00240 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0/empty-PG.sql @@ -0,0 +1,2 @@ +-- only to set tms_version to 4.0 +-- no real migration \ No newline at end of file diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index bf04153..238a511 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC7 +model.tagvalue.version=4.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 7066601..2296621 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC7 +model.tagvalue.version=4.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 3d66105..f603e53 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC7 +model.tagvalue.version=4.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.