February 2013 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r2495 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org 13 Feb '13

13 Feb '13

Author: bpoussin Date: 2013-02-13 18:06:59 +0100 (Wed, 13 Feb 2013) New Revision: 2495 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2495 Log: fixes #2525: [ApplicationConfig] Env variable don't support dot in name. Dot must be replaced by underscore '_' for env variable Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2013-02-13 16:52:46 UTC (rev 2494) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2013-02-13 17:06:59 UTC (rev 2495) @@ -371,8 +371,35 @@ protected Properties curfile = new Properties(homefile); /** TODO */ - protected Properties env = new Properties(curfile); + protected Properties env = new Properties(curfile){ + /** + * Environnement variables can't contains dot (bash, csh, ...). Dots are + * replaced by underscore (_) to find property if property is not find + * with dot + */ + @Override + public synchronized Object get(Object key) { + Object result = super.get(key); + if (result == null && key instanceof String) { + String skey = (String)key; + skey = skey.replace(".", "_"); + result = super.get(skey); + } + return result; + } + /** + * override to use get(key) and not super.get(key) as in initial implementation :( + */ + @Override + public String getProperty(String key) { + Object oval = get(key); + String sval = (oval instanceof String) ? (String)oval : null; + return ((sval == null) && (defaults != null)) ? defaults.getProperty(key) : sval; + } + + }; + /** TODO */ protected Properties jvm = new Properties(env); Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2013-02-13 16:52:46 UTC (rev 2494) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2013-02-13 17:06:59 UTC (rev 2495) @@ -506,6 +506,20 @@ } /** + * test if dot is replaced with _ if properties is not found with dot in env + * @throws ArgumentsParserException + */ + @Test + public void testEnvProperties() throws ArgumentsParserException { + ApplicationConfig instance = new ApplicationConfig(); + // simulate env variable with _ to replace dot + instance.env.put("test_env", "value"); + + String value = instance.getOption("test.env"); + Assert.assertEquals("value", value); + } + + /** * Test unparsed options * * @throws Exception

1 0

r2494 - in trunk/nuiton-utils/src/test: java/org/nuiton/util resources/properties
by bpoussin＠users.nuiton.org 13 Feb '13

13 Feb '13

Author: bpoussin Date: 2013-02-13 17:52:46 +0100 (Wed, 13 Feb 2013) New Revision: 2494 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2494 Log: update file for network test on new test.application.nuiton.org domain add more information when update faild Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetworkAuthTest.properties Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java 2013-02-01 07:52:44 UTC (rev 2493) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java 2013-02-13 16:52:46 UTC (rev 2494) @@ -62,7 +62,7 @@ for (Map.Entry<String, Exception> e : appUpdateError.entrySet()) { log.info(String.format("Error during update for application '%s'", e.getKey()), e.getValue()); } - Assert.assertTrue(appUpdateError.isEmpty()); + Assert.assertTrue("Error: " + appUpdateError, appUpdateError.isEmpty()); } public void aborted(String propertiesURL, Exception eee) { Modified: trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetworkAuthTest.properties =================================================================== --- trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetworkAuthTest.properties 2013-02-01 07:52:44 UTC (rev 2493) +++ trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetworkAuthTest.properties 2013-02-13 16:52:46 UTC (rev 2494) @@ -22,11 +22,11 @@ # #L% ### App1.version=0.3 -App1.url=zip:http://ApplicationUpdate.nuiton.org/App1-0.3.zip +App1.url=zip:http://test.ApplicationUpdate.nuiton.org/App1-0.3.zip App1.auth=true linux.App3.version=8 -linux.App3.url=zip:http://ApplicationUpdate.nuiton.org/App3-7.zip +linux.App3.url=zip:http://test.ApplicationUpdate.nuiton.org/App3-7.zip linux.App3.auth=true linux.amd64.App2.version=7 -linux.amd64.App2.url=zip:http://ApplicationUpdate.nuiton.org/App2-7.zip +linux.amd64.App2.url=zip:http://test.ApplicationUpdate.nuiton.org/App2-7.zip linux.amd64.App2.auth=true

1 0

r2493 - in trunk: . nuiton-csv nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 01 Feb '13

01 Feb '13

Author: maven-release Date: 2013-02-01 08:52:44 +0100 (Fri, 01 Feb 2013) New Revision: 2493 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2493 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-02-01 07:52:42 UTC (rev 2492) +++ trunk/nuiton-csv/pom.xml 2013-02-01 07:52:44 UTC (rev 2493) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7</version> + <version>2.7-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-02-01 07:52:42 UTC (rev 2492) +++ trunk/nuiton-utils/pom.xml 2013-02-01 07:52:44 UTC (rev 2493) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7</version> + <version>2.7-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-01 07:52:42 UTC (rev 2492) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-01 07:52:44 UTC (rev 2493) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7</version> + <version>2.7-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-02-01 07:52:42 UTC (rev 2492) +++ trunk/nuiton-validator/pom.xml 2013-02-01 07:52:44 UTC (rev 2493) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7</version> + <version>2.7-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-01 07:52:42 UTC (rev 2492) +++ trunk/pom.xml 2013-02-01 07:52:44 UTC (rev 2493) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7</version> + <version>2.7-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -331,12 +331,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.7 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.7 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2492 - in tags: . nuiton-utils-2.6.7
by maven-release＠users.nuiton.org 01 Feb '13

01 Feb '13

Author: maven-release Date: 2013-02-01 08:52:42 +0100 (Fri, 01 Feb 2013) New Revision: 2492 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2492 Log: [maven-release-plugin] copy for tag nuiton-utils-2.6.7 Added: tags/nuiton-utils-2.6.7/ Property changes on: tags/nuiton-utils-2.6.7 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2491 - in trunk: . nuiton-csv nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 01 Feb '13

01 Feb '13

Author: maven-release Date: 2013-02-01 08:52:39 +0100 (Fri, 01 Feb 2013) New Revision: 2491 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2491 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.7 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-01-31 23:52:09 UTC (rev 2490) +++ trunk/nuiton-csv/pom.xml 2013-02-01 07:52:39 UTC (rev 2491) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-01-31 23:52:09 UTC (rev 2490) +++ trunk/nuiton-utils/pom.xml 2013-02-01 07:52:39 UTC (rev 2491) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-01-31 23:52:09 UTC (rev 2490) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-01 07:52:39 UTC (rev 2491) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-01-31 23:52:09 UTC (rev 2490) +++ trunk/nuiton-validator/pom.xml 2013-02-01 07:52:39 UTC (rev 2491) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-31 23:52:09 UTC (rev 2490) +++ trunk/pom.xml 2013-02-01 07:52:39 UTC (rev 2491) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> <modules> <module>nuiton-utils</module> @@ -331,12 +331,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.7 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.7 </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> </scm> <distributionManagement>

1 0