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

r1875 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:18:55 +0200 (Wed, 09 Jun 2010) New Revision: 1875 Url: http://nuiton.org/repositories/revision/nuiton-utils/1875 Log: add usefull methods in ReflectUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:18:55 UTC (rev 1875) @@ -156,7 +156,16 @@ String methodName, boolean strict, Object... arguments) throws IllegalArgumentException { - Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + HashSet<Class<?>> classes = new HashSet<Class<?>>(); + Method method; + try { + method = getDeclaredMethod(klass, methodName, classes, arguments); + } finally { + if (log.isDebugEnabled()) { + log.debug("Inspected classes : " + classes); + } + classes.clear(); + } if (method == null && strict) { throw new IllegalArgumentException( "could not find method " + methodName + " on type " +

1 0

r1874 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:14:18 +0200 (Wed, 09 Jun 2010) New Revision: 1874 Url: http://nuiton.org/repositories/revision/nuiton-utils/1874 Log: add usefull methods in ReflectionUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-08 09:01:57 UTC (rev 1873) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) @@ -25,13 +25,20 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Des méthodes utiles d'introspection * @@ -39,6 +46,10 @@ */ public class ReflectUtil { + + /** Logger */ + static private Log log = LogFactory.getLog(ReflectUtil.class); + /** * Pour déterminer si un champ d'une classe est une constante * (modifiers sont static, final et public) @@ -57,7 +68,7 @@ * <p/> * L'algorithme parcourt aussi les superclasses. * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass la classe contenant les constantes * @param searchingClass le type des champs constants à récupérer * @return la liste des champs du type requis dans @@ -86,7 +97,7 @@ } /** - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass the required class * @param fieldName the required constant name * @return the constant value @@ -111,7 +122,7 @@ /** * Convertit une classe non typée, en une classe d'enum * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param type la classe a typer * @return la classe typee * @throws IllegalArgumentException si le type est null ou non une extension @@ -127,4 +138,218 @@ } return (Class<T>) type; } + + /** + * Cherche une methode selon son nom et ses paramètres d'invocation. + * + * @param klass la classe dans laquelle rechercher la méthode + * @param methodName le nom de la méthode recherchée + * @param strict un drapeau pour déclancher une exception si la méthode + * n'est pas trouvée + * @param arguments les arguments d'invocation de la méthode + * @return la méthode trouvée + * @throws IllegalArgumentException si la méthode n'est pas trouvée et que + * le drapeau {@code strict} est à {@code true} + * @since 1.3.1 + */ + public static Method getDeclaredMethod(Class<?> klass, + String methodName, + boolean strict, + Object... arguments) throws IllegalArgumentException { + Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + if (method == null && strict) { + throw new IllegalArgumentException( + "could not find method " + methodName + " on type " + + klass.getName()); + } + + return method; + } + + /** + * Obtain the boxed type of any incoming type. + * <p/> + * If incoming type is not a primitive type, then just returns himself. + * + * @param type the type to box + * @return the boxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> boxType(Class<?> type) { + if (!type.isPrimitive()) { + return type; + } + if (boolean.class.equals(type)) { + return Boolean.class; + } + if (char.class.equals(type)) { + return Character.class; + } + if (byte.class.equals(type)) { + return Byte.class; + } + if (short.class.equals(type)) { + return Short.class; + } + if (int.class.equals(type)) { + return Integer.class; + } + if (long.class.equals(type)) { + return Long.class; + } + if (float.class.equals(type)) { + return Float.class; + } + if (double.class.equals(type)) { + return Double.class; + } + if (void.class.equals(type)) { + return Void.class; + } + // should never come here... + return type; + + } + + /** + * Obtain the unboxed type of any incoming type. + * <p/> + * If incoming type is a primitive type, then just returns himself. + * + * @param type the type to unbox + * @return the unboxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> unboxType(Class<?> type) { + if (type.isPrimitive()) { + return type; + } + if (Boolean.class.equals(type)) { + return boolean.class; + } + if (Character.class.equals(type)) { + return char.class; + } + if (Byte.class.equals(type)) { + return byte.class; + } + if (Short.class.equals(type)) { + return short.class; + } + if (Integer.class.equals(type)) { + return int.class; + } + if (Long.class.equals(type)) { + return long.class; + } + if (Float.class.equals(type)) { + return float.class; + } + if (Double.class.equals(type)) { + return double.class; + } + if (Void.class.equals(type)) { + return void.class; + } + + // not a primitive type + return type; + + } + + protected static Method getDeclaredMethod(Class<?> klass, + String methodName, + Set<Class<?>> visitedClasses, + Object... arguments) { + if (visitedClasses.contains(klass)) { + + // this means class was already unsucessfull visited + return null; + } + visitedClasses.add(klass); + Method method = null; + for (Method m : klass.getDeclaredMethods()) { + if (!methodName.equals(m.getName())) { + continue; + } + + // same method name + + Class<?>[] types = m.getParameterTypes(); + if (arguments.length != types.length) { + continue; + } + + // same number arguments + + Class<?>[] prototype = m.getParameterTypes(); + if (log.isDebugEnabled()) { + log.debug("Found a method with same parameters size : " + + m.getName() + " : " + Arrays.toString(prototype)); + } + int index = 0; + boolean parametersMatches = true; + for (Object argument : arguments) { + Class<?> type = prototype[index++]; + if (argument == null) { + + // can not say anything, let says it is ok... + continue; + } + Class<?> runtimeType = argument.getClass(); + if (log.isDebugEnabled()) { + log.debug("Test parameter [" + (index - 1) + "] : " + + type + " vs " + runtimeType); + } + + type = boxType(type); + runtimeType = boxType(runtimeType); + + if (!type.equals(runtimeType) || + !type.isAssignableFrom(runtimeType)) { + + // not same type + parametersMatches = false; + break; + } + } + if (parametersMatches) { + + // same parameters types, this is a match + method = m; + } + break; + } + if (method == null) { + + // try on super class + if (klass.getSuperclass() != null) { + method = getDeclaredMethod(klass.getSuperclass(), + methodName, + visitedClasses, + arguments + ); + } + } + + if (method == null) { + + // try on interfaces + Class<?>[] interfaces = klass.getInterfaces(); + for (Class<?> anInterface : interfaces) { + method = getDeclaredMethod(anInterface, + methodName, + visitedClasses, + arguments + ); + if (method != null) { + break; + } + } + } + return method; + + } }

