March 2010 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r1808 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org March 31, 2010

March 31, 2010

Author: fdesbois Date: 2010-03-31 15:58:38 +0200 (Wed, 31 Mar 2010) New Revision: 1808 Log: Evo #433 : add appName option for context on config.file and config.path option --> pollen.config.path Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-29 12:59:53 UTC (rev 1807) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-31 13:58:38 UTC (rev 1808) @@ -265,6 +265,8 @@ /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; + static final public String APP_NAME = "app.name"; + /** * Configuration directory where config path in located. * @@ -613,7 +615,7 @@ */ public void setConfigFileName(String name) { // put in defaults, this permit user to overwrite it on commande line - setDefaultOption(CONFIG_FILE_NAME, name); + setDefaultOption(getConfigFileNameOption(), name); } /** @@ -621,11 +623,30 @@ * @return name of file */ public String getConfigFileName() { - String result = getOption(CONFIG_FILE_NAME); + String result = getOption(getConfigFileNameOption()); return result; } + protected String getConfigFileNameOption() { + String optionName = CONFIG_FILE_NAME; + if (getOption(APP_NAME) != null) { + optionName = getOption(APP_NAME) + "." + optionName; + } + return optionName; + } + /** + * Use appName to add a context in config.file and config.path options. + * Ex for an application named 'pollen' : config.file option becomes + * pollen.config.file + * + * @param appName to use as application context + */ + public void setAppName(String appName) { + setDefaultOption(APP_NAME, appName); + } + + /** * Get configuration file path to use. * * Use (in order) one of the following definition: @@ -638,8 +659,13 @@ * @return path to use with endind {@link File#separator} */ public String getConfigPath() { - String result = getOption(CONFIG_PATH); + // Concat appName to configPath option to specify context for + // application deployment + String appName = getOption(APP_NAME) != null ? + getOption(APP_NAME) + "." : ""; + String result = getOption(appName + CONFIG_PATH); + if (result == null) { result = getSystemConfigurationPath(); } @@ -1205,7 +1231,7 @@ } if (inClasspath != null) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config: " + inClasspath); + log.info("Chargement du fichier de config (classpath) : " + inClasspath); } classpath.load(inClasspath.openStream()); } @@ -1219,7 +1245,7 @@ File etcConfig = new File(getConfigPath(), filename); if (etcConfig.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config: " + etcConfig); + log.info("Chargement du fichier de config (etc) : " + etcConfig); } etcfile.load(etcConfig.toURI().toURL().openStream()); } @@ -1245,7 +1271,7 @@ if (homeConfig.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config: " + homeConfig); + log.info("Chargement du fichier de config (home) : " + homeConfig); } homefile.load(homeConfig.toURI().toURL().openStream()); } @@ -1259,7 +1285,7 @@ File config = new File(filename); if (config.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config: " + config); + log.info("Chargement du fichier de config (curr) : " + config); } curfile.load(config.toURI().toURL().openStream()); }

1 0

r1807 - in trunk/src/main: java/org/nuiton/util resources/i18n
by echatellier＠users.nuiton.org March 29, 2010

March 29, 2010

