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

r1815 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 03 Apr '10

03 Apr '10

Author: tchemit Date: 2010-04-03 20:38:16 +0200 (Sat, 03 Apr 2010) New Revision: 1815 Log: Anomalie #448: [ApplicationConfig] Make migration of configuration file configurable 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-04-03 14:54:19 UTC (rev 1814) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-04-03 18:38:16 UTC (rev 1815) @@ -23,11 +23,7 @@ import static org.nuiton.i18n.I18n._; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintStream; -import java.io.Writer; +import java.io.*; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -73,7 +69,7 @@ * <h3>Usage</h3> * Create subclass of {@link ApplicationConfig}, where in constructor you call * {@link #setConfigFileName(String)}, {@link #setDefaultOption(String, String)}, - * {@link #addAlias(String, String[])}, {@link #addActionAlias(String, String)}, + * {@link #addAlias(String, String...)}, {@link #addActionAlias(String, String)}, * to have properly value. * <pre> * conf = new MonAppConfig(); @@ -94,7 +90,7 @@ * <h3>La sauvegarde</h3> * La sauvegarde des options se fait via une des trois methodes disponibles : * <ul> - * <li> {@link #save(File, boolean,String[])} sauve les données dans le fichier demandé + * <li> {@link #save(File, boolean,String...)} sauve les données dans le fichier demandé * <li> {@link #saveForSystem} sauvegarde les donnees dans /etc * <li> {@link #saveForUser} sauvegarde les donnees dans $HOME * </ul> @@ -265,6 +261,7 @@ /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; + /** TODO */ static final public String APP_NAME = "app.name"; /** @@ -282,7 +279,8 @@ /** System os name. (windows, linux, max os x) */ protected String osName; - protected boolean useOnlyAliases = false; + /** TODO */ + protected boolean useOnlyAliases; /** * file $user.home/.[filename] @@ -294,25 +292,48 @@ 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; + protected boolean inParseOptionPhase; + /** TODO */ protected Properties defaults = new Properties(); + + /** TODO */ protected Properties classpath = new Properties(defaults); + + /** TODO */ protected Properties etcfile = new Properties(classpath); + + /** TODO */ protected Properties homefile = new Properties(etcfile); + + /** TODO */ protected Properties curfile = new Properties(homefile); + + /** TODO */ protected Properties env = new Properties(curfile); + + /** TODO */ protected Properties jvm = new Properties(env); + + /** TODO */ protected Properties line = new Properties(jvm); + + /** TODO */ protected Properties options = new Properties(line); + /** TODO */ protected Map<String, CacheItem<?>> cacheOption = new HashMap<String, CacheItem<?>>(); + + /** TODO */ 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>(); + /** TODO */ protected Map<String, List<String>> aliases = new HashMap<String, List<String>>(); + + /** TODO */ protected Map<Integer, List<Action>> actions = new HashMap<Integer, List<Action>>(); /** suport of config modification. */ @@ -324,7 +345,7 @@ * * @since 1.0.0-rc-9 */ - static public interface OptionDef { + public interface OptionDef { /** * @return la clef identifiant l'option @@ -360,11 +381,12 @@ boolean isFinal(); } + /** TODO */ static public class Action { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - static public @interface Step { + public @interface Step { int value() default 0; } @@ -380,7 +402,10 @@ this.params = params; } - public void doAction() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException { + public void doAction() throws IllegalAccessException, + IllegalArgumentException, + InvocationTargetException, + InstantiationException { ObjectUtil.call(o, m, params); } } @@ -410,7 +435,7 @@ * @see ConverterUtil#initConverters() */ public ApplicationConfig() { - setConfigFileName(this.getClass().getSimpleName()); + setConfigFileName(getClass().getSimpleName()); // init extra-converters ConverterUtil.initConverters(); @@ -462,7 +487,9 @@ * @param excludeKeys optional list of keys to exclude from * @throws IOException if IO pb */ - public void save(File file, boolean forceAll, String... excludeKeys) throws IOException { + public void save(File file, + boolean forceAll, + String... excludeKeys) throws IOException { // store sorted in file Properties prop = new SortedProperties(); @@ -485,15 +512,12 @@ prop.remove(excludeKey); } - Writer writer = null; + Writer writer = new FileWriter(file); try { - writer = new FileWriter(file); prop.store(writer, "Last saved " + new java.util.Date()); } finally { - if (writer != null) { - writer.close(); - } + writer.close(); } } @@ -509,7 +533,8 @@ save(file, false, excludeKeys); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("nuitonutil.error.applicationconfig.save", file), eee); + log.warn(_("nuitonutil.error.applicationconfig.save", file), + eee); } } } @@ -526,7 +551,8 @@ save(file, false, excludeKeys); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("nuitonutil.error.applicationconfig.save", file), eee); + log.warn(_("nuitonutil.error.applicationconfig.save", file), + eee); } } } @@ -550,7 +576,7 @@ Integer step = action.step; List<Action> list = actions.get(step); if (list == null) { - list = new LinkedList<ApplicationConfig.Action>(); + list = new LinkedList<Action>(); actions.put(step, list); } list.add(action); @@ -562,14 +588,17 @@ * * @param step do action only defined in this step * - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - * @throws InstantiationException + * @throws IllegalAccessException TODO + * @throws IllegalArgumentException TODO + * @throws InvocationTargetException TODO + * @throws InstantiationException TODO * * @see Action.Step */ - public void doAction(int step) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException { + public void doAction(int step) throws IllegalAccessException, + IllegalArgumentException, + InvocationTargetException, + InstantiationException { List<Action> list = actions.get(step); if (list != null) { for (Action a : list) { @@ -598,10 +627,11 @@ /** * Add alias for action. This method put just -- front the actionMethod and - * call {@link #addAlias(String, String[])} + * call {@link #addAlias(String, String...)} * * @param alias the alias to add for the given method action - * @param actionMethod must be fully qualified method path: package.Class.method + * @param actionMethod must be fully qualified method path: + * package.Class.method */ public void addActionAlias(String alias, String actionMethod) { addAlias(alias, "--" + actionMethod); @@ -641,6 +671,7 @@ * pollen.config.file * * @param appName to use as application context + * @since 1.2.1 */ public void setAppName(String appName) { setDefaultOption(APP_NAME, appName); @@ -669,7 +700,9 @@ if (result == null) { result = getSystemConfigurationPath(); } - + if (log.isDebugEnabled()) { + log.debug(result); + } return result; } @@ -683,6 +716,7 @@ * </ul> * * @since 1.2.1 + * @return TODO */ protected String getSystemConfigurationPath() { @@ -726,7 +760,9 @@ // look for in /etc/ systemPath = File.separator + "etc" + File.separator; } - + if (log.isDebugEnabled()) { + log.debug(systemPath); + } return systemPath; } @@ -744,6 +780,7 @@ * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html * * @since 1.2.1 + * @return TODO */ protected String getUserPath() { @@ -760,7 +797,7 @@ if (osName.toLowerCase().contains("windows")) { try { String appDataEV = System.getenv("APPDATA"); - if ((appDataEV != null) && (appDataEV.length() > 0)) { + if (appDataEV != null && appDataEV.length() > 0) { userPath = appDataEV; } } catch (SecurityException ignore) { @@ -772,7 +809,8 @@ } } else if (osName.toLowerCase().contains("mac os x")) { // ${userHome}/Library/Application Support/${applicationId} - userPath = userHome + File.separator + "/Library/Application Support"; + userPath = userHome + File.separator + + "/Library/Application Support"; } else { // ${userHome}/.config/ userPath = userHome + "/.config"; @@ -842,7 +880,8 @@ // Ex : getProperty("myName"); if (value != null) { // Ex : value="Thimel" - result = result.substring(0, pos) + value + result.substring(posEnd + 1); + result = result.substring(0, pos) + value + + result.substring(posEnd + 1); // Ex : result="My name is " + "Thimel" + "." pos = result.indexOf("${", pos + value.length()); // Ex : pos=-1 @@ -897,7 +936,6 @@ * @return typed value */ public <T> T getOption(Class<T> clazz, String key) { - T result = null; String cacheKey = key + "-" + clazz.getName(); String value = getOption(key); @@ -905,6 +943,7 @@ if (value != null) { hash = value.hashCode(); } + T result; CacheItem<T> cacheItem = (CacheItem<T>) cacheOption.get(cacheKey); // compute value if value don't exist in cacheOption or // if it's modified since last computation @@ -1027,7 +1066,7 @@ * @return Properties which contains all options */ public Properties getOptions() { - return this.options; + return options; } /** @@ -1048,7 +1087,7 @@ */ protected Map<String, Method> getMethods() { // looking for all methods set on ApplicationConfig - Method[] allMethods = this.getClass().getMethods(); + Method[] allMethods = getClass().getMethods(); Map<String, Method> methods = new HashMap<String, Method>(); for (Method m : allMethods) { String methodName = m.getName(); @@ -1098,15 +1137,21 @@ * if package, class or method missing, default is used * * @param name name of the action - * @param args + * @param args TODO * @return the created action - * @throws ArgumentsParserException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InstantiationException - * @throws java.lang.reflect.InvocationTargetException + * @throws ArgumentsParserException TODO + * @throws IllegalAccessException TODO + * @throws IllegalArgumentException TODO + * @throws InstantiationException TODO + * @throws InvocationTargetException TODO */ - protected Action createAction(String name, ListIterator<String> args) throws ArgumentsParserException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + protected Action createAction(String name, + ListIterator<String> args) + throws ArgumentsParserException, + InstantiationException, + IllegalAccessException, + IllegalArgumentException, + InvocationTargetException { Action result = null; Class<?> clazz; @@ -1136,13 +1181,15 @@ if (methods.size() > 0) { if (methods.size() > 1) { log.warn(String.format( - "More than one method found, used the first: %s", methods)); + "More than one method found, used the first: %s", + methods)); } method = methods.get(0); } if (method != null) { - args.remove(); // remove option from command line, because is used now + // remove option from command line, because is used now + args.remove(); // creation de l'object sur lequel on fera l'appel Object o = cacheAction.get(clazz); @@ -1151,7 +1198,8 @@ o = ConstructorUtils.invokeConstructor(clazz, this); } catch (NoSuchMethodException eee) { log.debug(String.format( - "Use default constructor, because no constructor with Config parameter on class %s", + "Use default constructor, because no constructor" + + " with Config parameter on class %s", clazz.getName())); o = clazz.newInstance(); } @@ -1177,7 +1225,7 @@ * Load configuration file and prepare Action. * * @param args argument as main(String[] args) - * @throws ArgumentsParserException + * @throws ArgumentsParserException TODO */ public void parse(String[] args) throws ArgumentsParserException { try { @@ -1194,7 +1242,8 @@ // first parse option inParseOptionPhase = true; - for (ListIterator<String> i = arguments.listIterator(); i.hasNext();) { + for (ListIterator<String> i = arguments.listIterator(); + i.hasNext();) { String arg = i.next(); if (arg.equals("--")) { // stop parsing @@ -1207,7 +1256,9 @@ Method m = methods.get(optionName); String[] params = getParams(m, i); if (log.isDebugEnabled()) { - log.debug(String.format("Set option '%s' with method '%s %s'", optionName, m, Arrays.toString(params))); + log.debug(String.format( + "Set option '%s' with method '%s %s'", + optionName, m, Arrays.toString(params))); } ObjectUtil.call(this, m, params); } @@ -1225,19 +1276,28 @@ // classpath String filename = getConfigFileName(); - URL inClasspath = ClassLoader.getSystemClassLoader().getResource(filename); + URL inClasspath = + ClassLoader.getSystemClassLoader().getResource(filename); if (inClasspath == null) { - inClasspath = ApplicationConfig.class.getResource("/" + filename); + inClasspath = ApplicationConfig.class.getResource("/" + + filename); } if (inClasspath != null) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config (classpath) : " + inClasspath); + log.info("Loading configuration file (classpath) : " + + inClasspath); } - classpath.load(inClasspath.openStream()); + InputStream stream = inClasspath.openStream(); + try { + classpath.load(stream); + } finally { + stream.close(); + } } else { if (log.isDebugEnabled()) { - log.debug("No configuration file found in classpath : /" + filename); + log.debug("No configuration file found in classpath : /" + + filename); } } @@ -1245,39 +1305,49 @@ File etcConfig = new File(getConfigPath(), filename); if (etcConfig.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config (etc) : " + etcConfig); + log.info("Loading configuration file (etc) : " + etcConfig); } - etcfile.load(etcConfig.toURI().toURL().openStream()); + InputStream stream = etcConfig.toURI().toURL().openStream(); + try { + etcfile.load(stream); + } finally { + stream.close(); + } } else { if (log.isDebugEnabled()) { - log.debug("No configuration file found in system : " + etcConfig.getAbsolutePath()); + log.debug("No configuration file found in system : " + + etcConfig.getAbsolutePath()); } } // user home directory File homeConfig = new File(getUserPath(), filename); - File oldHomeConfig = new File(userPath + filename); // don't use new File(String, String) + // don't use new File(String, String) + File oldHomeConfig = new File(userPath + filename); // 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); + migrateUserConfigurationFile(oldHomeConfig, homeConfig); } // end of migration if (homeConfig.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config (home) : " + homeConfig); + log.info("Loading configuration file (home) : " + + homeConfig); } - homefile.load(homeConfig.toURI().toURL().openStream()); + InputStream stream = homeConfig.toURI().toURL().openStream(); + try { + homefile.load(stream); + } finally { + stream.close(); + } } else { if (log.isDebugEnabled()) { - log.debug("No configuration file found in user home : " + homeConfig.getAbsolutePath()); + log.debug("No configuration file found in user home : " + + homeConfig.getAbsolutePath()); } } @@ -1285,20 +1355,27 @@ File config = new File(filename); if (config.exists()) { if (log.isInfoEnabled()) { - log.info("Chargement du fichier de config (curr) : " + config); + log.info("Loading configuration file (curr) : " + config); } - curfile.load(config.toURI().toURL().openStream()); + InputStream stream = config.toURI().toURL().openStream(); + try { + curfile.load(stream); + } finally { + stream.close(); + } } else { if (log.isDebugEnabled()) { - log.debug("No configuration file found in current directory : " + config.getAbsolutePath()); + log.debug("No configuration file found in current" + + " directory : " + config.getAbsolutePath()); } } // // third parse action and do action // - for (ListIterator<String> i = arguments.listIterator(); i.hasNext();) { + for (ListIterator<String> i = arguments.listIterator(); + i.hasNext();) { String arg = i.next(); if (arg.equals("--")) { // stop parsing @@ -1318,12 +1395,42 @@ unparsed.addAll(arguments); } catch (Exception eee) { - eee.printStackTrace(); + if (log.isErrorEnabled()) { + log.error(eee); + } throw new ArgumentsParserException("Can't parse argument", eee); } } /** + * Move old user configuration file {@code oldHomeConfig} to {@code + * homeConfig}. + * + * @param oldHomeConfig old configuration file path + * @param homeConfig new configuration file path + * @throws IOException if could not move configuration file + */ + protected void migrateUserConfigurationFile(File oldHomeConfig, + File homeConfig) + throws IOException { + if (log.isInfoEnabled()) { + log.info(_("Moving old configuration file from %s to %s", + oldHomeConfig.getPath(), homeConfig.getPath())); + } + + boolean b = oldHomeConfig.renameTo(homeConfig); + if (!b) { + // could not move... + String message = String.format( + "could not move old configuration file %S to %s", + oldHomeConfig, + homeConfig + ); + throw new IOException(message); + } + } + + /** * For debugging. */ public void printConfig() { @@ -1350,7 +1457,8 @@ output.println("options " + options); } - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + protected void firePropertyChange(String propertyName, + Object oldValue, Object newValue) { pcs.firePropertyChange(propertyName, oldValue, newValue); } @@ -1358,7 +1466,8 @@ pcs.addPropertyChangeListener(listener); } - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { pcs.addPropertyChangeListener(propertyName, listener); } @@ -1366,7 +1475,8 @@ pcs.removePropertyChangeListener(listener); } - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { pcs.removePropertyChangeListener(propertyName, listener); } @@ -1374,7 +1484,8 @@ return pcs.hasListeners(propertyName); } - public synchronized PropertyChangeListener[] getPropertyChangeListeners(String propertyName) { + public synchronized PropertyChangeListener[] getPropertyChangeListeners( + String propertyName) { return pcs.getPropertyChangeListeners(propertyName); }