1 0

r1873 - trunk
by echatellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: echatellier Date: 2010-06-08 11:01:57 +0200 (Tue, 08 Jun 2010) New Revision: 1873 Url: http://nuiton.org/repositories/revision/nuiton-utils/1873 Log: Update to 0.9.10-hudson-20 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) +++ trunk/pom.xml 2010-06-08 09:01:57 UTC (rev 1873) @@ -92,7 +92,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> + <version>0.9.10-hudson-20</version> <scope>provided</scope> </dependency>

1 0

r1872 - trunk
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 12:29:15 +0200 (Wed, 02 Jun 2010) New Revision: 1872 Url: http://nuiton.org/repositories/revision/nuiton-utils/1872 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 13:31:51 UTC (rev 1871) +++ trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1871 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 15:31:51 +0200 (Tue, 01 Jun 2010) New Revision: 1871 Url: http://nuiton.org/repositories/revision/nuiton-utils/1871 Log: - use new converter api - let OptionDef be Serializable 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-05-28 10:13:06 UTC (rev 1870) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-01 13:31:51 UTC (rev 1871) @@ -26,6 +26,8 @@ package org.nuiton.util; +import org.nuiton.util.converter.ConverterUtil; + import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.collections.EnumerationUtils; import org.apache.commons.logging.Log; @@ -63,7 +65,7 @@ /** * Application configuration. * - * <h3>TODO</h3> + * <h3>A finir...</h3> * <ul> * <li>Ajout d'annotations sur les methodes * pour preciser plus de chose pour les options (pattern, min/max, alias, @@ -408,7 +410,7 @@ * * @since 1.0.0-rc-9 */ - public interface OptionDef { + public interface OptionDef extends Serializable { /** * @return la clef identifiant l'option

1 0

r1870 - trunk/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 28 May '10

28 May '10

