- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch develop-ng
by Tony CHEMIT 14 Mar '18

14 Mar '18

Tony CHEMIT pushed new branch develop-ng at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/develop-ng You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch master-o
by Tony CHEMIT 16 Feb '18

16 Feb '18

Tony CHEMIT pushed new branch master-o at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/master-o You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-o
by Tony CHEMIT 16 Feb '18

16 Feb '18

Tony CHEMIT pushed new branch develop-o at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/develop-o You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: use improved boot api
by Tony CHEMIT 02 Feb '18

02 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc879e29 by Tony CHEMIT at 2018-02-01T03:36:58+01:00 use improved boot api - - - - - 0a5773b7 by Tony CHEMIT at 2018-02-02T19:10:53+01:00 intoduce dto-editor and begin to use them - - - - - 7f8c7c2d by Tony CHEMIT at 2018-02-02T19:25:03+01:00 move maps to client-ui-common - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - + client-ui-common/.mvn/add-geotools-repository - + client-ui-common/.mvn/i18n-generate - + client-ui-common/.mvn/i18n-parse-java - + client-ui-common/.mvn/jaxx-generate - + client-ui-common/.mvn/pom.gitflow.develop - + client-ui-common/.mvn/pom.gitflow.master - + client-ui-common/.mvn/pom.organizationId - + client-ui-common/.mvn/pom.projectId - + client-ui-common/.mvn/pom.stageId - + client-ui-common/LICENSE.txt - + client-ui-common/README.md - + client-ui-common/pom.xml - + client-ui-common/src/license/THIRD-PARTY.properties - client/src/main/assembly/map.xml → client-ui-common/src/main/assembly/map.xml - + client-ui-common/src/main/java/fr/ird/observe/ui/ObserveUIInstances.java - client/src/main/java/fr/ird/observe/ui/dcppresets/FloatingObjectPresetsManager.java → client-ui-common/src/main/java/fr/ird/observe/ui/dcppresets/FloatingObjectPresetsManager.java - client/src/main/java/fr/ird/observe/ui/ds/ObserveClientDataSource.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/ObserveClientDataSource.java - client/src/main/java/fr/ird/observe/ui/ds/ObserveClientDataSourceDataCache.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/ObserveClientDataSourceDataCache.java - client/src/main/java/fr/ird/observe/ui/ds/ObserveDataSourceServicesProvider.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/ObserveDataSourceServicesProvider.java - client/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowEmptyProgram.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowEmptyProgram.java - client/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowLonglineTrips.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowLonglineTrips.java - client/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowReferential.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowReferential.java - client/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowSeineTrips.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/tree/navigation/NavigationUIConfigureShowSeineTrips.java - client/src/main/java/fr/ird/observe/ui/ds/tree/navigation/ObserveNavigationTreeConfig.java → client-ui-common/src/main/java/fr/ird/observe/ui/ds/tree/navigation/ObserveNavigationTreeConfig.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c5ef525ae5b21465d2cfc9d62c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c5ef525ae5b21465d2cfc9d62c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use improved boot api
by Tony CHEMIT 31 Jan '18

31 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c5ef525a by Tony CHEMIT at 2018-01-31T06:14:01+01:00 use improved boot api - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/java/fr/ird/observe/ui/ObserveInstances.java - client/src/main/java/fr/ird/observe/ui/RunObserve.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java - client/src/main/java/fr/ird/observe/ui/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeModel.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterTasksActionSupport.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java - client/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java - client/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java - + client/src/main/java/fr/ird/observe/ui/boot/ObserveApplicationComponents.java - client/src/main/java/fr/ird/observe/ui/main/ObserveMainUIApplicationContext.java → client/src/main/java/fr/ird/observe/ui/boot/ObserveApplicationContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c5ef525ae5b21465d2cfc9d62cc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c5ef525ae5b21465d2cfc9d62cc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: use new boot api
by Tony CHEMIT 29 Jan '18