1 0

r1814 - trunk/src/test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 03 Apr '10

03 Apr '10

Author: tchemit Date: 2010-04-03 16:54:19 +0200 (Sat, 03 Apr 2010) New Revision: 1814 Log: adding missing generics on test Modified: trunk/src/test/java/org/nuiton/util/beans/BinderProviderTest.java Modified: trunk/src/test/java/org/nuiton/util/beans/BinderProviderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/beans/BinderProviderTest.java 2010-04-03 14:19:38 UTC (rev 1813) +++ trunk/src/test/java/org/nuiton/util/beans/BinderProviderTest.java 2010-04-03 14:54:19 UTC (rev 1814) @@ -35,7 +35,7 @@ Assert.assertNull(BinderProvider.binders); try { - BinderProvider.registerBinder((Binder) null); + BinderProvider.registerBinder((Binder<?,?>) null); Assert.fail(); } catch (NullPointerException e) { @@ -62,7 +62,7 @@ Assert.assertNull(BinderProvider.binders); try { - BinderProvider.registerBinder((Binder) null, null); + BinderProvider.registerBinder((Binder<?,?>) null, null); Assert.fail(); } catch (NullPointerException e) { @@ -70,7 +70,7 @@ } try { - BinderProvider.registerBinder((Binder) null, MY_BINDER_NAME); + BinderProvider.registerBinder((Binder<?,?>) null, MY_BINDER_NAME); Assert.fail(); } catch (NullPointerException e) { @@ -163,4 +163,4 @@ } -} \ No newline at end of file +}