Author: tchemit Date: 2010-05-28 12:13:06 +0200 (Fri, 28 May 2010) New Revision: 1870 Url: http://nuiton.org/repositories/revision/nuiton-utils/1870 Log: fix bug (too much code...) Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-25 13:41:02 UTC (rev 1869) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-28 10:13:06 UTC (rev 1870) @@ -209,7 +209,7 @@ */ public void copy(I source, O target, String... propertyNames) { copy(source, target, false, propertyNames); - } + } /** * Copy properties from a source bean to a destination one according to @@ -236,24 +236,24 @@ * <b>Note:</b> If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst}. * - * @param source the bean to read - * @param target the bean to write + * @param source the bean to read + * @param target the bean to write * @param excludeProperties true to exclude following {@code propertyNames} - * @param propertyNames optional subset of properties to copy (if none is - * specifed, will use all the properties defined in - * binder) + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) * @throws NullPointerException if target parameter is {@code null} */ protected void copy(I source, O target, boolean excludeProperties, - String... propertyNames) + String... propertyNames) throws NullPointerException { if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } propertyNames = excludeProperties ? - getAllPropertiesExclude(propertyNames) : - getProperties(propertyNames); + getAllPropertiesExclude(propertyNames) : + getProperties(propertyNames); for (String sourceProperty : propertyNames) { @@ -288,10 +288,6 @@ // specific collection strategy is set, must use it read = getCollectionValue(sourceProperty, read); } - if (model.containsCollectionProperty(sourceProperty)) { - // specific collection strategy is set, must use it - read = getCollectionValue(sourceProperty, read); - } model.getTargetWriteMethod(targetProperty).invoke(target, read); } catch (IllegalAccessException e) { throw new RuntimeException(e); @@ -350,10 +346,10 @@ } /** - * Obtains all properties from binder's model except those {@code + * Obtains all properties from binder's model except those {@code * propertyNameExcludes}. Unknown properties will be ignored. * - * @param propertyNameExcludes name of properties to exclude + * @param propertyNameExcludes name of properties to exclude * @return the array of property names without those in argument */ protected String[] getAllPropertiesExclude(String... propertyNameExcludes) { @@ -361,7 +357,7 @@ List<String> results = new ArrayList<String>(); for (String propertyName : model.getSourceDescriptors()) { if (!excludes.contains(propertyName)) { - results.add(propertyName); + results.add(propertyName); } } return results.toArray(new String[results.size()]);

1 0

r1869 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 25 May '10

25 May '10

Author: sletellier Date: 2010-05-25 15:41:02 +0200 (Tue, 25 May 2010) New Revision: 1869 Url: http://nuiton.org/repositories/revision/nuiton-utils/1869 Log: Add 3 method to get the difference between two dates in second, minutes and hours Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:36:14 UTC (rev 1868) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:41:02 UTC (rev 1869) @@ -87,8 +87,8 @@ * The month is the real month of the year and not the one which is stored * in Calendar object. * @param s value of the seconds 1-60 - * @param dd value of the minutes 1-60 - * @param dd value of the hours 1-24 + * @param m value of the minutes 1-60 + * @param h value of the hours 1-24 * @param dd value of the day 1-31 * @param mm value of the month 1-12 * @param yy value of the year 0-9999

1 0

r1868 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by sletellier＠users.nuiton.org 25 May '10

25 May '10

Author: sletellier Date: 2010-05-25 15:36:14 +0200 (Tue, 25 May 2010) New Revision: 1868 Url: http://nuiton.org/repositories/revision/nuiton-utils/1868 Log: Add 3 method to get the difference between two dates in second, minutes and hours Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-20 14:34:45 UTC (rev 1867) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:36:14 UTC (rev 1868) @@ -85,6 +85,29 @@ /** * Create a new date from day, month and year (French version). * The month is the real month of the year and not the one which is stored + * in Calendar object. + * @param s value of the seconds 1-60 + * @param dd value of the minutes 1-60 + * @param dd value of the hours 1-24 + * @param dd value of the day 1-31 + * @param mm value of the month 1-12 + * @param yy value of the year 0-9999 + * @return a new date + */ + public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, yy); + calendar.set(Calendar.MONTH, mm-1); + calendar.set(Calendar.DAY_OF_MONTH, dd); + calendar.set(Calendar.HOUR_OF_DAY, h); + calendar.set(Calendar.MINUTE, m); + calendar.set(Calendar.SECOND, s); + return calendar.getTime(); + } + + /** + * Create a new date from day, month and year (French version). + * The month is the real month of the year and not the one which is stored * in Calendar object. Time is set to 00:00:00.000 * @param dd value of the day 1-31 * @param mm value of the month 1-12 @@ -221,6 +244,50 @@ /** * Do the difference between the two dates in argument. The result is a number + * of seconds between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of seconds between beginDate and endDate + */ + public static int getDifferenceInSeconds(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + return (int) Math.ceil((end - begin) / 1000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of minutes between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of minutes between beginDate and endDate + */ + public static int getDifferenceInMinutes(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 60000 = 60 * 1000 + return (int) Math.ceil((end - begin) / 60000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of hours between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of hours between beginDate and endDate + */ + public static int getDifferenceInHours(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 3600000 = 60 * 60 * 1000 + return (int) Math.ceil((end - begin) / 3600000); + } + + /** + * Do the difference between the two dates in argument. The result is a number * of days between the two dates. * Ex : 28/01/2009 and 08/02/2009 return 11. * @@ -249,7 +316,7 @@ int count = 0; Calendar fromCalendar = getDefaultCalendar(beginDate); Calendar thruCalendar = getDefaultCalendar(endDate); - + while (fromCalendar.before(thruCalendar)) { fromCalendar.add(Calendar.MONTH, 1); count++; @@ -279,7 +346,7 @@ } /** - * Get the date before today (so yesterday no ?) + * Get the date before today * * @param date concerned * @return Date before today Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-05-20 14:34:45 UTC (rev 1867) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-05-25 13:36:14 UTC (rev 1868) @@ -178,6 +178,57 @@ } @Test + public void testGetDifferenceInSeconds() { + System.out.println("getDifferenceInSecondes"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 11, 0, 3, 2, 2009); + + int result = DateUtils.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(30, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtils.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(161, result); + } + + @Test + public void testGetDifferenceInMinutes() { + System.out.println("getDifferenceInMinutes"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 12, 0, 3, 2, 2009); + + int result = DateUtils.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(1, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtils.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(2, result); + } + + @Test + public void testGetDifferenceInHours() { + System.out.println("getDifferenceInHours"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 11, 0, 4, 2, 2009); + + int result = DateUtils.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(24, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 8, 28, 1, 2009); + + result = DateUtils.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(8, result); + } + + @Test public void testGetDifferenceInDays() { System.out.println("getDifferenceInDays");