Author: echatellier Date: 2010-03-29 14:59:53 +0200 (Mon, 29 Mar 2010) New Revision: 1807 Log: Fix: #161 (config directory system and user for windows and unix) #415 (permet de specifier le dossier ou chercher la configuration syst?\195?\168me) Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/main/resources/i18n/nuiton-utils-en_GB.properties trunk/src/main/resources/i18n/nuiton-utils-fr_FR.properties Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-27 20:05:28 UTC (rev 1806) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-29 12:59:53 UTC (rev 1807) @@ -36,6 +36,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; @@ -259,22 +261,36 @@ /** Used to know what is separator between class and method on command line. */ static final private String CLASS_METHOD_SEPARATOR = "#"; - + /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; - + + /** + * Configuration directory where config path in located. + * + * Use default system configuration if nothing is defined: + * <ul> + * <li>Linux : /etc/xxx.properties + * <li>Windows : C:\\Windows\\System32\\xxx.properties + * <li>Mac OS : /etc/ + * </ul> + */ + static final public String CONFIG_PATH = "config.path"; + + /** System os name. (windows, linux, max os x) */ + protected String osName; + protected boolean useOnlyAliases = false; - - protected Map<String, List<String>> aliases = new HashMap<String, List<String>>(); - - /** file /etc/[filename] */ - String systemPath = File.separator + "etc" + File.separator; - /** file $user.home/.[filename] */ - //@Deprecated - String userPath = getUserHome() + File.separator + "."; - /** file $user.home/.local/[filename] */ - //String userPath2 = getUserHome() + File.separator + ".config" + File.separator; + /** + * file $user.home/.[filename] + * + * Not used anymore. Just used for migration issue. + * @deprecated since 1.2.1, and can't be removed (for migration purpose) + */ + @Deprecated + protected String userPath = getUserHome() + File.separator + "."; + /** vrai si on est en train de parser les options de la ligne de commande. */ protected boolean inParseOptionPhase = false; @@ -287,10 +303,14 @@ protected Properties jvm = new Properties(env); protected Properties line = new Properties(jvm); protected Properties options = new Properties(line); + protected Map<String, CacheItem<?>> cacheOption = new HashMap<String, CacheItem<?>>(); protected Map<Class<?>, Object> cacheAction = new HashMap<Class<?>, Object>(); + /** contient apres l'appel de parse, la liste des arguments non utilises */ protected List<String> unparsed = new ArrayList<String>(); + + protected Map<String, List<String>> aliases = new HashMap<String, List<String>>(); protected Map<Integer, List<Action>> actions = new HashMap<Integer, List<Action>>(); /** suport of config modification. */ @@ -389,8 +409,17 @@ */ public ApplicationConfig() { setConfigFileName(this.getClass().getSimpleName()); + // init extra-converters ConverterUtil.initConverters(); + + // get system os name + osName = AccessController.doPrivileged(new PrivilegedAction<String>() { + @Override + public String run() { + return System.getProperty("os.name"); + } + }); } /** @@ -473,7 +502,7 @@ * @param excludeKeys optional list of keys to exclude from */ public void saveForSystem(String... excludeKeys) { - File file = new File(systemPath + getConfigFileName()); + File file = new File(getConfigPath() + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -490,7 +519,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(getUserPath() + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -597,6 +626,139 @@ } /** + * Get configuration file path to use. + * + * Use (in order) one of the following definition: + * <ul> + * <li>{@link #CONFIG_PATH} option + * <li>system dependant path + * </ul> + * + * @since 1.2.1 + * @return path to use with endind {@link File#separator} + */ + public String getConfigPath() { + String result = getOption(CONFIG_PATH); + + if (result == null) { + result = getSystemConfigurationPath(); + } + + return result; + } + + /** + * Get system configuration path. + * + * Currently supported: + * <ul> + * <li>Windows : C:\Windows\System32 + * <li>Unix : /etc/ + * </ul> + * + * @since 1.2.1 + */ + protected String getSystemConfigurationPath() { + + String systemPath = null; + + // Windows + if (osName.toLowerCase().contains("windows")) { + + // try 1 : %SystemDirectory% + try { + String systemDirectory = System.getenv("SystemDirectory"); + if (systemDirectory != null && systemDirectory.length() > 0) { + systemPath = systemDirectory; + } + } catch (SecurityException eee) { + if (log.isErrorEnabled()) { + log.error("Can't read env property", eee); + } + } + + // try 2 : %SystemRoot% + if (systemPath != null) { + try { + String systemRoot = System.getenv("SystemRoot"); + if (systemRoot != null && systemRoot.length() > 0) { + systemPath = systemRoot + "\\System32"; + } + } catch (SecurityException eee) { + if (log.isErrorEnabled()) { + log.error("Can't read env property", eee); + } + } + } else { + // default value + systemPath = "C:\\Windows\\System32"; + } + + // %SystemDrive% exists too : C: + } else { + // All others are unix like + // look for in /etc/ + systemPath = File.separator + "etc" + File.separator; + } + + return systemPath; + } + + /** + * Get user configuration path. + * + * Currently supported: + * <ul> + * <li>Windows : ${user.home}\\Application Data\\ + * <li>Max os x : ${user.home}/Library/Application Support + * <li>Unix : ${user.home}/.config + * </ul> + * + * Unix norm is based on freedesktop concept explained here : + * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html + * + * @since 1.2.1 + */ + protected String getUserPath() { + + String userPath = null; + + String userHome = null; + try { + userHome = System.getProperty("user.home"); + } catch (SecurityException ignore) { + } + + if (userHome != null) { + // windows + if (osName.toLowerCase().contains("windows")) { + try { + String appDataEV = System.getenv("APPDATA"); + if ((appDataEV != null) && (appDataEV.length() > 0)) { + userPath = appDataEV; + } + } catch (SecurityException ignore) { + } + + if (userPath == null || userPath.isEmpty()) { + // ${userHome}\Application Data\ + userPath = userHome + File.separator + "Application Data"; + } + } else if (osName.toLowerCase().contains("mac os x")) { + // ${userHome}/Library/Application Support/${applicationId} + userPath = userHome + File.separator + "/Library/Application Support"; + } else { + // ${userHome}/.config/ + userPath = userHome + "/.config"; + } + } + + // what if null ? + + return userPath; + } + + /** * Set option value. * * @param key property key @@ -624,7 +786,7 @@ value = replaceRecursiveOptions(value); return value; } - + /** * Replace included ${xxx} suboptions by their values. * @@ -636,9 +798,9 @@ // TODO do a common code with RecursiveProperties code // TODO but can't overwrite getProperty() method - + String result = option; - + if (result == null) { return null; } @@ -1004,8 +1166,8 @@ } } + // first parse option inParseOptionPhase = true; - // first parse option for (ListIterator<String> i = arguments.listIterator(); i.hasNext();) { String arg = i.next(); if (arg.equals("--")) { @@ -1018,7 +1180,9 @@ i.remove(); // remove this arg because is used now Method m = methods.get(optionName); String[] params = getParams(m, i); - log.debug(String.format("Set option '%s' with method '%s %s'", optionName, m, Arrays.toString(params))); + if (log.isDebugEnabled()) { + log.debug(String.format("Set option '%s' with method '%s %s'", optionName, m, Arrays.toString(params))); + } ObjectUtil.call(this, m, params); } } @@ -1051,7 +1215,8 @@ } } - File etcConfig = new File(systemPath + filename); + // system directory + File etcConfig = new File(getConfigPath(), filename); if (etcConfig.exists()) { if (log.isInfoEnabled()) { log.info("Chargement du fichier de config: " + etcConfig); @@ -1064,7 +1229,20 @@ } } - File homeConfig = new File(userPath + filename); + // user home directory + File homeConfig = new File(getUserPath(), filename); + File oldHomeConfig = new File(userPath + filename); // don't use new File(String, String) + + // migration, if homeConfig doesn't exists and oldHomeConfig does + if (!homeConfig.exists() && oldHomeConfig.exists()) { + if (log.isInfoEnabled()) { + log.info(_("Moving old configuration file from %s to %s", oldHomeConfig.getPath(), homeConfig.getPath())); + } + + oldHomeConfig.renameTo(homeConfig); + } + // end of migration + if (homeConfig.exists()) { if (log.isInfoEnabled()) { log.info("Chargement du fichier de config: " + homeConfig); @@ -1076,15 +1254,6 @@ log.debug("No configuration file found in user home : " + homeConfig.getAbsolutePath()); } } -// 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); Modified: trunk/src/main/resources/i18n/nuiton-utils-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils-en_GB.properties 2010-03-27 20:05:28 UTC (rev 1806) +++ trunk/src/main/resources/i18n/nuiton-utils-en_GB.properties 2010-03-29 12:59:53 UTC (rev 1807) @@ -1,3 +1,4 @@ +Moving\ old\ configuration\ file\ from\ %s\ to\ %s= hello\ you\ \!=hello you \! nuitonutil.debug.objectutil.create=Try to create %s with %s nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s Modified: trunk/src/main/resources/i18n/nuiton-utils-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils-fr_FR.properties 2010-03-27 20:05:28 UTC (rev 1806) +++ trunk/src/main/resources/i18n/nuiton-utils-fr_FR.properties 2010-03-29 12:59:53 UTC (rev 1807) @@ -1,3 +1,4 @@ +Moving\ old\ configuration\ file\ from\ %s\ to\ %s= hello\ you\ \!=Salut toi\! nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s