1 0

r1813 - trunk/src/main/java/org/nuiton/util/config
by tchemit＠users.nuiton.org 03 Apr '10

03 Apr '10

Author: tchemit Date: 2010-04-03 16:19:38 +0200 (Sat, 03 Apr 2010) New Revision: 1813 Log: Evolution #449: Deprecates package org.nuiton.util.config Modified: trunk/src/main/java/org/nuiton/util/config/IdentityConfig.java trunk/src/main/java/org/nuiton/util/config/IdentityConfigProperty.java trunk/src/main/java/org/nuiton/util/config/Property.java trunk/src/main/java/org/nuiton/util/config/SimpleConfig.java trunk/src/main/java/org/nuiton/util/config/SimpleIdentityConfig.java Modified: trunk/src/main/java/org/nuiton/util/config/IdentityConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/config/IdentityConfig.java 2010-04-03 10:32:19 UTC (rev 1812) +++ trunk/src/main/java/org/nuiton/util/config/IdentityConfig.java 2010-04-03 14:19:38 UTC (rev 1813) @@ -18,12 +18,17 @@ */ package org.nuiton.util.config; +import org.nuiton.util.ApplicationConfig; + /** * Definition of an identity * * @author chemit + * @deprecated since 1.2.2 (will be remove soon), use {@link ApplicationConfig} + * instead */ +@Deprecated public interface IdentityConfig extends Config<IdentityConfigProperty> { String getFirstName(); Modified: trunk/src/main/java/org/nuiton/util/config/IdentityConfigProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/util/config/IdentityConfigProperty.java 2010-04-03 10:32:19 UTC (rev 1812) +++ trunk/src/main/java/org/nuiton/util/config/IdentityConfigProperty.java 2010-04-03 14:19:38 UTC (rev 1813) @@ -18,12 +18,17 @@ */ package org.nuiton.util.config; +import org.nuiton.util.ApplicationConfig; + /** - * Enumaration of properties to be used in a {@link org.nuiton.util.config.IdentityConfig} + * Enumaration of properties to be used in a {@link IdentityConfig} * * @author chemit * @see IdentityConfig + * @deprecated since 1.2.2 (will be remove soon), use {@link ApplicationConfig} + * instead */ +@Deprecated public enum IdentityConfigProperty implements Property{ /** property <code>name</code>, first name of user */ Modified: trunk/src/main/java/org/nuiton/util/config/Property.java =================================================================== --- trunk/src/main/java/org/nuiton/util/config/Property.java 2010-04-03 10:32:19 UTC (rev 1812) +++ trunk/src/main/java/org/nuiton/util/config/Property.java 2010-04-03 14:19:38 UTC (rev 1813) @@ -18,7 +18,14 @@ */ package org.nuiton.util.config; -/** @author chemit */ +import org.nuiton.util.ApplicationConfig; + +/** + * @author chemit + * @deprecated since 1.2.2 (will be remove soon), use {@link + * ApplicationConfig} instead + */ +@Deprecated public interface Property { Class<?> getType(); Modified: trunk/src/main/java/org/nuiton/util/config/SimpleConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/config/SimpleConfig.java 2010-04-03 10:32:19 UTC (rev 1812) +++ trunk/src/main/java/org/nuiton/util/config/SimpleConfig.java 2010-04-03 14:19:38 UTC (rev 1813) @@ -22,6 +22,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; import java.util.EnumMap; import java.util.EnumSet; @@ -31,7 +32,10 @@ * simple config implementation based on a Enum to obtain properties * * @author chemit + * @deprecated since 1.2.2 (will be remove soon), use {@link ApplicationConfig} + * instead */ +@Deprecated public class SimpleConfig<E extends Enum<E>> implements Config<E> { static protected final Log log = LogFactory.getLog(Config.class); Modified: trunk/src/main/java/org/nuiton/util/config/SimpleIdentityConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/config/SimpleIdentityConfig.java 2010-04-03 10:32:19 UTC (rev 1812) +++ trunk/src/main/java/org/nuiton/util/config/SimpleIdentityConfig.java 2010-04-03 14:19:38 UTC (rev 1813) @@ -18,13 +18,18 @@ */ package org.nuiton.util.config; +import org.nuiton.util.ApplicationConfig; + import static org.nuiton.util.config.IdentityConfigProperty.email; import static org.nuiton.util.config.IdentityConfigProperty.firstName; import static org.nuiton.util.config.IdentityConfigProperty.lastName; import java.util.EnumMap; -/** @author chemit */ +/** @author chemit + * @deprecated since 1.2.2 (will be remove soon), use {@link ApplicationConfig} + * instead*/ +@Deprecated public class SimpleIdentityConfig extends SimpleConfig<IdentityConfigProperty> implements IdentityConfig { public SimpleIdentityConfig() {