1 0

r1867 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 20 May '10

20 May '10

Author: echatellier Date: 2010-05-20 16:34:45 +0200 (Thu, 20 May 2010) New Revision: 1867 Url: http://nuiton.org/repositories/revision/nuiton-utils/1867 Log: Load both SystemClassLoader and currentclassloader 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-05-20 13:52:30 UTC (rev 1866) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-20 14:34:45 UTC (rev 1867) @@ -1465,19 +1465,21 @@ Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); + enumInClasspath = ApplicationConfig.class.getClassLoader().getResources(filename); + urlsInClasspath.addAll(EnumerationUtils.toList(enumInClasspath)); + + if (log.isDebugEnabled() && urlsInClasspath.isEmpty()) { + log.debug("No configuration file found in classpath : /" + filename); + } + + /* TODO EC20100515 not sure if it's usefull :( if (urlsInClasspath.isEmpty()) { URL inClasspath = ApplicationConfig.class.getResource("/" + filename); if (inClasspath != null) { urlsInClasspath.add(inClasspath); } - else { - if (log.isDebugEnabled()) { - log.debug("No configuration file found in classpath : /" + - filename); - } - } - } + }*/ for (URL inClasspath : urlsInClasspath) { if (log.isInfoEnabled()) { log.info("Loading configuration file (classpath) : " +

1 0

r1866 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 20 May '10

20 May '10

Author: echatellier Date: 2010-05-20 15:52:30 +0200 (Thu, 20 May 2010) New Revision: 1866 Url: http://nuiton.org/repositories/revision/nuiton-utils/1866 Log: #627 : Support multiples loading from classpath 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-05-18 15:39:59 UTC (rev 1865) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-20 13:52:30 UTC (rev 1866) @@ -27,6 +27,7 @@ package org.nuiton.util; import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.collections.EnumerationUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +50,7 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -1460,13 +1462,23 @@ // classpath String filename = getConfigFileName(); - URL inClasspath = - ClassLoader.getSystemClassLoader().getResource(filename); - if (inClasspath == null) { - inClasspath = ApplicationConfig.class.getResource("/" + + Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); + List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); + + if (urlsInClasspath.isEmpty()) { + URL inClasspath = ApplicationConfig.class.getResource("/" + filename); + if (inClasspath != null) { + urlsInClasspath.add(inClasspath); + } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in classpath : /" + + filename); + } + } } - if (inClasspath != null) { + for (URL inClasspath : urlsInClasspath) { if (log.isInfoEnabled()) { log.info("Loading configuration file (classpath) : " + inClasspath); @@ -1478,12 +1490,6 @@ stream.close(); } } - else { - if (log.isDebugEnabled()) { - log.debug("No configuration file found in classpath : /" + - filename); - } - } // system directory File etcConfig = getSystemConfigFile();

1 0