1 0

r1806 - trunk
by tchemit＠users.nuiton.org March 27, 2010

March 27, 2010

Author: tchemit Date: 2010-03-27 21:05:28 +0100 (Sat, 27 Mar 2010) New Revision: 1806 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-19 15:53:28 UTC (rev 1805) +++ trunk/pom.xml 2010-03-27 20:05:28 UTC (rev 1806) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1805 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org March 19, 2010

March 19, 2010

Author: echatellier Date: 2010-03-19 16:53:28 +0100 (Fri, 19 Mar 2010) New Revision: 1805 Log: Ajout de message de mog sur les fichiers qui a trouv?\195?\169 et charg?\195?\169 et ceux non trouv?\195?\169. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-17 13:25:56 UTC (rev 1804) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-03-19 15:53:28 UTC (rev 1805) @@ -1040,21 +1040,42 @@ inClasspath = ApplicationConfig.class.getResource("/" + filename); } if (inClasspath != null) { - log.info("Chargement du fichier de config: " + inClasspath); + if (log.isInfoEnabled()) { + log.info("Chargement du fichier de config: " + inClasspath); + } classpath.load(inClasspath.openStream()); } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in classpath : /" + filename); + } + } File etcConfig = new File(systemPath + filename); if (etcConfig.exists()) { - log.info("Chargement du fichier de config: " + etcConfig); + if (log.isInfoEnabled()) { + log.info("Chargement du fichier de config: " + etcConfig); + } etcfile.load(etcConfig.toURI().toURL().openStream()); } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in system : " + etcConfig.getAbsolutePath()); + } + } File homeConfig = new File(userPath + filename); if (homeConfig.exists()) { - log.info("Chargement du fichier de config: " + homeConfig); + if (log.isInfoEnabled()) { + log.info("Chargement du fichier de config: " + homeConfig); + } homefile.load(homeConfig.toURI().toURL().openStream()); } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in user home : " + homeConfig.getAbsolutePath()); + } + } // File homeConfig2 = new File(userPath2 + filename); // if (!homeConfig2.exists() && homeConfig1.exists()) { // log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); @@ -1068,9 +1089,16 @@ // file $CURDIR/filename File config = new File(filename); if (config.exists()) { - log.info("Chargement du fichier de config: " + config); + if (log.isInfoEnabled()) { + log.info("Chargement du fichier de config: " + config); + } curfile.load(config.toURI().toURL().openStream()); } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in current directory : " + config.getAbsolutePath()); + } + } // // third parse action and do action

