- Nuiton-config-commits - mailman.cloud.codelutin.com

r2614 - in trunk/src: main/java/org/nuiton/config test/java/org/nuiton/config test/resources
by tchemit＠users.nuiton.org 30 Jul '14

30 Jul '14

Author: tchemit Date: 2014-07-30 15:16:00 +0200 (Wed, 30 Jul 2014) New Revision: 2614 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2614 Log: fixes #3292: Setting application name requires to provide encoding Added: trunk/src/test/java/org/nuiton/config/ChangeApplicationNameTest.java trunk/src/test/resources/wao.properties Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-30 09:12:25 UTC (rev 2613) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-30 13:16:00 UTC (rev 2614) @@ -990,7 +990,30 @@ * @since 1.2.1 */ public void setAppName(String appName) { + + // encoding option can use appName as prefix + // so a side effect is to have + String oldEncoding = getEncoding(); + + // config gile option can use appName as prefix + String oldConfigFile = getConfigFileName(); setDefaultOption(APP_NAME, appName); + + String newEncoding = getEncoding(); + String newConfigFile = getConfigFileName(); + if (newEncoding == null) { + + // push back old encoding + setEncoding(oldEncoding); + + } + if (newConfigFile == null) { + + // push back old config file + setConfigFileName(oldConfigFile); + + } + } /** Added: trunk/src/test/java/org/nuiton/config/ChangeApplicationNameTest.java =================================================================== --- trunk/src/test/java/org/nuiton/config/ChangeApplicationNameTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/config/ChangeApplicationNameTest.java 2014-07-30 13:16:00 UTC (rev 2614) @@ -0,0 +1,101 @@ +package org.nuiton.config; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Created on 7/30/14. + * + * Check fix of https://forge.nuiton.org/issues/3292 + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 3.0 + */ +public class ChangeApplicationNameTest { + + enum WaoApplicationConfigOption implements ConfigOptionDef { + INSTANCE_URL("wao.instanceUrl", + "URL à laquelle on peut accéder à l'instance de WAO", + "http://localhost:8080/wao", String.class); + + protected final String key; + + protected final String description; + + protected final Class<?> type; + + protected String defaultValue; + + private WaoApplicationConfigOption(String key, String description, + String defaultValue, Class<?> type) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public boolean isTransient() { + return false; + } + + @Override + public boolean isFinal() { + return false; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean isTransient) { + // Nothing to do + } + + @Override + public void setFinal(boolean isFinal) { + // Nothing to do + } + + } + + @Test + public void changeApplicationName() throws ArgumentsParserException { + + ApplicationConfig applicationConfig = new ApplicationConfig(); + + // to allow using wao.config.path environment variable + applicationConfig.setAppName("wao"); + + applicationConfig.loadDefaultOptions(WaoApplicationConfigOption.values()); + applicationConfig.setConfigFileName("wao.properties"); + + applicationConfig.parse(); + + // This option is overidde by the config file + String option = applicationConfig.getOption(String.class, WaoApplicationConfigOption.INSTANCE_URL.key); + Assert.assertEquals("http://localhost:9090/wao", option); + } +} Property changes on: trunk/src/test/java/org/nuiton/config/ChangeApplicationNameTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/src/test/resources/wao.properties =================================================================== --- trunk/src/test/resources/wao.properties (rev 0) +++ trunk/src/test/resources/wao.properties 2014-07-30 13:16:00 UTC (rev 2614) @@ -0,0 +1 @@ +wao.instanceUrl=http://localhost:9090/wao \ No newline at end of file Property changes on: trunk/src/test/resources/wao.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r2613 - in trunk/src: main/java/org/nuiton/config test/java/org/nuiton/config
by tchemit＠users.nuiton.org 30 Jul '14

30 Jul '14

Author: tchemit Date: 2014-07-30 11:12:25 +0200 (Wed, 30 Jul 2014) New Revision: 2613 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2613 Log: fixes #3371: Use new org.nuiton.util.version.Version object instead of the deprecated org.nuiton.util.Version Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java trunk/src/test/java/org/nuiton/config/ApplicationConfigTest.java Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-30 09:10:41 UTC (rev 2612) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-30 09:12:25 UTC (rev 2613) @@ -34,7 +34,7 @@ import org.nuiton.util.ObjectUtil; import org.nuiton.util.RecursiveProperties; import org.nuiton.util.SortedProperties; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import org.nuiton.converter.ConverterUtil; import javax.swing.KeyStroke; Modified: trunk/src/test/java/org/nuiton/config/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/config/ApplicationConfigTest.java 2014-07-30 09:10:41 UTC (rev 2612) +++ trunk/src/test/java/org/nuiton/config/ApplicationConfigTest.java 2014-07-30 09:12:25 UTC (rev 2613) @@ -36,9 +36,9 @@ import org.junit.Test; import org.junit.rules.TestName; import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; import org.nuiton.config.ApplicationConfig.Action; +import org.nuiton.util.version.VersionBuilder; import java.io.ByteArrayOutputStream; import java.io.File; @@ -599,7 +599,7 @@ // not null version instance.setOption("toto", "1.2"); - expected = VersionUtil.valueOf("1.2"); + expected = VersionBuilder.create("1.2").build(); actual = instance.getOptionAsVersion("toto"); Assert.assertNotNull(actual); Assert.assertEquals(expected, actual);

1 0

r2612 - in trunk: . src/main/java/org/nuiton/config
by tchemit＠users.nuiton.org 30 Jul '14

30 Jul '14

Author: tchemit Date: 2014-07-30 11:10:41 +0200 (Wed, 30 Jul 2014) New Revision: 2612 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2612 Log: fixes #3370: Use nuiton-converter API in stead of deprecated nuiton-utils converter API Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/config/ApplicationConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 15:31:28 UTC (rev 2611) +++ trunk/pom.xml 2014-07-30 09:10:41 UTC (rev 2612) @@ -78,8 +78,14 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-4</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-29 15:31:28 UTC (rev 2611) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-07-30 09:10:41 UTC (rev 2612) @@ -35,7 +35,7 @@ import org.nuiton.util.RecursiveProperties; import org.nuiton.util.SortedProperties; import org.nuiton.util.Version; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import javax.swing.KeyStroke; import java.awt.Color;

1 0

[ANN] - Nuiton Config 3.0-alpha-3 released
by nuiton.org Release Notification 29 Jul '14

29 Jul '14

The Nuiton Config team is pleased to announce the nuiton-config-3.0-alpha-3 release! Simple Application config API Documentation of the project can be found here: https://doc.nuiton.org/nuiton-config Changes ------- Changes in this version include: New features: o add new methode ApplicationConfig.getConfig(Map) to permit to overwrite config value with value in map Issue: 3369. Thanks to Éric Chatellier. Resolved by bpoussin. Downloads --------- For a manual installation, you can download files here: http://forge.nuiton.org/projects/nuiton-config/files * nuiton-config-3.0-alpha-3-deps.zip - http://forge.nuiton.org/attachments/download/1076 * nuiton-config-3.0-alpha-3-full.zip - http://forge.nuiton.org/attachments/download/1077 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|nuiton-config|3.0-alpha… Have fun! -Nuiton Config team

1 0

r2611 - trunk
by maven-release＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: maven-release Date: 2014-07-29 17:31:28 +0200 (Tue, 29 Jul 2014) New Revision: 2611 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2611 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 15:31:25 UTC (rev 2610) +++ trunk/pom.xml 2014-07-29 15:31:28 UTC (rev 2611) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-3</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Config</name> <description>Simple Application config API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-config/tags/nuiton-config-3.0-alpha-3 + scm:svn:https://svn.nuiton.org/nuiton-config/trunk </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-config/tags/nuiton-config-3.0-alpha-3 + scm:svn:https://svn.nuiton.org/nuiton-config/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/tags/nuiton…</url> + <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2610 - in tags: . nuiton-config-3.0-alpha-3
by maven-release＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: maven-release Date: 2014-07-29 17:31:25 +0200 (Tue, 29 Jul 2014) New Revision: 2610 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2610 Log: [maven-release-plugin] copy for tag nuiton-config-3.0-alpha-3 Added: tags/nuiton-config-3.0-alpha-3/ Property changes on: tags/nuiton-config-3.0-alpha-3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2609 - trunk
by maven-release＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: maven-release Date: 2014-07-29 17:31:22 +0200 (Tue, 29 Jul 2014) New Revision: 2609 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2609 Log: [maven-release-plugin] prepare release nuiton-config-3.0-alpha-3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 15:28:19 UTC (rev 2608) +++ trunk/pom.xml 2014-07-29 15:31:22 UTC (rev 2609) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-3</version> <name>Nuiton Config</name> <description>Simple Application config API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-config/trunk + scm:svn:https://svn.nuiton.org/nuiton-config/tags/nuiton-config-3.0-alpha-3 </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-config/trunk + scm:svn:https://svn.nuiton.org/nuiton-config/tags/nuiton-config-3.0-alpha-3 </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/tags/nuiton…</url> </scm> <distributionManagement> <site>

1 0

r2608 - trunk
by echatellier＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 17:28:19 +0200 (Tue, 29 Jul 2014) New Revision: 2608 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2608 Log: Use nuiton-utils release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 15:27:05 UTC (rev 2607) +++ trunk/pom.xml 2014-07-29 15:28:19 UTC (rev 2608) @@ -79,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-rc-4</version> </dependency> <dependency>

1 0

r2607 - trunk/src/main/java/org/nuiton/config
by echatellier＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 17:27:05 +0200 (Tue, 29 Jul 2014) New Revision: 2607 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2607 Log: Add header Modified: trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java 2014-07-29 15:08:14 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java 2014-07-29 15:27:05 UTC (rev 2607) @@ -1,6 +1,28 @@ package org.nuiton.config; +/* + * #%L + * Nuiton Config + * %% + * Copyright (C) 2014 CodeLutin, Benjamin Poussin + * %% + * 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 java.util.Map; import java.util.Properties; import org.apache.commons.logging.Log; Modified: trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java 2014-07-29 15:08:14 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java 2014-07-29 15:27:05 UTC (rev 2607) @@ -1,6 +1,28 @@ package org.nuiton.config; +/* + * #%L + * Nuiton Config + * %% + * Copyright (C) 2014 CodeLutin, Benjamin Poussin + * %% + * 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 java.beans.PropertyChangeListener; import java.util.Map; import java.util.Properties;

1 0

r2606 - trunk
by tchemit＠users.nuiton.org 29 Jul '14

29 Jul '14

Author: tchemit Date: 2014-07-29 17:08:14 +0200 (Tue, 29 Jul 2014) New Revision: 2606 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2606 Log: fixes #3325: Updates to mavenpom 5.1 and use new site layout Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 15:03:43 UTC (rev 2605) +++ trunk/pom.xml 2014-07-29 15:08:14 UTC (rev 2606) @@ -21,7 +21,7 @@ <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> - <email>poussin at codelutin dot com</email> + <email>poussin(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:https://nuiton.org/svn/nuiton-config/trunk + scm:svn:https://svn.nuiton.org/nuiton-config/trunk </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-config/trunk + scm:svn:https://svn.nuiton.org/nuiton-config/trunk </developerConnection> - <url>https://nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0