29 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 42557cd7 by Tony CHEMIT at 2018-01-29T01:42:45+01:00 use new boot api - - - - - e487540b by Tony CHEMIT at 2018-01-29T02:18:01+01:00 simplify template API (remove usage of ServiceLoader) - - - - - 13b503ac by Tony CHEMIT at 2018-01-29T04:03:06+01:00 fix code + add new application component - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/ui/ObserveApplicationBootInitializer.java → client/src/main/java/fr/ird/observe/ui/ObserveBootInitializer.java - client/src/main/java/fr/ird/observe/ui/form/data/ObserveFormHelper.java → client/src/main/java/fr/ird/observe/ui/ObserveInstances.java - client/src/main/java/fr/ird/observe/ui/RunObserve.java - client/src/main/java/fr/ird/observe/ui/admin/AdminStep.java - + client/src/main/java/fr/ird/observe/ui/admin/AdminStepDefinition.java - client/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx - client/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java - client/src/main/java/fr/ird/observe/ui/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx - client/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java - client/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java - client/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java - client/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroModel.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeModel.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/ApplyAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterDeleteTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateTaskAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/af6afbf0aee349d22a3b3d857b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/af6afbf0aee349d22a3b3d857b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use new boot api
by Tony CHEMIT 28 Jan '18

28 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af6afbf0 by Tony CHEMIT at 2018-01-28T21:27:33+01:00 use new boot api - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/ui/ObserveApplicationBootInitializer.java - client/src/main/java/fr/ird/observe/ui/admin/AdminStep.java - + client/src/main/java/fr/ird/observe/ui/admin/AdminStepDefinition.java - client/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java - client/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java - client/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java - client/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroModel.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeModel.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/ApplyAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterDeleteTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateWithReplaceTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterRevertTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterSkipTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/actions/RegisterUpdateTaskAction.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java - client/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/af6afbf0aee349d22a3b3d857b8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/af6afbf0aee349d22a3b3d857b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add more test on templates
by Tony CHEMIT 28 Jan '18