1 0

r1804 - trunk/src/test/java/org/nuiton/util
by tchemit＠users.nuiton.org March 17, 2010

March 17, 2010

Author: tchemit Date: 2010-03-17 14:25:56 +0100 (Wed, 17 Mar 2010) New Revision: 1804 Log: use junit 4 not 3 + reformat test Modified: trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java trunk/src/test/java/org/nuiton/util/ResourceTest.java trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java Modified: trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -19,6 +19,7 @@ package org.nuiton.util; import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.beanutils.Converter; import org.junit.Assert; import org.junit.Test; @@ -36,7 +37,7 @@ ConverterUtil.deregister(); - org.apache.commons.beanutils.Converter t = ConvertUtils.lookup(Version.class); + Converter t = ConvertUtils.lookup(Version.class); Assert.assertNull(t); ConverterUtil.initConverters(); t = ConvertUtils.lookup(Version.class); @@ -47,16 +48,24 @@ public void testConvert() throws Exception { String s; s = ""; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "a"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "kZZFIOFEIOFEfdskdfmldsfjklsfjldfldfjdsfiosabcd4567'''`~teAZEst"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); // FIXME following test won't pass //s = "éééééé]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -4,7 +4,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -208,4 +208,4 @@ Assert.assertEquals("Juli", juli); } -} \ No newline at end of file +} Modified: trunk/src/test/java/org/nuiton/util/ResourceTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ResourceTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ResourceTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -22,7 +22,7 @@ import java.io.IOException; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test;

1 0

