branch develop updated (302629b -> afceb89)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git from 302629b Generate also config provider by convention new 660cd19 Fix application env regression new e10f1c8 Add generated resources in project new afceb89 Improve example The 3 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 afceb8971bfaab96374aafc842ca049a7022c4a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:31:21 2016 +0200 Improve example commit e10f1c8735f68945aeb087fed3cf92731be00a4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:31:09 2016 +0200 Add generated resources in project commit 660cd1911627b20eed4994a99abe1bc7f9ac4d02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:30:07 2016 +0200 Fix application env regression Summary of changes: .../nuiton/config/example/NuitonConfigExample.java | 4 +--- .../example/NuitonConfigExampleConfigAction.java | 25 +++++++++++++++++++--- .../example/NuitonConfigExampleConfigOption.java | 9 ++++---- .../org/nuiton/config/plugin/GenerateMojo.java | 6 ++++++ .../java/org/nuiton/config/ApplicationConfig.java | 2 +- .../org/nuiton/config/ApplicationConfigTest.java | 2 -- 6 files changed, 34 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit 660cd1911627b20eed4994a99abe1bc7f9ac4d02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:30:07 2016 +0200 Fix application env regression --- nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java | 2 +- .../src/test/java/org/nuiton/config/ApplicationConfigTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java index bc33434..3b9a616 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -398,7 +398,7 @@ public class ApplicationConfig { Object result = super.get(key); if (result == null && key instanceof String) { String skey = (String) key; - skey = skey.replace("", "_"); + skey = skey.replace(".", "_"); result = super.get(skey); } return result; diff --git a/nuiton-config/src/test/java/org/nuiton/config/ApplicationConfigTest.java b/nuiton-config/src/test/java/org/nuiton/config/ApplicationConfigTest.java index 2a2b120..92bb784 100644 --- a/nuiton-config/src/test/java/org/nuiton/config/ApplicationConfigTest.java +++ b/nuiton-config/src/test/java/org/nuiton/config/ApplicationConfigTest.java @@ -457,12 +457,10 @@ public class ApplicationConfigTest { * @throws ArgumentsParserException if could not parse configuration */ @Test - @Ignore public void testEnvProperties() throws ArgumentsParserException { ApplicationConfig instance = new ApplicationConfig(); // simulate env variable with _ to replace dot - //FIXME-tchemit Ce test ne fonctionne plus sous java 8 instance.env.put("test_env", "value"); String value = instance.getOption("test.env"); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit e10f1c8735f68945aeb087fed3cf92731be00a4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:31:09 2016 +0200 Add generated resources in project --- .../src/main/java/org/nuiton/config/plugin/GenerateMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/GenerateMojo.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/GenerateMojo.java index d74663c..54b0686 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/GenerateMojo.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/GenerateMojo.java @@ -30,6 +30,7 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.TokenStream; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.maven.model.Resource; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -60,6 +61,7 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; @@ -319,6 +321,10 @@ public class GenerateMojo extends AbstractPlugin implements PluginWithEncoding { Files.createParentDirs(serviceLoaderFile); Files.write(content.getBytes(), serviceLoaderFile); getLog().info("Generate serviceLoader provider file: " + serviceLoaderFile); + Resource resource = new Resource(); + resource.setDirectory(outputdirectory.getAbsolutePath()); + resource.setIncludes(Collections.singletonList("**/" + ApplicationConfigProvider.class.getName())); + project.addResource(resource); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit afceb8971bfaab96374aafc842ca049a7022c4a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 17:31:21 2016 +0200 Improve example --- .../nuiton/config/example/NuitonConfigExample.java | 4 +--- .../example/NuitonConfigExampleConfigAction.java | 25 +++++++++++++++++++--- .../example/NuitonConfigExampleConfigOption.java | 9 ++++---- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExample.java b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExample.java index a1daa3e..4835f3c 100644 --- a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExample.java +++ b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExample.java @@ -22,8 +22,6 @@ package org.nuiton.config.example; * #L% */ -import org.nuiton.config.ArgumentsParserException; - /** * Created on 30/09/16. * @@ -31,7 +29,7 @@ import org.nuiton.config.ArgumentsParserException; */ public class NuitonConfigExample { - public static void main(String... args) throws ArgumentsParserException { + public static void main(String... args) throws Exception { NuitonConfigExampleConfig config = new NuitonConfigExampleConfig(); diff --git a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigAction.java b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigAction.java index 935823e..8f939a9 100644 --- a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigAction.java +++ b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigAction.java @@ -1,9 +1,28 @@ package org.nuiton.config.example; -import org.nuiton.config.ConfigActionDef; +/*- + * #%L + * Nuiton Config :: Example + * %% + * Copyright (C) 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; +import org.nuiton.config.ConfigActionDef; /** * Les actions appellables en ligne de commande. diff --git a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigOption.java b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigOption.java index 19d4620..6c45a7e 100644 --- a/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigOption.java +++ b/nuiton-config-example/src/main/java/org/nuiton/config/example/NuitonConfigExampleConfigOption.java @@ -22,7 +22,6 @@ package org.nuiton.config.example; * #L% */ -import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import java.io.File; @@ -34,7 +33,7 @@ public enum NuitonConfigExampleConfigOption implements ConfigOptionDef { */ CONFIG_FILE( String.class, - ApplicationConfig.CONFIG_FILE_NAME, + "config.file", "Nom du fichier de configuration", "application", true, @@ -42,7 +41,7 @@ public enum NuitonConfigExampleConfigOption implements ConfigOptionDef { ), /** - * le repertoire ou est stoquee la base locale + * le repertoire de stoquage des données */ DATA_DIRECTORY( File.class, @@ -54,7 +53,7 @@ public enum NuitonConfigExampleConfigOption implements ConfigOptionDef { ), /** - * le repertoire ou est stoquee la base locale + * le repertoire de stoquage de la base locale */ DB_DIRECTORY( File.class, @@ -66,7 +65,7 @@ public enum NuitonConfigExampleConfigOption implements ConfigOptionDef { ); /** - * Clef qui represente l'option (c'est celle enregistrée dans le fichier de configuration). + * Clef qui représente l'option (c'est celle enregistrée dans le fichier de configuration). */ protected final String key; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm