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

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

29 Jul '14

Author: echatellier Date: 2014-07-29 17:03:43 +0200 (Tue, 29 Jul 2014) New Revision: 2605 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2605 Log: Fix bpoussin login Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 14:55:53 UTC (rev 2604) +++ trunk/pom.xml 2014-07-29 15:03:43 UTC (rev 2605) @@ -20,7 +20,7 @@ <developer> <name>Benjamin Poussin</name> - <id>bleny</id> + <id>bpoussin</id> <email>poussin at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl>

1 0

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

29 Jul '14

Author: tchemit Date: 2014-07-29 16:55:53 +0200 (Tue, 29 Jul 2014) New Revision: 2604 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2604 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-15 15:58:43 UTC (rev 2603) +++ trunk/pom.xml 2014-07-29 14:55:53 UTC (rev 2604) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>nuiton-config</artifactId> @@ -33,7 +33,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit.codelutin.com</email> + <email>chemit(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone>

1 0

r2603 - in trunk: . src/site
by tchemit＠users.nuiton.org 15 Jul '14

15 Jul '14

Author: tchemit Date: 2014-07-15 17:58:43 +0200 (Tue, 15 Jul 2014) New Revision: 2603 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2603 Log: refs-80 #3325: Updates to mavenpom 5.1 and use new site layout (need to migrate old sites) Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-30 17:03:47 UTC (rev 2602) +++ trunk/pom.xml 2014-07-15 15:58:43 UTC (rev 2603) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.7</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>nuiton-config</artifactId> @@ -13,7 +13,7 @@ <name>Nuiton Config</name> <description>Simple Application config API</description> - <url>https://maven-site.nuiton.org/nuiton-config</url> + <url>https://doc.nuiton.org/nuiton-config</url> <inceptionYear>2013</inceptionYear> <developers> @@ -33,7 +33,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit.codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -55,8 +55,8 @@ </scm> <distributionManagement> <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -79,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-2</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-06-30 17:03:47 UTC (rev 2602) +++ trunk/src/site/site_fr.xml 2014-07-15 15:58:43 UTC (rev 2603) @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <links> @@ -82,6 +82,8 @@ <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" + href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur">

1 0

r2602 - trunk/src/main/java/org/nuiton/config
by bpoussin＠users.nuiton.org 30 Jun '14

30 Jun '14

Author: bpoussin Date: 2014-06-30 19:03:47 +0200 (Mon, 30 Jun 2014) New Revision: 2602 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2602 Log: - extract class SubApplicationConfig from ApplicationConfig. - add new methode ApplicationConfig.getConfig(Map) to permit to overwrite config value with value in map Added: 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/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-02-04 09:54:14 UTC (rev 2601) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-06-30 17:03:47 UTC (rev 2602) @@ -1351,6 +1351,17 @@ } /** + * Return new ApplicationConfig with overwrite use as value for option + * if found in it. Otherwise return value found in this config + * + * @param overwrite + * @return + */ + public ApplicationConfig getConfig(Map<String, String> overwrite) { + return new OverwriteApplicationConfig(this, overwrite); + } + + /** * Returns a sub config that encapsulate this ApplicationConfig. * * @param prefix prefix to put automaticaly at beginning of all key @@ -2241,174 +2252,7 @@ } }; - /** - * Permet de masquer un prefix. Il est possible d'avoir des valeurs par - * defaut. Par exemple: - * <pre> - * monOption=toto - * monPrefix.monOption=titi - * </pre> - * <p/> - * <li>Si on cree le subApp avec le prefix "monPrefix." et qu'on demande la valeur - * de "monOption", la valeur retournee est "titi". - * <li>Si on cree le subApp avec le prefix "monAutrePrefix." et qu'on demande la valeur - * de "monOption", la valeur retournee est "toto" (valeur par defaut de monOption. - * <p/> - * Certaines methodes retournees ne sont pas - * surchargee et ne masque pas le prefix: - * <li>getOptions() - * - * @since 2.4.9 - */ - public static class SubApplicationConfig extends ApplicationConfig { - protected ApplicationConfig parent; - - protected String prefix; - - public SubApplicationConfig(ApplicationConfig parent, String prefix) { - this.parent = parent; - this.prefix = prefix; - } - - @Override - protected void init(Properties defaults, String configFilename) { - // do nothing - } - - public ApplicationConfig getParent() { - return parent; - } - - public String getPrefix() { - return prefix; - } - - @Override - public Properties getOptions() { - return getParent().getOptions(); - } - - @Override - public void setDefaultOption(String key, String value) { - getParent().setDefaultOption(getPrefix() + key, value); - } - - @Override - public boolean hasOption(String key) { - boolean result = getOption(key) != null; - return result; - } - - @Override - public void setOption(String key, String value) { - getParent().setOption(getPrefix() + key, value); - } - - /** - * Surcharge pour recherche la cle avec le prefix. Si on ne la retrouve - * pas, on recherche sans le prefix pour permettre d'avoir des valeurs - * par defaut. - * - * @param key La cle de l'option - * @return l'option trouvé avec le prefix ou sinon celle sans le prefix - * si pas trouvé. - */ - @Override - public String getOption(String key) { - String result = getParent().getOption(getPrefix() + key); - if (result == null) { - result = getParent().getOption(key); - } - return result; - } - - /** - * Surcharge de la methode pour que les options commencant par le prefix - * soit modifiee pour qu'elle est la meme cle sans le prefix. Le but - * est de garder les autres options et si une option avait le meme nom - * qu'elle soit effacee par celle dont on a supprime le prefix - * - * @param replaceInner le prefix à remplacer - * @return les options commencant par le prefix - * soit modifiee pour qu'elle est la meme cle sans le prefix. Le but - * est de garder les autres options et si une option avait le meme nom - * qu'elle soit effacee par celle dont on a supprime le prefix - */ - @Override - public Properties getFlatOptions(boolean replaceInner) { - Properties result = getParent().getFlatOptions(replaceInner); - Properties tmp = new Properties(); - int lenght = getPrefix().length(); - for (Map.Entry e : result.entrySet()) { - String k = (String) e.getKey(); - if (k.startsWith(getPrefix())) { - k = k.substring(lenght); - String v = (String) e.getValue(); - tmp.setProperty(k, v); - } - } - result.putAll(tmp); - return result; - } - - /** - * Surcharge pour recupere les valeurs commencant par le prefix demande - * en plus du prefix 'sub'. Les options sont ensuite fusionnee pour - * permettre aussi les valeurs par defaut - * - * @param prefix prefix to use - * @return les valeurs commençant par le prefix demandé en plus du - * prefix 'sub'. - */ - @Override - public Properties getOptionStartsWith(String prefix) { - Properties result = getParent().getOptionStartsWith(prefix); - Properties tmp = getParent().getOptionStartsWith(getPrefix() + prefix); - int lenght = getPrefix().length(); - for (Map.Entry e : tmp.entrySet()) { - String k = (String) e.getKey(); - k = k.substring(lenght); - String v = (String) e.getValue(); - // on ajout/ecrase les valeurs de result - result.setProperty(k, v); - } - return result; - } - - @Override - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - if (propertyName.startsWith(getPrefix())) { - propertyName = propertyName.substring(getPrefix().length()); - getParent().firePropertyChange(propertyName, oldValue, newValue); - } // else not fire event - } - - @Override - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - getParent().addPropertyChangeListener(getPrefix() + propertyName, listener); - } - - @Override - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - getParent().removePropertyChangeListener(getPrefix() + propertyName, listener); - } - - @Override - public boolean hasListeners(String propertyName) { - return getParent().hasListeners(getPrefix() + propertyName); - } - - // methode interdite dans le sub - - @Override - public ApplicationConfig parse(String... args) throws ArgumentsParserException { - throw new UnsupportedOperationException("This method is not supported in SubApplicationConfig"); - } - - - } - /** * Defines a runtime action to be launched via the {@link #doAction()} * method. Added: trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java (rev 0) +++ trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java 2014-06-30 17:03:47 UTC (rev 2602) @@ -0,0 +1,72 @@ +package org.nuiton.config; + + +import java.util.Map; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Permet d'avoir une liste de configuration dans lequel on va chercher les valeurs + * avant de regarder dans les valeurs de la configuration + * + * @see ApplicationConfig#getConfig(Map) + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class OverwriteApplicationConfig extends ApplicationConfig { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(OverwriteApplicationConfig.class); + + protected ApplicationConfig parent; + protected Map<String, String> overwrite; + + public OverwriteApplicationConfig(ApplicationConfig parent, Map<String, String> overwrite) { + this.parent = parent; + this.overwrite = overwrite; + } + + @Override + protected void init(Properties defaults, String configFilename) { + // do nothing + } + + public ApplicationConfig getParent() { + return parent; + } + + @Override + public String getOption(String key) { + String value = overwrite.get(key); + // on est oblige de faire un get, car le containsKey n'est pas recursif + // sur tous les properties si Map est un Properties + + if (value != null) { + value = overwrite.get(key); + // replace ${xxx} + value = replaceRecursiveOptions(value); + } else { + value = parent.getOption(key); + } + + return value; + } + + @Override + public boolean hasOption(String key) { + boolean result = getOption(key) != null; + return result; + } + + // methode interdite dans le sub + @Override + public ApplicationConfig parse(String... args) throws ArgumentsParserException { + throw new UnsupportedOperationException("This method is not supported in OverwriteApplicationConfig"); + } + +} Property changes on: trunk/src/main/java/org/nuiton/config/OverwriteApplicationConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java (rev 0) +++ trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java 2014-06-30 17:03:47 UTC (rev 2602) @@ -0,0 +1,171 @@ +package org.nuiton.config; + + +import java.beans.PropertyChangeListener; +import java.util.Map; +import java.util.Properties; + +/** + * Permet de masquer un prefix. Il est possible d'avoir des valeurs par + * defaut. Par exemple: + * <pre> + * monOption=toto + * monPrefix.monOption=titi + * </pre> + * <p/> + * <li>Si on cree le subApp avec le prefix "monPrefix." et qu'on demande la valeur + * de "monOption", la valeur retournee est "titi". + * <li>Si on cree le subApp avec le prefix "monAutrePrefix." et qu'on demande la valeur + * de "monOption", la valeur retournee est "toto" (valeur par defaut de monOption. + * <p/> + * Certaines methodes retournees ne sont pas + * surchargee et ne masque pas le prefix: + * <li>getOptions() + * + * @since 2.4.9 + */ +public class SubApplicationConfig extends ApplicationConfig { + + protected ApplicationConfig parent; + protected String prefix; + + public SubApplicationConfig(ApplicationConfig parent, String prefix) { + this.parent = parent; + this.prefix = prefix; + } + + @Override + protected void init(Properties defaults, String configFilename) { + // do nothing + } + + public ApplicationConfig getParent() { + return parent; + } + + public String getPrefix() { + return prefix; + } + + @Override + public Properties getOptions() { + return getParent().getOptions(); + } + + @Override + public void setDefaultOption(String key, String value) { + getParent().setDefaultOption(getPrefix() + key, value); + } + + @Override + public boolean hasOption(String key) { + boolean result = getOption(key) != null; + return result; + } + + @Override + public void setOption(String key, String value) { + getParent().setOption(getPrefix() + key, value); + } + + /** + * Surcharge pour recherche la cle avec le prefix. Si on ne la retrouve + * pas, on recherche sans le prefix pour permettre d'avoir des valeurs + * par defaut. + * + * @param key La cle de l'option + * @return l'option trouvé avec le prefix ou sinon celle sans le prefix + * si pas trouvé. + */ + @Override + public String getOption(String key) { + String result = getParent().getOption(getPrefix() + key); + if (result == null) { + result = getParent().getOption(key); + } + return result; + } + + /** + * Surcharge de la methode pour que les options commencant par le prefix + * soit modifiee pour qu'elle est la meme cle sans le prefix. Le but + * est de garder les autres options et si une option avait le meme nom + * qu'elle soit effacee par celle dont on a supprime le prefix + * + * @param replaceInner le prefix à remplacer + * @return les options commencant par le prefix + * soit modifiee pour qu'elle est la meme cle sans le prefix. Le but + * est de garder les autres options et si une option avait le meme nom + * qu'elle soit effacee par celle dont on a supprime le prefix + */ + @Override + public Properties getFlatOptions(boolean replaceInner) { + Properties result = getParent().getFlatOptions(replaceInner); + Properties tmp = new Properties(); + int lenght = getPrefix().length(); + for (Map.Entry e : result.entrySet()) { + String k = (String) e.getKey(); + if (k.startsWith(getPrefix())) { + k = k.substring(lenght); + String v = (String) e.getValue(); + tmp.setProperty(k, v); + } + } + result.putAll(tmp); + return result; + } + + /** + * Surcharge pour recupere les valeurs commencant par le prefix demande + * en plus du prefix 'sub'. Les options sont ensuite fusionnee pour + * permettre aussi les valeurs par defaut + * + * @param prefix prefix to use + * @return les valeurs commençant par le prefix demandé en plus du + * prefix 'sub'. + */ + @Override + public Properties getOptionStartsWith(String prefix) { + Properties result = getParent().getOptionStartsWith(prefix); + Properties tmp = getParent().getOptionStartsWith(getPrefix() + prefix); + int lenght = getPrefix().length(); + for (Map.Entry e : tmp.entrySet()) { + String k = (String) e.getKey(); + k = k.substring(lenght); + String v = (String) e.getValue(); + // on ajout/ecrase les valeurs de result + result.setProperty(k, v); + } + return result; + } + + @Override + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + if (propertyName.startsWith(getPrefix())) { + propertyName = propertyName.substring(getPrefix().length()); + getParent().firePropertyChange(propertyName, oldValue, newValue); + } // else not fire event + } + + @Override + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + getParent().addPropertyChangeListener(getPrefix() + propertyName, listener); + } + + @Override + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + getParent().removePropertyChangeListener(getPrefix() + propertyName, listener); + } + + @Override + public boolean hasListeners(String propertyName) { + return getParent().hasListeners(getPrefix() + propertyName); + } + + // methode interdite dans le sub + @Override + public ApplicationConfig parse(String... args) throws ArgumentsParserException { + throw new UnsupportedOperationException("This method is not supported in SubApplicationConfig"); + } + +} Property changes on: trunk/src/main/java/org/nuiton/config/SubApplicationConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

[ANN] - Nuiton Config 3.0-alpha-2 released
by nuiton.org Release Notification 04 Feb '14

04 Feb '14

The Nuiton Config team is pleased to announce the nuiton-config-3.0-alpha-2 release! Simple Application config API Documentation of the project can be found here: https://maven-site.nuiton.org/nuiton-config Changes ------- Changes in this version include: Changes: o updates nuiton-utils to 3.0 Issue: 3035. Thanks to Tony Chemit. Resolved by tchemit. o updates commons-collections to 4 Issue: 3036. Thanks to Tony Chemit. Resolved by tchemit. o Updates mavenpom to 4.7 Issue: 3034. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://nuiton.org/projects/nuiton-config/files * nuiton-config-3.0-alpha-2-deps.zip - https://nuiton.org/attachments/download/994 * nuiton-config-3.0-alpha-2-full.zip - https://nuiton.org/attachments/download/995 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

r2601 - trunk
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 10:54:14 +0100 (Tue, 04 Feb 2014) New Revision: 2601 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2601 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 09:54:12 UTC (rev 2600) +++ trunk/pom.xml 2014-02-04 09:54:14 UTC (rev 2601) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-2</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://nuiton.org/svn/nuiton-config/tags/nuiton-config-3.0-alpha-2 + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-config/tags/nuiton-config-3.0-alpha-2 + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </developerConnection> - <url>https://nuiton.org/projects/nuiton-config/repository/show/tags/nuiton-confi…</url> + <url>https://nuiton.org/projects/nuiton-config/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2600 - in tags: . nuiton-config-3.0-alpha-2
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 10:54:12 +0100 (Tue, 04 Feb 2014) New Revision: 2600 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2600 Log: [maven-release-plugin] copy for tag nuiton-config-3.0-alpha-2 Added: tags/nuiton-config-3.0-alpha-2/ Property changes on: tags/nuiton-config-3.0-alpha-2 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2599 - trunk
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 10:54:08 +0100 (Tue, 04 Feb 2014) New Revision: 2599 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2599 Log: [maven-release-plugin] prepare release nuiton-config-3.0-alpha-2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 09:45:13 UTC (rev 2598) +++ trunk/pom.xml 2014-02-04 09:54:08 UTC (rev 2599) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-2</version> <name>Nuiton Config</name> <description>Simple Application config API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:https://nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/tags/nuiton-config-3.0-alpha-2 </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/tags/nuiton-config-3.0-alpha-2 </developerConnection> - <url>https://nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-config/repository/show/tags/nuiton-confi…</url> </scm> <distributionManagement> <site>

1 0

r2598 - trunk
by tchemit＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: tchemit Date: 2014-02-04 10:45:13 +0100 (Tue, 04 Feb 2014) New Revision: 2598 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2598 Log: fixes #3034: Updates mavenpom to 4.7 fixes #3035: updates nuiton-utils to 3.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 06:38:32 UTC (rev 2597) +++ trunk/pom.xml 2014-02-04 09:45:13 UTC (rev 2598) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.6</version> + <version>4.7</version> </parent> <artifactId>nuiton-config</artifactId> @@ -13,7 +13,7 @@ <name>Nuiton Config</name> <description>Simple Application config API</description> - <url>http://maven-site.nuiton.org/nuiton-config</url> + <url>https://maven-site.nuiton.org/nuiton-config</url> <inceptionYear>2013</inceptionYear> <developers> @@ -79,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-rc-2</version> </dependency> <dependency>

1 0

r2597 - in trunk: . src/main/java/org/nuiton/config src/site
by tchemit＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: tchemit Date: 2014-02-04 07:38:32 +0100 (Tue, 04 Feb 2014) New Revision: 2597 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2597 Log: fixes #3034: Updates mavenpom to 4.6 fixes #3036: updates commons-collections to 4 refs #3035: updates nuiton-utils to 3.0 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/config/ApplicationConfig.java trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/LICENSE.txt 2014-02-04 06:38:32 UTC (rev 2597) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/pom.xml 2014-02-04 06:38:32 UTC (rev 2597) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>nuiton-config</artifactId> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-config/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -79,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> @@ -93,8 +93,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-02-04 06:38:32 UTC (rev 2597) @@ -25,7 +25,7 @@ */ import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.collections4.EnumerationUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/src/site/site_fr.xml 2014-02-04 06:38:32 UTC (rev 2597) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <links> @@ -93,7 +93,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -102,7 +102,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>

1 0