r1803 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 12:21:22 +0100 (Mon, 15 Mar 2010) New Revision: 1803 Log: reformat code Modified: trunk/src/main/java/org/nuiton/util/ConverterUtil.java trunk/src/main/java/org/nuiton/util/EnumConverter.java Modified: trunk/src/main/java/org/nuiton/util/ConverterUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ConverterUtil.java 2010-03-13 19:35:11 UTC (rev 1802) +++ trunk/src/main/java/org/nuiton/util/ConverterUtil.java 2010-03-15 11:21:22 UTC (rev 1803) @@ -21,6 +21,7 @@ import java.util.ServiceLoader; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; +import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** @@ -31,9 +32,14 @@ public class ConverterUtil { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private org.apache.commons.logging.Log log = LogFactory.getLog(ConverterUtil.class); - /** le paquetage où chercher les implentations de Converter, si non présents dans le système */ + static private Log log = LogFactory.getLog(ConverterUtil.class); + + /** + * le paquetage où chercher les implentations de Converter, si non présents + * dans le système + */ protected static final String CONVERTER_PACKAGE = "org.nuiton.util"; + /** un drapeau pour savoir si on doit charger les converters specifiques */ protected static Boolean WAS_INIT = Boolean.FALSE; @@ -95,14 +101,21 @@ return result; } - public static void registerConverter(Class<?> type) throws IllegalAccessException, InstantiationException, ClassNotFoundException { + public static void registerConverter(Class<?> type) + throws IllegalAccessException, + InstantiationException, + ClassNotFoundException { if (ConvertUtils.lookup(type) == null) { registerConverter0(type); } } - protected static void registerConverter0(Class<?> type) throws IllegalAccessException, InstantiationException, ClassNotFoundException { - Class<?> aClass = Class.forName(CONVERTER_PACKAGE + "." + type.getSimpleName() + "Converter"); + protected static void registerConverter0(Class<?> type) + throws IllegalAccessException, + InstantiationException, + ClassNotFoundException { + Class<?> aClass = Class.forName( + CONVERTER_PACKAGE + "." + type.getSimpleName() + "Converter"); Converter converter = (Converter) aClass.newInstance(); log.info("for type : " + type + " : " + converter); ConvertUtils.register(converter, type); @@ -115,8 +128,10 @@ * @param type le type d'enum à convertir * @param defaultValue la valeur par defaut. */ - public static void registerEnumConverter(Class<?> type, Object defaultValue) { - if (EnumConverter.isEnabled(type, type) && ConvertUtils.lookup(type) == null) { + public static void registerEnumConverter(Class<?> type, + Object defaultValue) { + if (EnumConverter.isEnabled(type, type) && + ConvertUtils.lookup(type) == null) { Converter converter = new EnumConverter(type, defaultValue); log.info("for type : " + type + " : " + converter); ConvertUtils.register(converter, type); @@ -150,7 +165,8 @@ if (WAS_INIT != null && WAS_INIT) { return; } - ServiceLoader<Converter> converters = ServiceLoader.load(Converter.class); + ServiceLoader<Converter> converters = + ServiceLoader.load(Converter.class); for (Converter converter : converters) { if (log.isDebugEnabled()) { log.debug("discovered converter " + converter); @@ -163,12 +179,16 @@ log.info("register converter " + converter); ConvertUtils.register(converter, returnType); } catch (Exception ex) { - log.warn("could not obtain type of converter " + converter + " for reason : " + ex.getMessage(), ex); + log.warn("could not obtain type of converter " + + converter + " for reason : " + ex.getMessage(), + ex); } } catch (NoSuchMethodException ex) { - log.warn("could not find method getType on converter " + converter + ", will not be registred..."); + log.warn("could not find method getType on converter " + + converter + ", will not be registred..."); } catch (SecurityException ex) { - log.warn("could not find method getType on converter " + converter + ", will not be registred..."); + log.warn("could not find method getType on converter " + + converter + ", will not be registred..."); } } Modified: trunk/src/main/java/org/nuiton/util/EnumConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/EnumConverter.java 2010-03-13 19:35:11 UTC (rev 1802) +++ trunk/src/main/java/org/nuiton/util/EnumConverter.java 2010-03-15 11:21:22 UTC (rev 1803) @@ -23,6 +23,7 @@ import java.util.EnumSet; import org.apache.commons.beanutils.Converter; +import org.apache.commons.logging.Log; /** * classe pour convertir une chaine en un objet Enum type-safe en @@ -41,11 +42,14 @@ public class EnumConverter implements Converter { /** to use log facility, just put in your code: log.info(\"...\"); */ - static org.apache.commons.logging.Log log = getLog(EnumConverter.class); + static Log log = getLog(EnumConverter.class); + /** valeur par default à utiliser, si pas non trouvée et {@link #useDefault} actif. */ protected Object defaultValue; + /** flag pour utiliser la valeur par defaut {@link #defaultValue} si non trouvé. */ protected boolean useDefault; + /** le type de l'énumération à convertir */ protected Class<?> enumType; @@ -55,7 +59,8 @@ if (useDefault) { return defaultValue; } - throw new ConversionException(_("nuitonutil.error.convertor.noValue", this)); + throw new ConversionException( + _("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass, enumType)) { Object result; @@ -78,7 +83,8 @@ return result; } } - throw new ConversionException(_("nuitonutil.error.no.convertor", aClass.getName(), value)); + throw new ConversionException( + _("nuitonutil.error.no.convertor", aClass.getName(), value)); } public EnumConverter(Class<?> enumType, Object defaultValue) {

1 0

r1802 - trunk/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org March 13, 2010

March 13, 2010

Author: tchemit Date: 2010-03-13 20:35:11 +0100 (Sat, 13 Mar 2010) New Revision: 1802 Log: change author signature Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java trunk/src/main/java/org/nuiton/util/beans/BinderModel.java trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-03-12 20:14:46 UTC (rev 1801) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-03-13 19:35:11 UTC (rev 1802) @@ -39,7 +39,7 @@ * <p/> * Use the method {@link #obtainProperties(Object,String...)} to obtain * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @param <I> the source bean type * @param <O> the destination bean type * @since 1.1.5 @@ -203,4 +203,4 @@ protected void setModel(BinderModel<?, ?> model) { this.model = (BinderModel<I, O>) model; } -} \ No newline at end of file +} Modified: trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java 2010-03-12 20:14:46 UTC (rev 1801) +++ trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java 2010-03-13 19:35:11 UTC (rev 1802) @@ -32,7 +32,7 @@ * <p/> * A {@code binder} permits to copy some properties from a bean to another one. * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @see BinderModel * @see Binder * @since 1.1.5 @@ -416,4 +416,4 @@ loadDescriptors(superClass, descriptors); } } -} \ No newline at end of file +} Modified: trunk/src/main/java/org/nuiton/util/beans/BinderModel.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderModel.java 2010-03-12 20:14:46 UTC (rev 1801) +++ trunk/src/main/java/org/nuiton/util/beans/BinderModel.java 2010-03-13 19:35:11 UTC (rev 1802) @@ -30,7 +30,7 @@ * * TODO-TC20100225 should have special cases for collections treatment. * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @param <S> the source type * @param <T> the target type * @since 1.1.5 @@ -230,4 +230,4 @@ protected Map<String, String> getPropertiesMapping() { return propertiesMapping; } -} \ No newline at end of file +} Modified: trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java 2010-03-12 20:14:46 UTC (rev 1801) +++ trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java 2010-03-13 19:35:11 UTC (rev 1802) @@ -50,7 +50,7 @@ * Binder<User,UserDTO> mybinder = getBinder(User.class,UserDTO.class, "One"); * </pre> * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @see Binder * @see BinderBuilder * @since 1.1.5

1 0

r1801 - trunk
by tchemit＠users.nuiton.org March 12, 2010

March 12, 2010

Author: tchemit Date: 2010-03-12 21:14:46 +0100 (Fri, 12 Mar 2010) New Revision: 1801 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 09:39:42 UTC (rev 1800) +++ trunk/pom.xml 2010-03-12 20:14:46 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1800 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org March 12, 2010

March 12, 2010

Author: echatellier Date: 2010-03-12 10:39:42 +0100 (Fri, 12 Mar 2010) New Revision: 1800 Log: Fix #379 : NullPointerException in FileUtil.writeString with relative path Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-03-10 18:24:09 UTC (rev 1799) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-03-12 09:39:42 UTC (rev 1800) @@ -495,8 +495,12 @@ */ static public void writeString(File file, String content) throws IOException { //fixme on doit tester le retour de la méthode, car il se peut que le répertoire - // ne puisse être crée. - file.getParentFile().mkdirs(); + // ne puisse etre cree. + File parentFile = file.getParentFile(); + if (parentFile != null) { + parentFile.mkdirs(); + } + BufferedWriter out = getWriter(file); out.write(content); out.close(); @@ -513,7 +517,11 @@ static public void writeString(File file, String content, String encoding) throws IOException { //fixme on doit tester le retour de la méthode, car il se peut que le répertoire // ne puisse être crée. - file.getParentFile().mkdirs(); + File parentFile = file.getParentFile(); + if (parentFile != null) { + parentFile.mkdirs(); + } + BufferedWriter out = getWriter(file, encoding); out.write(content); out.close(); Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-03-10 18:24:09 UTC (rev 1799) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-03-12 09:39:42 UTC (rev 1800) @@ -59,8 +59,45 @@ result = FileUtil.extension(new File("/tmp/toto.xml"), "t", "."); Assert.assertEquals("o.xml", result); } + + @Test + public void testWriteString() throws IOException { + File testFile = new File(System.getProperty("java.io.tmpdir"), "test.txt"); + testFile.deleteOnExit(); + FileUtil.writeString(testFile, "testWriteString"); + Assert.assertEquals("testWriteString", FileUtil.readAsString(testFile)); + } + + /** + * This test throwed NPE before 1.2.1 with simple file path (current folder). + * + * @throws IOException + */ @Test + public void testWriteStringRelative() throws IOException { + File testFile = new File("test.txt"); + testFile.deleteOnExit(); + FileUtil.writeString(testFile, "testWriteString"); + + Assert.assertEquals("testWriteString", FileUtil.readAsString(testFile)); + } + + /** + * Test testWriteString method with file containing ".." + * + * @throws IOException + */ + @Test + public void testWriteStringRelativeNonCanonical() throws IOException { + File testFile = new File(".." + File.separator + "testdir" + File.separator + "test.txt"); + testFile.deleteOnExit(); + FileUtil.writeString(testFile, "testWriteString"); + + Assert.assertEquals("testWriteString", FileUtil.readAsString(testFile)); + } + + @Test public void testCopyRecursively() throws Exception { File srcDir = FileUtil.createTempDirectory("test-copyRecursively", ""); File destDir1 = FileUtil.createTempDirectory("test-copyRecursively", "");

1 0

r1799 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org March 10, 2010

March 10, 2010

Author: tchemit Date: 2010-03-10 19:24:09 +0100 (Wed, 10 Mar 2010) New Revision: 1799 Log: add usefull methods on VersionUtil Modified: trunk/src/main/java/org/nuiton/util/VersionUtil.java Modified: trunk/src/main/java/org/nuiton/util/VersionUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VersionUtil.java 2010-03-10 15:18:38 UTC (rev 1798) +++ trunk/src/main/java/org/nuiton/util/VersionUtil.java 2010-03-10 18:24:09 UTC (rev 1799) @@ -347,6 +347,50 @@ } /** + * Tests if two versions are equals. + * + * @param version0 the first version + * @param version1 the second version + * @return {@code true} if versions are equals, {@code false} otherwise. + */ + public static boolean equals(String version0, String version1) { + Version v0 = valueOf(version0); + Version v1 = valueOf(version1); + boolean result = v0.equals(v1); + return result; + } + + /** + * Tests if the first version is smaller than the second version. + * + * @param version0 the first version + * @param version1 the second version + * @return {@code true} if {@code version0} is before {@code version1}, + * {@code false} otherwise. + */ + public static boolean smallerThan(String version0, String version1) { + Version v0 = valueOf(version0); + Version v1 = valueOf(version1); + boolean result = v0.before(v1); + return result; + } + + /** + * Tests if the first version is greater than the second version. + * + * @param version0 the first version + * @param version1 the second version + * @return {@code true} if {@code version0} is after {@code version1}, + * {@code false} otherwise. + */ + public static boolean greaterThan(String version0, String version1) { + Version v0 = valueOf(version0); + Version v1 = valueOf(version1); + boolean result = v0.after(v1); + return result; + } + + /** * Trier un ensemble de versions données en entrees * * On affiche le resultat dans la console

1 0