December 2009 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r1726 - trunk
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:39 +0100 (Wed, 23 Dec 2009) New Revision: 1726 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-23 13:20:35 UTC (rev 1725) +++ trunk/pom.xml 2009-12-23 13:20:39 UTC (rev 1726) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> <dependencies> @@ -154,9 +154,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1725 - in tags: . nuiton-utils-1.1.2
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:35 +0100 (Wed, 23 Dec 2009) New Revision: 1725 Added: tags/nuiton-utils-1.1.2/ Log: [maven-scm] copy for tag nuiton-utils-1.1.2 Property changes on: tags/nuiton-utils-1.1.2 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1724 - trunk
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:30 +0100 (Wed, 23 Dec 2009) New Revision: 1724 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-utils-1.1.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-21 15:28:44 UTC (rev 1723) +++ trunk/pom.xml 2009-12-23 13:20:30 UTC (rev 1724) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> <dependencies> @@ -155,9 +154,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1723 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 21 Dec '09

21 Dec '09

Author: echatellier Date: 2009-12-21 16:28:44 +0100 (Mon, 21 Dec 2009) New Revision: 1723 Modified: trunk/src/main/java/org/nuiton/util/package.html Log: Fix title Modified: trunk/src/main/java/org/nuiton/util/package.html =================================================================== --- trunk/src/main/java/org/nuiton/util/package.html 2009-12-19 15:30:53 UTC (rev 1722) +++ trunk/src/main/java/org/nuiton/util/package.html 2009-12-21 15:28:44 UTC (rev 1723) @@ -1,6 +1,6 @@ <html> <body> - <h1>Lutin util</h1> + <h1>Nuiton-utils</h1> Ensemble de classe Java permettant de simplifier le développement en factorisant des besoins que l'on retrouve dans tous les développement. On y trouve de fontion de travail sur les chaînes de caractères. Des

1 0

r1722 - trunk
by tchemit＠users.nuiton.org 19 Dec '09

19 Dec '09

Author: tchemit Date: 2009-12-19 16:30:53 +0100 (Sat, 19 Dec 2009) New Revision: 1722 Modified: trunk/pom.xml Log: use i18n 1.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 13:36:15 UTC (rev 1721) +++ trunk/pom.xml 2009-12-19 15:30:53 UTC (rev 1722) @@ -103,7 +103,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1721 - trunk
by tchemit＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:36:15 +0100 (Fri, 18 Dec 2009) New Revision: 1721 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-17 16:50:05 UTC (rev 1720) +++ trunk/pom.xml 2009-12-18 13:36:15 UTC (rev 1721) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1720 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:50:05 +0100 (Thu, 17 Dec 2009) New Revision: 1720 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Revert from previous change : keep old config emplacment for user : $HOME/.[filename]. Will be done for a future version. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:36:57 UTC (rev 1719) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:50:05 UTC (rev 1720) @@ -274,12 +274,10 @@ /** file /etc/[filename] */ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ - @Deprecated - String userPath1 = getUserHome() + File.separator + "."; + //@Deprecated + String userPath = getUserHome() + File.separator + "."; /** file $user.home/.local/[filename] */ - String userPath2 = getUserHome() + File.separator + ".config" + File.separator; - //String userPath = getUserHome() + File.separator + ".local" + - // /*File.separator + "share" + File.separator + "applications" + */File.separator; + //String userPath2 = getUserHome() + File.separator + ".config" + File.separator; /** vrai si on est en train de parser les options de la ligne de commande */ protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); @@ -470,7 +468,7 @@ * @param excludeKeys optional list of keys to exclude from */ public void saveForUser(String... excludeKeys) { - File file = new File(userPath2 + getConfigFileName()); + File file = new File(userPath + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -967,16 +965,20 @@ etcfile.load(etcConfig.toURI().toURL().openStream()); } - File homeConfig1 = new File(userPath1 + filename); - File homeConfig2 = new File(userPath2 + filename); - if (!homeConfig2.exists() && homeConfig1.exists()) { - log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); - homeConfig1.renameTo(homeConfig2); + File homeConfig = new File(userPath + filename); + if (homeConfig.exists()) { + log.info("Chargement du fichier de config: " + homeConfig); + homefile.load(homeConfig.toURI().toURL().openStream()); } - if (homeConfig2.exists()) { - log.info("Chargement du fichier de config: " + homeConfig2); - homefile.load(homeConfig2.toURI().toURL().openStream()); - } +// File homeConfig2 = new File(userPath2 + filename); +// if (!homeConfig2.exists() && homeConfig1.exists()) { +// log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); +// homeConfig1.renameTo(homeConfig2); +// } +// if (homeConfig2.exists()) { +// log.info("Chargement du fichier de config: " + homeConfig2); +// homefile.load(homeConfig2.toURI().toURL().openStream()); +// } // file $CURDIR/filename File config = new File(filename);

