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) : " +