28 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b9036ac by Tony CHEMIT at 2018-01-28T02:58:19+01:00 add more test on templates - - - - - 3 changed files: - client/src/test/java/fr/ird/observe/ui/text/ObserveTextTemplateTest.java → client/src/test/java/fr/ird/observe/ui/text/ClientTextTemplatesTest.java - + client/src/test/java/fr/ird/observe/ui/text/UiDataSourceTextTemplatesTest.java - + client/src/test/java/fr/ird/observe/ui/text/UiMainTextTemplatesTest.java Changes: ===================================== client/src/test/java/fr/ird/observe/ui/text/ObserveTextTemplateTest.java → client/src/test/java/fr/ird/observe/ui/text/ClientTextTemplatesTest.java ===================================== --- a/client/src/test/java/fr/ird/observe/ui/text/ObserveTextTemplateTest.java +++ b/client/src/test/java/fr/ird/observe/ui/text/ClientTextTemplatesTest.java @@ -23,9 +23,6 @@ package fr.ird.observe.ui.text; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ui.main.ObserveTestSupport; -import fr.ird.observe.ui.main.ObserveMainUIApplicationContext; -import fr.ird.observe.ui.admin.validate.ValidateModel; import fr.ird.observe.services.ds.ClientDataSource; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; import fr.ird.observe.services.service.actions.validate.ValidateService; @@ -33,6 +30,9 @@ import fr.ird.observe.services.service.actions.validate.ValidationResult; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.ui.admin.validate.ValidateModel; +import fr.ird.observe.ui.main.ObserveMainUIApplicationContext; +import fr.ird.observe.ui.main.ObserveTestSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -44,13 +44,13 @@ import org.nuiton.validator.NuitonValidatorScope; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class ObserveTextTemplateTest extends ObserveTestSupport { +(a)DatabaseNameConfiguration(DatabaseName.dataForTestSeine) +public class ClientTextTemplatesTest extends ObserveTestSupport { - private static final Log log = LogFactory.getLog(ObserveTextTemplateTest.class); + private static final Log log = LogFactory.getLog(ClientTextTemplatesTest.class); - @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test - public void getValidationReport() { + public void applyValidateReportTemplate() { ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); ===================================== client/src/test/java/fr/ird/observe/ui/text/UiDataSourceTextTemplatesTest.java ===================================== --- /dev/null +++ b/client/src/test/java/fr/ird/observe/ui/text/UiDataSourceTextTemplatesTest.java @@ -0,0 +1,129 @@ +package fr.ird.observe.ui.text; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + +import fr.ird.observe.dto.ObserveUtil; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.ds.ClientDataSource; +import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.ui.ds.ClientDataSourcesManager; +import fr.ird.observe.ui.ds.manager.StorageUIModel; +import fr.ird.observe.ui.main.ObserveMainUIApplicationContext; +import fr.ird.observe.ui.main.ObserveTestSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.Locale; + +/** + * Created by tchemit on 28/01/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +(a)DatabaseNameConfiguration(DatabaseName.dataForTestSeine) +public class UiDataSourceTextTemplatesTest extends ObserveTestSupport { + private static final Log log = LogFactory.getLog(UiDataSourceTextTemplatesTest.class); + + + @Test + public void applyDataSourceInformationTemplate() { + ClientDataSource model = getMethodRule().getDataSource(); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourceInformationTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + @Ignore + public void applyInitStorageTemplate() { + ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); + ClientDataSourcesManager.InitStorageModel model = null; + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyInitStorageTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + public void applyDataSourceConnexionReportTemplate() { + ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); + StorageUIModel model = new StorageUIModel(applicationContext); + model.init(applicationContext, getMethodRule().getDataSource().getConfiguration()); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourceConnexionReportTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + public void applyDataSourcePolicyTemplate() { + ObserveDataSourceInformation model = getMethodRule().getDataSource().getInformation(); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourcePolicyTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + public void applyDataSourceLoadSummaryTemplate() { + ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); + StorageUIModel model = new StorageUIModel(applicationContext); + model.init(applicationContext, getMethodRule().getDataSource().getConfiguration()); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourceLoadSummaryTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + public void applyDataSourceConfigurationTemplate() { + ObserveDataSourceConfiguration model = getMethodRule().getDataSource().getConfiguration(); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourceConfigurationTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } + + @Test + public void applyDataSourceConnexionResultTemplate() { + ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); + StorageUIModel model = new StorageUIModel(applicationContext); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiDataSourceTextTemplates.applyDataSourceConnexionResultTemplate(model, locale); + log.info(content); + Assert.assertNotNull(content); + } + } +} ===================================== client/src/test/java/fr/ird/observe/ui/text/UiMainTextTemplatesTest.java ===================================== --- /dev/null +++ b/client/src/test/java/fr/ird/observe/ui/text/UiMainTextTemplatesTest.java @@ -0,0 +1,57 @@ +package fr.ird.observe.ui.text; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + +import fr.ird.observe.dto.ObserveUtil; +import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.ui.main.ObserveMainUIApplicationContext; +import fr.ird.observe.ui.main.ObserveTestSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Locale; + +/** + * Created by tchemit on 28/01/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +(a)DatabaseNameConfiguration(DatabaseName.dataForTestSeine) +public class UiMainTextTemplatesTest extends ObserveTestSupport { + + private static final Log log = LogFactory.getLog(UiMainTextTemplatesTest.class); + + @Test + public void applyAboutTemplate() { + ObserveMainUIApplicationContext applicationContext = getClassRule().getApplicationContext(); + for (Locale locale : ObserveUtil.LOCALES) { + String content = UiMainTextTemplates.applyAboutTemplate(applicationContext.getConfig(), locale); + log.info(content); + Assert.assertNotNull(content); + } + } + +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b9036ac4a45067e4c35bd55272… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b9036ac4a45067e4c35bd55272… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: use last jaxx
by Tony CHEMIT 28 Jan '18

28 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 91cb5d88 by Tony CHEMIT at 2018-01-24T13:40:52+01:00 use last jaxx - - - - - 5535076a by Tony CHEMIT at 2018-01-24T14:35:31+01:00 reorganize packages (move client to ui) - - - - - 86e9c467 by Tony CHEMIT at 2018-01-24T19:59:14+01:00 use new ui-main module = use last pom - - - - - c1b2ee7e by Tony CHEMIT at 2018-01-25T16:00:07+01:00 stop using a ird observe pom, just use main maven pom - - - - - f947ccaf by Tony CHEMIT at 2018-01-25T16:23:45+01:00 continue application storm - - - - - 80d256f3 by Tony CHEMIT at 2018-01-27T21:23:42+01:00 use new boot api (some command line actions are now in framework) - - - - - 7e19109e by Tony CHEMIT at 2018-01-27T23:23:15+01:00 use new boot api and other improvements in framework - - - - - 61440d75 by Tony CHEMIT at 2018-01-28T01:58:51+01:00 use snapshot of nuiton-config + fix some boot issues for test - - - - - 30 changed files: - CONTRIBUTING.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - + client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/.mvn/jaxx-form-ui → client/.mvn/add-generated-test-sources-ui - + client/.mvn/i18n-parse-java-enumerations - client/pom.xml - − client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java - − client/src/main/java/fr/ird/observe/client/main/ObserveMainUI.java - − client/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - − client/src/main/java/fr/ird/observe/client/main/actions/MainUIMenuNavigationGoToReferentialLongline.java - − client/src/main/java/fr/ird/observe/client/main/actions/MainUIMenuNavigationGoToReferentialSeine.java - − client/src/main/java/fr/ird/observe/client/tools/ObserveActionExecutor.java - − client/src/main/java/fr/ird/observe/client/tools/ObserveResourceManager.java - − client/src/main/java/fr/ird/observe/client/tripMap/ObserveMapPaneLegendItem.java - − client/src/main/java/fr/ird/observe/client/tripMap/ObserverMapPanLegendDrawer.java - − client/src/main/java/fr/ird/observe/client/tripMap/TripMapUI.jaxx - − client/src/main/java/fr/ird/observe/client/tripMap/TripMapUI.jcss - − client/src/main/java/fr/ird/observe/client/tripMap/actions/ExportPngUIAction.java - − client/src/main/java/fr/ird/observe/client/tripMap/actions/TripMapActionSupport.java - − client/src/main/java/fr/ird/observe/client/tripMap/actions/ZoomItUIAction.java - − client/src/main/java/fr/ird/observe/client/tripMap/actions/ZoomMoinsUIAction.java - − client/src/main/java/fr/ird/observe/client/tripMap/actions/ZoomPlusUIAction.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java → client/src/main/java/fr/ird/observe/ui/ObserveApplicationBootInitializer.java - − client/src/main/java/fr/ird/observe/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/commands/DataSynchronizeSourceOperationLauncher.java → client/src/main/java/fr/ird/observe/ui/RunObserve.java - client/src/main/java/fr/ird/observe/client/admin/AdminActionModel.java → client/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910a28abd0e6bdf0ccc2e58d88… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910a28abd0e6bdf0ccc2e58d88… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix compile path
by Tony CHEMIT 24 Jan '18

24 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 910a28ab by Tony CHEMIT at 2018-01-24T01:43:15+01:00 fix compile path - - - - - 2 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/RunObserveClient.java Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -347,7 +347,6 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <scope>provided</scope> </dependency>  ===================================== client/src/main/java/fr/ird/observe/client/RunObserveClient.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/RunObserveClient.java +++ b/client/src/main/java/fr/ird/observe/client/RunObserveClient.java @@ -33,6 +33,7 @@ import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.ObserveUtil; import fr.ird.observe.ui.text.TextTemplates; import fr.ird.observe.ui.text.spi.ExtractTextTemplates; +import freemarker.cache.ClassTemplateLoader; import io.ultreia.java4all.lang.Strings; import io.ultreia.java4all.util.Zips; import org.apache.commons.beanutils.ConvertUtils; @@ -102,6 +103,7 @@ public class RunObserveClient extends ApplicationRunner { log.debug(CoordinatesEditor.class); log.debug(TemperatureEditor.class); log.debug(AutoService.class); + log.debug(ClassTemplateLoader.class); } private final boolean init; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/910a28abd0e6bdf0ccc2e58d88a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/910a28abd0e6bdf0ccc2e58d88a… You're receiving this email because of your account on gitlab.com.

1 0