1 0

r1719 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:36:57 +0100 (Thu, 17 Dec 2009) New Revision: 1719 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Evol #161 : Change default folder for user configuration. Move previous file config. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:35:54 UTC (rev 1718) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:36:57 UTC (rev 1719) @@ -274,10 +274,12 @@ /** file /etc/[filename] */ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ - //String userPath = getUserHome() + File.separator + "."; + @Deprecated + String userPath1 = getUserHome() + File.separator + "."; /** file $user.home/.local/[filename] */ - String userPath = getUserHome() + File.separator + ".local" + - /*File.separator + "share" + File.separator + "applications" + */File.separator; + String userPath2 = getUserHome() + File.separator + ".config" + File.separator; + //String userPath = getUserHome() + File.separator + ".local" + + // /*File.separator + "share" + File.separator + "applications" + */File.separator; /** vrai si on est en train de parser les options de la ligne de commande */ protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); @@ -468,7 +470,7 @@ * @param excludeKeys optional list of keys to exclude from */ public void saveForUser(String... excludeKeys) { - File file = new File(userPath + getConfigFileName()); + File file = new File(userPath2 + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -965,11 +967,16 @@ etcfile.load(etcConfig.toURI().toURL().openStream()); } - File homeConfig = new File(userPath + filename); - if (homeConfig.exists()) { - log.info("Chargement du fichier de config: " + homeConfig); - homefile.load(homeConfig.toURI().toURL().openStream()); + File homeConfig1 = new File(userPath1 + filename); + File homeConfig2 = new File(userPath2 + filename); + if (!homeConfig2.exists() && homeConfig1.exists()) { + log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); + homeConfig1.renameTo(homeConfig2); } + if (homeConfig2.exists()) { + log.info("Chargement du fichier de config: " + homeConfig2); + homefile.load(homeConfig2.toURI().toURL().openStream()); + } // file $CURDIR/filename File config = new File(filename);

1 0

r1718 - trunk/src/site/apt
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:35:54 +0100 (Thu, 17 Dec 2009) New Revision: 1718 Modified: trunk/src/site/apt/nuitonUtil.apt Log: Add ref in maven-site for DateUtils and PeriodDates Modified: trunk/src/site/apt/nuitonUtil.apt =================================================================== --- trunk/src/site/apt/nuitonUtil.apt 2009-12-17 15:44:25 UTC (rev 1717) +++ trunk/src/site/apt/nuitonUtil.apt 2009-12-17 16:35:54 UTC (rev 1718) @@ -312,3 +312,11 @@ ** MD5InputStream MD5 dans un flux. + +** DateUtils (since 1.1.2) + + Boîte à outils sur les dates (plus spécialisé que org.apache.commons.lang.DateUils) + +** PeriodDates (since 1.1.2) + + Objet correspondant à une période entre deux dates avec contraintes et méthodes utilitaires.

1 0

r1717 - trunk/src/site/apt
by echatellier＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: echatellier Date: 2009-12-17 16:44:25 +0100 (Thu, 17 Dec 2009) New Revision: 1717 Modified: trunk/src/site/apt/Warlauncher.apt Log: Fix doc Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2009-12-17 15:34:04 UTC (rev 1716) +++ trunk/src/site/apt/Warlauncher.apt 2009-12-17 15:44:25 UTC (rev 1717) @@ -14,8 +14,8 @@ * Prerequisites - By default, winstone look for an icon named <<favicon.png>> or <<favicon.jpg>>. - Il none of this icon is found, system tray won't work. + By default, both jetty and winstone look for an icon named <<favicon.png>> or + <<favicon.jpg>>. If none of this icons is found, system tray won't work. * Use Winstone war launcher

1 0