This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c44d26f754fc65bd8774466ea7fbf5572ff1ae75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 21:04:09 2016 +0200 Migraion 4.905 pour supprimer les contraintes de nullité sur l'identifiant filage (See #7543) --- .../ObserveMigrationConfigurationProviderImpl.java | 1 + .../DataSourceMigrationForVersion_4_905.java | 49 +++++++++++++++++++++ ...p_not_null_constraint_hauling_identifier-H2.sql | 24 ++++++++++ ...p_not_null_constraint_hauling_identifier-PG.sql | 24 ++++++++++ entities/src/main/xmi/observe-longline.properties | 5 --- pom.xml | 2 +- .../ird/observe/test/ObserveTestConfiguration.java | 1 + .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 0 -> 1622096 bytes .../resources/db/4.905/dataForTestSeine.sql.gz | Bin 0 -> 451016 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441248 bytes test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 0 -> 6006 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 0 -> 6004 bytes .../src/main/resources/db/4.905/referentiel.sql.gz | Bin 0 -> 140214 bytes test/src/main/resources/observetest.properties | 1 + 14 files changed, 101 insertions(+), 6 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java index 755c3e0..ae2e18d 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java @@ -65,6 +65,7 @@ public final class ObserveMigrationConfigurationProviderImpl extends ObserveMigr V_4_902("4.902"), V_4_903("4.903"), V_4_904("4.904"), + V_4_905("4.905"), // FIXME A utiliser en version final 5.0 V_5_0("5.0", false); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java new file mode 100644 index 0000000..cb048b7 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java @@ -0,0 +1,49 @@ +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.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 02/09/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSourceMigrationForVersion_4_905 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_905(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_905.getVersion(), callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + addScript("01", "drop_not_null_constraint_hauling_identifier", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql new file mode 100644 index 0000000..d5e9401 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql @@ -0,0 +1,24 @@ +--- +-- #%L +-- ObServe :: Entities Migration +-- %% +-- Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE OBSERVE_LONGLINE.SECTION ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BASKET ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ALTER COLUMN haulingIdentifier DROP NOT NULL; diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql new file mode 100644 index 0000000..d5e9401 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql @@ -0,0 +1,24 @@ +--- +-- #%L +-- ObServe :: Entities Migration +-- %% +-- Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE OBSERVE_LONGLINE.SECTION ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BASKET ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ALTER COLUMN haulingIdentifier DROP NOT NULL; diff --git a/entities/src/main/xmi/observe-longline.properties b/entities/src/main/xmi/observe-longline.properties index 069e1d0..3a7d693 100644 --- a/entities/src/main/xmi/observe-longline.properties +++ b/entities/src/main/xmi/observe-longline.properties @@ -155,12 +155,7 @@ fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeatur ############################################################################### fr.ird.observe.entities.longline.Section.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Section.attribute.haulingIdentifier.tagValue.notNull=true - fr.ird.observe.entities.longline.Basket.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Basket.attribute.haulingIdentifier.tagValue.notNull=true - fr.ird.observe.entities.longline.Branchline.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Branchline.attribute.haulingIdentifier.tagValue.notNull=true fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.notNull=true diff --git a/pom.xml b/pom.xml index a3020af..b70b217 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.904</observe.model.version> + <observe.model.version>4.905</observe.model.version> <jrstPluginVersion>2.1</jrstPluginVersion> diff --git a/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java b/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java index 7bea41b..37e9e70 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java @@ -49,6 +49,7 @@ public class ObserveTestConfiguration { public static final String MODEL_VERSION = "observetest.model.version"; public static final String PREVIOUS_VERSION = "observetest.previous.model.version"; public static final String FIRST_VERSION = "observetest.first.model.version"; + public static final String FIRST_VERSION_FOR_REF_SYNCHRO = "observetest.first.model.for.ref.synchro.version"; public static final String H2_LOGIN = "observetest.h2.login"; public static final String H2_PASSWORD = "observetest.h2.password"; public static final String WEB_LOGIN = "observetest.web.login"; diff --git a/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz b/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz new file mode 100644 index 0000000..f9aa86d Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz b/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz new file mode 100644 index 0000000..38bd854 Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz b/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz new file mode 100644 index 0000000..147c747 Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz differ diff --git a/test/src/main/resources/db/4.905/empty_h2.sql.gz b/test/src/main/resources/db/4.905/empty_h2.sql.gz new file mode 100644 index 0000000..d4bbe0a Binary files /dev/null and b/test/src/main/resources/db/4.905/empty_h2.sql.gz differ diff --git a/test/src/main/resources/db/4.905/empty_pg.sql.gz b/test/src/main/resources/db/4.905/empty_pg.sql.gz new file mode 100644 index 0000000..5ac96a5 Binary files /dev/null and b/test/src/main/resources/db/4.905/empty_pg.sql.gz differ diff --git a/test/src/main/resources/db/4.905/referentiel.sql.gz b/test/src/main/resources/db/4.905/referentiel.sql.gz new file mode 100644 index 0000000..3fa51e2 Binary files /dev/null and b/test/src/main/resources/db/4.905/referentiel.sql.gz differ diff --git a/test/src/main/resources/observetest.properties b/test/src/main/resources/observetest.properties index 9674539..0da7256 100644 --- a/test/src/main/resources/observetest.properties +++ b/test/src/main/resources/observetest.properties @@ -24,6 +24,7 @@ observetest.build.version=${project.version} observetest.model.version=${observe.model.version} observetest.previous.model.version=4.0.1 observetest.first.model.version=4.0.1 +observetest.first.model.for.ref.synchro.version=4.903 observetest.h2.login=sa observetest.h2.password=sa observetest.web.url=http://localhost:8080/observeweb/api/v1 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f7cc7b94ff40645750888af89a47760752dd4bd3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 21:17:45 2016 +0200 Need to be able to auto-migrate some databases (such as test one) --- .../ObserveDataSourceConfiguration.java | 5 +++++ .../ObserveDataSourceConfigurationRest.java | 18 ++++++++++------ .../ObserveDataSourceConfigurationTopiaH2.java | 25 +++++++++++----------- .../ObserveDataSourceConfigurationTopiaPG.java | 17 ++++++++------- ...ObserveDataSourceConfigurationTopiaSupport.java | 17 ++++++++------- .../topia/service/DataSourceServiceTopia.java | 2 +- 6 files changed, 49 insertions(+), 35 deletions(-) diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java index 61b4f19..4e81948 100644 --- a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java +++ b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java @@ -41,4 +41,9 @@ public interface ObserveDataSourceConfiguration extends Serializable, Cloneable ObserveDataSourceConfiguration clone() throws CloneNotSupportedException; + /** + * @return {@code true} si on peut faire une migration automatique. + */ + boolean isAutoMigrate(); + } diff --git a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java index 10df799..5bc22c2 100644 --- a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java @@ -42,32 +42,32 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf /** * Le libellé de la source de données. */ - protected String label; + private String label; /** * L'url du serveur à utiliser. */ - protected URL serverUrl; + private URL serverUrl; /** * Le login de l'utilisateur. */ - protected String login; + private String login; /** * Le mot de passe de l'utilisateur. */ - protected char[] password; + private char[] password; /** * Un nom optionel de base à utiliser, si rien n'est préciser, on utilisera la base par défaut du serveur. */ - protected String optionalDatabaseName; + private String optionalDatabaseName; /** * La version de la base demmandé */ - protected Version modelVersion; + private Version modelVersion; @Override @@ -135,6 +135,12 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf } @Override + public boolean isAutoMigrate() { + // on ne peut jamais migrer sur un serveur + return false; + } + + @Override public String toString() { return MoreObjects.toStringHelper(this) .add("label", label) diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java index 68f64f6..1ff7a52 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.configuration; import com.google.common.base.MoreObjects; import java.io.File; +import java.util.Arrays; import java.util.Objects; /** @@ -32,19 +33,19 @@ import java.util.Objects; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConfigurationTopiaSupport { +public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConfigurationTopiaSupport { private static final long serialVersionUID = 1L; /** * Le répertoire où se trouve la base (le nom de la base est {@code obstuna}). */ - protected File directory; + private File directory; /** * Le nom de la base à ouvrir. */ - protected String dbName; + private String dbName; @Override public boolean isH2Database() { @@ -86,24 +87,24 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf if (!(o instanceof ObserveDataSourceConfigurationTopiaH2)) return false; ObserveDataSourceConfigurationTopiaH2 that = (ObserveDataSourceConfigurationTopiaH2) o; return Objects.equals(directory, that.directory) && - Objects.equals(dbName, that.dbName) && - Objects.equals(username, that.username) && - Objects.equals(password, that.password); + Objects.equals(dbName, that.dbName) && + Objects.equals(getUsername(), that.getUsername()) && + Arrays.equals(getPassword(), that.getPassword()); } @Override public int hashCode() { - return Objects.hash(directory, dbName, username, password); + return Objects.hash(directory, dbName, getUsername(), getPassword()); } @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("directory", directory) - .add("dbName", dbName) - .add("username", username) - .add("password", "***") - .toString(); + .add("directory", directory) + .add("dbName", dbName) + .add("username", getUsername()) + .add("password", "***") + .toString(); } @Override diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java index cd3b412..645cd3c 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.configuration; import com.google.common.base.MoreObjects; +import java.util.Arrays; import java.util.Objects; /** @@ -38,12 +39,12 @@ public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConf /** * L'url jdbc de la source. */ - protected String jdbcUrl; + private String jdbcUrl; /** * Est-ce que l'on doit utiliser une connexion ssl ? */ - protected boolean useSsl; + private boolean useSsl; @Override public boolean isH2Database() { @@ -76,23 +77,23 @@ public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConf if (this == o) return true; if (!(o instanceof ObserveDataSourceConfigurationTopiaPG)) return false; ObserveDataSourceConfigurationTopiaPG that = (ObserveDataSourceConfigurationTopiaPG) o; - return Objects.equals(label, that.label) && + return Objects.equals(getLabel(), that.getLabel()) && Objects.equals(jdbcUrl, that.jdbcUrl) && - Objects.equals(username, that.username) && - Objects.equals(password, that.password); + Objects.equals(getUsername(), that.getUsername()) && + Arrays.equals(getPassword(), that.getPassword()); } @Override public int hashCode() { - return Objects.hash(label, jdbcUrl, username, password); + return Objects.hash(getLabel(), jdbcUrl, getUsername(), getPassword()); } @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("label", label) + .add("label", getLabel()) .add("jdbcUrl", jdbcUrl) - .add("username", username) + .add("username", getUsername()) .add("password", "***") .add("useSsl", useSsl) .toString(); diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java index 62965ff..ef2ff3f 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java @@ -36,39 +36,39 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse /** * Le nom de la data source. */ - protected String label; + private String label; /** * L'utilisateur pour se connecter à la source. */ - protected String username; + private String username; /** * Le mot de passe pour se connecter à la source. */ - protected char[] password; + private char[] password; //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que la base doit être migrée à son ouverture? */ - protected boolean canMigrate; + private boolean canMigrate; //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que l'on peut voir la progression lors d'une migration ? */ - protected boolean showMigrationProgression; + private boolean showMigrationProgression; //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que l'on peut voir le script sql de migration à appliquer ? */ - protected boolean showMigrationSql; + private boolean showMigrationSql; - protected boolean autoMigrate; + private boolean autoMigrate; - protected Version modelVersion; + private Version modelVersion; public abstract boolean isH2Database(); @@ -123,6 +123,7 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse this.showMigrationSql = showMigrationSql; } + @Override public boolean isAutoMigrate() { return autoMigrate; } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index d37c6ee..8335c55 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -396,7 +396,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS Version dbVersion = dataSourceInformation.getVersion(); Version requestVersion = dataSourceConfiguration.getModelVersion(); - if (!dbVersion.equals(requestVersion)) { + if (!dataSourceConfiguration.isAutoMigrate() && !dbVersion.equals(requestVersion)) { String message = l(getApplicationLocale(), "observe.services.topia.error.database.badModelVersion", requestVersion, dbVersion); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2ef3dab12f32b08ef890810011764f38a336b4a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 22:04:51 2016 +0200 Clean some code, remove unused --- application-swing/pom.xml | 2 +- .../application/swing/ObserveActionExecutor.java | 59 +++------------------- .../observe/application/swing/ObserveCLAction.java | 3 -- .../observe/application/swing/ObserveRunner.java | 11 ---- .../swing/ObserveSwingApplicationContext.java | 37 +++++++------- .../swing/ObserveSwingBinderService.java | 50 ------------------ .../{ObserveAdminCLI.java => RunObserve.java} | 11 ++-- .../ui/content/table/ContentTableUIModel.java | 8 +-- .../table/impl/longline/CatchLonglineUIModel.java | 5 +- 9 files changed, 36 insertions(+), 150 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index f69f5be..26f20cb 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -55,7 +55,7 @@ <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <!-- main class in JAR --> - <maven.jar.main.class>fr.ird.observe.application.swing.ObserveAdminCLI</maven.jar.main.class> + <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class> <i18n.bundleOutputName>${projectId}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile>${projectId}-i18n.csv</i18n.bundleCsvFile> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java index a3c2827..79a3dd1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java @@ -47,11 +47,7 @@ import java.util.concurrent.TimeUnit; public class ObserveActionExecutor extends ActionExecutor { /** Logger */ - private static final Log log = - LogFactory.getLog(ObserveActionExecutor.class); - - public ObserveActionExecutor() { - } + private static final Log log = LogFactory.getLog(ObserveActionExecutor.class); @Override public void onActionStart(ActionWorker<?, ?> source) { @@ -75,7 +71,6 @@ public class ObserveActionExecutor extends ActionExecutor { AdminUIModel model = admin.getHandler().getModel(); model.setBusy(true); model.setStepState(WizardState.RUNNING); -// return; } ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); if (ui != null) { @@ -88,8 +83,7 @@ public class ObserveActionExecutor extends ActionExecutor { Exception error = source.getError(); if (log.isInfoEnabled()) { if (log.isErrorEnabled()) { - log.error("Action [" + source.getActionLabel() + - "] failed with error " + error.getCause(), error); + log.error("Action [" + source.getActionLabel() + "] failed with error " + error.getCause(), error); } } if (ObserveSwingApplicationContext.get().isClosed()) { @@ -187,8 +181,6 @@ public class ObserveActionExecutor extends ActionExecutor { if (source instanceof AdminActionWorker) { AdminActionWorker admin = (AdminActionWorker) source; admin.getHandler().getModel().setBusy(false); - //admin.getHandler().getUi().removePropertyChangeListener(admin.getHandler().getUi()); -// return; } ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); if (count < 1 && ui != null) { @@ -249,37 +241,22 @@ public class ObserveActionExecutor extends ActionExecutor { * @return ExecutorService for the {@code SwingWorkers} */ private static ExecutorService getWorkersExecutorService() { -// AppContext appContext = AppContext.getAppContext(); -// ExecutorService executorService = -// (ExecutorService) appContext.get(ActionWorker.class); if (executorService == null) { //this creates daemon threads. ThreadFactory threadFactory = new ThreadFactory() { - final ThreadFactory defaultFactory = - Executors.defaultThreadFactory(); + ThreadFactory defaultFactory = Executors.defaultThreadFactory(); public Thread newThread(Runnable r) { - Thread thread = - defaultFactory.newThread(r); - thread.setName("ActionWorker-" - + thread.getName()); + Thread thread = defaultFactory.newThread(r); + thread.setName("ActionWorker-" + thread.getName()); thread.setDaemon(true); return thread; } }; - executorService = - new ThreadPoolExecutor(5, 10, - 10L, TimeUnit.MINUTES, - new LinkedBlockingQueue<>(), - threadFactory); - -// appContext.put(ActionWorker.class, executorService); + executorService = new ThreadPoolExecutor(5, 10, 10L, TimeUnit.MINUTES, new LinkedBlockingQueue<>(), threadFactory); - // Don't use ShutdownHook here as it's not enough. We should track - // AppContext disposal instead of JVM shutdown, see 6799345 for details -// final ExecutorService es = executorService; Runtime.getRuntime().addShutdownHook(new Thread() { @Override public void run() { @@ -288,30 +265,6 @@ public class ObserveActionExecutor extends ActionExecutor { } } }); -// appContext.addPropertyChangeListener(AppContext.DISPOSED_PROPERTY_NAME, -// new PropertyChangeListener() { -// @Override -// public void propertyChange(PropertyChangeEvent pce) { -// boolean disposed = (Boolean) pce.getNewValue(); -// if (disposed) { -// WeakReference<ExecutorService> executorServiceRef = -// new WeakReference<ExecutorService>(es); -// final ExecutorService executorService = -// executorServiceRef.get(); -// if (executorService != null) { -// AccessController.doPrivileged( -// new PrivilegedAction<Void>() { -// public Void run() { -// executorService.shutdown(); -// return null; -// } -// } -// ); -// } -// } -// } -// } -// ); } return executorService; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java index cba8ef5..30c91ec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java @@ -59,9 +59,6 @@ public class ObserveCLAction { /** La configuration de l'application. */ protected ObserveSwingApplicationConfig config; - public ObserveCLAction() { - } - /** Désactiver la possiblite de lancer l'ui principale. */ public void disableMainUI() { if (log.isDebugEnabled()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java index 4bf0f8e..7ad5a4a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -93,13 +93,6 @@ public abstract class ObserveRunner extends ApplicationRunner { return (ObserveRunner) ApplicationRunner.getRunner(); } -// public static ObserveResourceManager getResourceManager() { -// if (resourceManager == null) { -// throw new IllegalStateException("No resourceManager initialized"); -// } -// return resourceManager; -// } - public static ObserveActionExecutor getActionExecutor() { if (actionExecutor == null) { actionExecutor = new ObserveActionExecutor(); @@ -109,10 +102,6 @@ public abstract class ObserveRunner extends ApplicationRunner { public abstract String getRunnerName(); -// public static boolean isAdmin() { -// return true; -// } - private final boolean init; public ObserveRunner(String... args) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java index 91d366a..e5127e9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java @@ -24,26 +24,13 @@ package fr.ird.observe.application.swing; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceEvent; import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceListenerAdapter; -import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; -import fr.ird.observe.services.runner.ObserveServiceMainFactory; -import fr.ird.observe.services.ObserveServicesProvider; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceInformation; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; -import fr.ird.observe.services.service.actions.validate.ValidatorDto; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUIMode; import fr.ird.observe.application.swing.ui.actions.ChangeStorageAction; @@ -68,6 +55,19 @@ import fr.ird.observe.application.swing.ui.actions.shared.SelectOpenNodeUIAction import fr.ird.observe.application.swing.ui.content.ContentUIManager; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.validation.ValidationContext; +import fr.ird.observe.services.ObserveServicesProvider; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; +import fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier; +import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; +import fr.ird.observe.services.runner.ObserveServiceMainFactory; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; +import fr.ird.observe.services.service.actions.validate.ValidatorDto; import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; @@ -88,7 +88,6 @@ import java.util.UUID; import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.ACTIONS; import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.ACTION_MAP; -import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.BINDER_SERVICE; import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.CONFIG; import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.CONTENT_UI_MANAGER; import static fr.ird.observe.application.swing.ObserveSwingApplicationContext.Entries.DATA_CONTEXT; @@ -136,7 +135,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im SERVICE_MAIN_FACTORY("Service main factory", ObserveServiceMainFactory.class), DATA_SOURCE_CONFIGURATION_FACTORY("Data source configuration main factory", ObserveDataSourceConfigurationMainFactory.class), OPEN_DATA_MANAGER("Open data manager", ObserveOpenDataManager.class), - BINDER_SERVICE("Binder service", ObserveSwingBinderService.class), DATA_CONTEXT("Data context", DataContext.class), CONTENT_UI_MANAGER("Content UI manager", ContentUIManager.class), DATA_SOURCES_MANAGER("Data sources manager", ObserveSwingApplicationDataSourcesManager.class), @@ -170,7 +168,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im private <O> void set(O instance) { entryDef.setContextValue(ObserveSwingApplicationContext.get(), instance); if (log.isInfoEnabled()) { - log.info("Add to application context " + objectName + ": " + (instance instanceof Collection ? ((Collection)instance).size()+" element(s)": instance)); + log.info("Add to application context " + objectName + ": " + (instance instanceof Collection ? ((Collection) instance).size() + " element(s)" : instance)); } } @@ -178,7 +176,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im O instance = get(); entryDef.removeContextValue(ObserveSwingApplicationContext.get()); if (log.isInfoEnabled()) { - log.info("Remove from application context " + objectName + ": " + (instance instanceof Collection ? ((Collection)instance).size()+" element(s)": instance)); + log.info("Remove from application context " + objectName + ": " + (instance instanceof Collection ? ((Collection) instance).size() + " element(s)" : instance)); } } } @@ -223,7 +221,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im INSTANCE = this; CONFIG.set(config); - BINDER_SERVICE.set(new ObserveSwingBinderService()); ACTIONS.set(new ObserveCLAction()); CONTENT_UI_MANAGER.set(new ContentUIManager()); DATA_SOURCES_MANAGER.set(new ObserveSwingApplicationDataSourcesManager()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java deleted file mode 100644 index bf47be7..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * #%L - * ObServe :: Application Swing - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.application.swing; - -import fr.ird.observe.services.dto.AbstractObserveDto; -import org.nuiton.util.beans.BinderModelBuilder; - -/** - * Service d'utilisation des binders - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class ObserveSwingBinderService { - - public <E extends AbstractObserveDto> BinderModelBuilder<E, E> newBinderBuilder(Class<E> type, String... properties) { - BinderModelBuilder<E, E> builder = BinderModelBuilder.newEmptyBuilder(type); - builder.addSimpleProperties(properties); - return builder; - } - - public <E extends AbstractObserveDto> void simpleCopy(E source, E target, boolean tech) { - //FIXME -// Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(ObserveDAOHelper.getContracts(), target.getClass()); -// TopiaEntityBinder<E> binder = getSimpleTopiaBinder(entityClass); -// if (binder == null) { -// throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); -// } -// binder.load(source, target, tech); - } -} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java similarity index 79% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java index 742d955..d5816e1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -33,26 +33,25 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ObserveAdminCLI extends ObserveRunner { +public class RunObserve extends ObserveRunner { /** Logger */ - private static final Log log = LogFactory.getLog(ObserveAdminCLI.class); + private static final Log log = LogFactory.getLog(RunObserve.class); @Override public String getRunnerName() { return "observe"; } - public ObserveAdminCLI(String... args) { + public RunObserve(String... args) { super(args); } public static void main(String... args) { - log.info("ObServe admin client launch at " + - new Date() + " args: " + Arrays.toString(args)); + log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args)); - new ObserveAdminCLI(args).launch(); + new RunObserve(args).launch(); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java index d97f0a8..389e5f6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.application.swing.ui.content.table; -import fr.ird.observe.application.swing.ObserveSwingBinderService; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; @@ -206,11 +205,14 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte firePropertyChange(PROPERTY_SHOW_DATA, oldValue, showData); } - protected BinderModelBuilder<D, D> prepareChildLoador(ObserveSwingBinderService binderService, String binderName) { + protected BinderModelBuilder<D, D> prepareChildLoador(String binderName) { String[] properties = getChildProperties(); - return binderService.newBinderBuilder(childType, properties); + BinderModelBuilder<D, D> builder = BinderModelBuilder.newEmptyBuilder(childType); + builder.addSimpleProperties(properties); + + return builder; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java index c6795a0..02c7d51 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.application.swing.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; @@ -220,9 +219,9 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt } @Override - protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(ObserveSwingBinderService binderService, String binderName) { + protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(String binderName) { - BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> builder = super.prepareChildLoador(binderService, binderName); + BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> builder = super.prepareChildLoador(binderName); builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, CatchLonglineDto.PROPERTY_PREDATOR); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b113a46efd0d83a05b30e2d286dfd06a5916bf3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 22:22:46 2016 +0200 Fix save local database in export operation if referential was modified --- .../swing/ui/admin/save/SaveLocalUIHandler.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java index 0d41885..a33b432 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java @@ -22,16 +22,14 @@ package fr.ird.observe.application.swing.ui.admin.save; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; -import fr.ird.observe.services.service.SqlScriptProducerService; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel; +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -54,9 +52,6 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { /** Logger */ private static final Log log = LogFactory.getLog(SaveLocalUIHandler.class); - private static final String UPDATE_VERSION_PATTERN = - "UPDATE %1$s SET topiaversion = %2$d WHERE topiaid='%3$s';\n"; - protected ObserveSwingDataSource source; public SaveLocalUIHandler(SaveLocalUI ui) { @@ -176,16 +171,13 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { return WizardState.SUCCESSED; } - public void saveUnidirectionalSynchronizeReferential() { + private void saveUnidirectionalSynchronizeReferential() { SynchronizeModel stepModel = getModel().getSynchronizeReferentielModel(); - UnidirectionalReferentialSynchronizeEngine engine = stepModel.getEngine(); - UnidirectionalReferentialSynchronizeContext referentialSynchronizeContext = stepModel.getReferentialSynchronizeContext(); - engine.finish(referentialSynchronizeContext); - + source.newUnidirectionalReferentialSynchronizeLocalService().applySqlRequests(referentialSynchronizeContext.getSqlRequests()); sendMessage(t("observe.actions.synchro.referential.message.apply.done", new Date())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.