1 0

r1812 - trunk
by tchemit＠users.nuiton.org 03 Apr '10

03 Apr '10

Author: tchemit Date: 2010-04-03 12:32:19 +0200 (Sat, 03 Apr 2010) New Revision: 1812 Log: Evolution #445: Use I18n 1.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-02 16:45:28 UTC (rev 1811) +++ trunk/pom.xml 2010-04-03 10:32:19 UTC (rev 1812) @@ -102,7 +102,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.1</i18n.version> + <i18n.version>1.2.1</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1811 - trunk
by fdesbois＠users.nuiton.org 02 Apr '10

02 Apr '10

Author: fdesbois Date: 2010-04-02 18:45:28 +0200 (Fri, 02 Apr 2010) New Revision: 1811 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-02 16:45:27 UTC (rev 1810) +++ trunk/pom.xml 2010-04-02 16:45:28 UTC (rev 1811) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> <dependencies> @@ -155,9 +155,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.2.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.2.1</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

r1810 - in tags: . nuiton-utils-1.2.1
by fdesbois＠users.nuiton.org 02 Apr '10

02 Apr '10

Author: fdesbois Date: 2010-04-02 18:45:27 +0200 (Fri, 02 Apr 2010) New Revision: 1810 Log: [maven-release-plugin] copy for tag nuiton-utils-1.2.1 Added: tags/nuiton-utils-1.2.1/ Property changes on: tags/nuiton-utils-1.2.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1809 - trunk
by fdesbois＠users.nuiton.org 02 Apr '10

02 Apr '10

Author: fdesbois Date: 2010-04-02 18:45:24 +0200 (Fri, 02 Apr 2010) New Revision: 1809 Log: [maven-release-plugin] prepare release nuiton-utils-1.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-31 13:58:38 UTC (rev 1808) +++ trunk/pom.xml 2010-04-02 16:45:24 UTC (rev 1809) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> <dependencies> @@ -155,9 +155,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.2.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.2.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1808 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 31 Mar '10

31 Mar '10

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 29 Mar '10

29 Mar '10

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 27 Mar '10

27 Mar '10

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