branch develop updated (ebfe1c2 -> 743aef1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from ebfe1c2 La boîte "A propos" ne fonctionne pas (fixes #8564) new 743aef1 Use nuiton-config 3.0-SNAPSHOT The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 743aef198c28275435694dbb6858f6305f657c78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 19:55:16 2016 +0200 Use nuiton-config 3.0-SNAPSHOT Summary of changes: application-swing-configuration/pom.xml | 13 +++-- .../ObserveSwingApplicationConfigProvider.java | 59 --------------------- .../org.nuiton.config.ApplicationConfigProvider | 1 - ...pplication-swing-configuration_en_GB.properties | 2 +- ...pplication-swing-configuration_es_ES.properties | 2 +- ...pplication-swing-configuration_fr_FR.properties | 2 +- application-swing/pom.xml | 4 +- application-web-configuration/pom.xml | 14 +++-- ...ObserveWebApplicationConfigurationProvider.java | 61 ---------------------- .../org.nuiton.config.ApplicationConfigProvider | 1 - .../application-web-configuration_en_GB.properties | 2 +- .../application-web-configuration_es_ES.properties | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- pom.xml | 15 ++++-- 14 files changed, 39 insertions(+), 141 deletions(-) delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java delete mode 100644 application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java delete mode 100644 application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider -- 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 743aef198c28275435694dbb6858f6305f657c78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 19:55:16 2016 +0200 Use nuiton-config 3.0-SNAPSHOT --- application-swing-configuration/pom.xml | 13 +++-- .../ObserveSwingApplicationConfigProvider.java | 59 --------------------- .../org.nuiton.config.ApplicationConfigProvider | 1 - ...pplication-swing-configuration_en_GB.properties | 2 +- ...pplication-swing-configuration_es_ES.properties | 2 +- ...pplication-swing-configuration_fr_FR.properties | 2 +- application-swing/pom.xml | 4 +- application-web-configuration/pom.xml | 14 +++-- ...ObserveWebApplicationConfigurationProvider.java | 61 ---------------------- .../org.nuiton.config.ApplicationConfigProvider | 1 - .../application-web-configuration_en_GB.properties | 2 +- .../application-web-configuration_es_ES.properties | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- pom.xml | 15 ++++-- 14 files changed, 39 insertions(+), 141 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 49134ad..f0a730a 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -107,13 +107,20 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> @@ -122,7 +129,7 @@ <modelName>ObserveSwingApplication</modelName> </configuration> <goals> - <goal>generate-config</goal> + <goal>generate</goal> </goals> </execution> </executions> diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java deleted file mode 100644 index eda57ac..0000000 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -package fr.ird.observe.application.swing.configuration; - -/*- - * #%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% - */ - -import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.config.ConfigActionDef; -import org.nuiton.config.ConfigOptionDef; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ObserveSwingApplicationConfigProvider implements ApplicationConfigProvider { - - static final String OBSERVE_SWING_CONFIGURATION_PROVIDER_NAME = "observeSwing"; - - @Override - public String getName() { - return OBSERVE_SWING_CONFIGURATION_PROVIDER_NAME; - } - - @Override - public String getDescription(Locale locale) { - return l(locale, "observe.config.name"); - } - - @Override - public ConfigOptionDef[] getOptions() { - return ObserveSwingApplicationConfigOption.values(); - } - - @Override - public ConfigActionDef[] getActions() { - return ObserveSwingApplicationConfigAction.values(); - } -} diff --git a/application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider deleted file mode 100644 index d862cac..0000000 --- a/application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider +++ /dev/null @@ -1 +0,0 @@ -fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigProvider \ No newline at end of file diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index 64b088c..a027ae7 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -1,3 +1,4 @@ +ObserveSwingApplicationConfig.description=ObServe configuration observe.action.commandline.configure.ui=Configure application observe.action.commandline.create.id=Générer des topiaIds.\nDeux paramètres sont nécessaires \: le FQN de la classe et le nombre d'id à générer. observe.action.commandline.disable.main.ui=Do NOT launch main gui @@ -42,7 +43,6 @@ observe.config.map.layer7.description=File (shapefile) for layer 7 of map observe.config.map.layer8.description=File (shapefile) for layer 8 of map observe.config.map.layer9.description=File (shapefile) for layer 9 of map observe.config.map.style.description=File of styles used in map -observe.config.name=ObServe configuration observe.config.observation.activitysDetaillees=Observation of detailled activities observe.config.observation.fauneAssociee=Observation of non target observe.config.observation.floatingObject=Observation of floating objects diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index 1c8b241..e44536f 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -1,3 +1,4 @@ +ObserveSwingApplicationConfig.description=Configuración de ObServe observe.action.commandline.configure.ui=Configurar la aplicación observe.action.commandline.create.id=Generar topiaIds.\nDos parametros son necesarios\:\n\tEl FQN de la clase\n\tEl número de id a generar. observe.action.commandline.disable.main.ui=No ejecutar la interfaz grafica @@ -42,7 +43,6 @@ observe.config.map.layer7.description=Archivo (shapeFiles) del septimo calco del observe.config.map.layer8.description=Archivo (shapeFiles) del octavo calco del mapa observe.config.map.layer9.description=Archivo (shapeFiles) del noveno calco del mapa observe.config.map.style.description=Archivo de los estilos a aplicar sobre los calcos del mapa -observe.config.name=Configuración de ObServe observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 69b2378..13d83c7 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -1,3 +1,4 @@ +ObserveSwingApplicationConfig.description=Configuration d'ObServe observe.action.commandline.configure.ui=Configurer l'application observe.action.commandline.create.id=Générer des topiaIds.\nDeux paramètres sont nécessaires\:\n\tLe FQN de la classe\n\tLe nombre d'id à générer. observe.action.commandline.disable.main.ui=Ne pas lancer l'interface graphique @@ -42,7 +43,6 @@ observe.config.map.layer7.description=Fichier (shapeFiles) du septième calque d observe.config.map.layer8.description=Fichier (shapeFiles) du huitième calque de la carte observe.config.map.layer9.description=Fichier (shapeFiles) du neuvième calque de la carte observe.config.map.style.description=Fichier des style à appliquer sur les calques de la carte -observe.config.name=configuration d'ObServe observe.config.observation.activitysDetaillees=Observation des activités détaillées observe.config.observation.fauneAssociee=Observation des Faunes associées observe.config.observation.floatingObject=Observation des objets flottants diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 29c8a73..f1d2197 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -727,8 +727,8 @@ <resource>NOTICE.txt</resource> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> + <!--<templates implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> + <!--<templates implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index cbe7751..9f59de7 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -109,8 +109,8 @@ <plugins> <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> @@ -119,7 +119,7 @@ <modelName>ObserveWebApplication</modelName> </configuration> <goals> - <goal>generate-config</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -135,11 +135,17 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> </execution> </executions> </plugin> - </plugins> </build> diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java deleted file mode 100644 index 5e79693..0000000 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java +++ /dev/null @@ -1,61 +0,0 @@ -package fr.ird.observe.application.web.configuration; - -/* - * #%L - * ObServe :: Application Web - * %% - * 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% - */ - -import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.config.ConfigActionDef; -import org.nuiton.config.ConfigOptionDef; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l; - -/** - * Created on 29/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveWebApplicationConfigurationProvider implements ApplicationConfigProvider { - - public static final String OBSERVE_WEB_CONFIGURATION_PROVIDER_NAME = "observeWeb"; - - @Override - public String getName() { - return OBSERVE_WEB_CONFIGURATION_PROVIDER_NAME; - } - - @Override - public String getDescription(Locale locale) { - return l(locale, "observeweb.configuration.description"); - } - - @Override - public ConfigOptionDef[] getOptions() { - return ObserveWebApplicationConfigurationOption.values(); - } - - @Override - public ConfigActionDef[] getActions() { - return new ConfigActionDef[0]; - } -} diff --git a/application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider deleted file mode 100644 index e923a49..0000000 --- a/application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider +++ /dev/null @@ -1 +0,0 @@ -fr.ird.observe.application.web.configuration.ObserveWebApplicationConfigurationProvider \ No newline at end of file diff --git a/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties b/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties index 6820200..0ec7644 100644 --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties @@ -1,3 +1,4 @@ +ObserveWebApplicationConfiguration.description=ObServe Web configuration observe.model.version=Model version observeweb.adminApiKey.description=API Key to use the admin mode (You should change it). observeweb.apiUrl.description=REST API end point @@ -5,7 +6,6 @@ observeweb.baseDirectory.description=Base directory observeweb.build.date.description=Build date observeweb.build.number.description=Build number observeweb.build.version.description=Build version -observeweb.configuration.description=ObServe Web configuration observeweb.databasesConfigurationFile.description=Path to databases configuration file observeweb.devMode.description=Dev mode observeweb.log4jConfigurationFile.description=Path to log configuration file diff --git a/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties b/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties index 9fde0c0..4a30f89 100644 --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties @@ -1,3 +1,4 @@ +ObserveWebApplicationConfiguration.description=Configuración de Observe web observe.model.version=Versión del modelo observeweb.adminApiKey.description=Admin API Key (A cambiar). observeweb.apiUrl.description=Url de la api rest @@ -5,7 +6,6 @@ observeweb.baseDirectory.description=Directorio de la aplicación observeweb.build.date.description=Fecha de construcción observeweb.build.number.description=Número de construcción observeweb.build.version.description=Versión de construcción -observeweb.configuration.description=Configuración de Observe web observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases observeweb.devMode.description=Modo desarollador observeweb.log4jConfigurationFile.description=Ubicación del archivo de configuración de los logs diff --git a/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties b/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties index 10057d6..e1e100c 100644 --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties @@ -1,3 +1,4 @@ +ObserveWebApplicationConfiguration.description=Observe web Configuration observe.model.version=Version du modèle observeweb.adminApiKey.description=Admin API Key (À changer). observeweb.apiUrl.description=Url de l'api rest @@ -5,7 +6,6 @@ observeweb.baseDirectory.description=Répertoire de l'application observeweb.build.date.description=Date de construction observeweb.build.number.description=Numéro de construction observeweb.build.version.description=Version de construction -observeweb.configuration.description=Observe web Configuration observeweb.databasesConfigurationFile.description=Chemin vers le fichier de configuration des bases observeweb.devMode.description=Mode développeur observeweb.log4jConfigurationFile.description=Chemin vers le fichier de configuration des logs diff --git a/pom.xml b/pom.xml index 404bebf..b7a389e 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,7 @@ <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-SNAPSHOT</nuitonConfigVersion> <xworkVersion>2.3.30</xworkVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <sl4jVersion>1.7.21</sl4jVersion> @@ -321,7 +322,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-4</version> + <version>${nuitonConfigVersion}</version> <scope>compile</scope> </dependency> <dependency> @@ -988,6 +989,12 @@ </plugin> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> + </plugin> + + <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> @@ -1162,13 +1169,13 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-maven-report-plugin</artifactId> - <version>3.0.1</version> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> <inherited>false</inherited> <reportSets> <reportSet> <reports> - <report>aggregate-config-report</report> + <report>aggregate-report</report> </reports> </reportSet> </reportSets> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm