Author: tchemit Date: 2008-04-08 10:53:40 +0000 (Tue, 08 Apr 2008) New Revision: 782 Modified: trunk/lutinutil/src/java/org/codelutin/util/Resource.java Log: fix bug : pb with url encoding in Resource.getUrl form windows : we should use the system encoding to discover url, but our encoding for reading content of files! Modified: trunk/lutinutil/src/java/org/codelutin/util/Resource.java =================================================================== --- trunk/lutinutil/src/java/org/codelutin/util/Resource.java 2008-04-03 16:52:05 UTC (rev 781) +++ trunk/lutinutil/src/java/org/codelutin/util/Resource.java 2008-04-08 10:53:40 UTC (rev 782) @@ -81,7 +81,7 @@ Method method = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class}); method.setAccessible(true); - method.invoke(classLoader, new Object[]{url}); + method.invoke(classLoader, url); }catch(Exception eee){ throw new RuntimeException("Can't add url in default classloader", eee); } @@ -288,14 +288,20 @@ for (URL urlFile : arrayURL) { String fileName = urlFile.getFile(); - File file = new File(fileName); - + //TODO deal with encoding in windows, this is very durty, but it works... + File file= new File(fileName.replaceAll("%20", " ")); // cas ou le ichier du classLoader est un fichier jar ou zip if (file.exists() && (isJar(fileName) || isZip(fileName))) { + if (log.isDebugEnabled()) { + log.info("jar to search " + file); + } urlList.addAll(Resource.getURLsFromJar(file, pattern)); // cas ou le ichier du classLoader est un repertoire } else if (file.exists() && file.isDirectory()) { + if (log.isDebugEnabled()) { + log.debug("file to search " + file); + } // on traite le cas ou il peut y avoir des repertoire dans ce repertoire urlList.addAll(Resource.getURLsFromDirectory(file, pattern)); } @@ -330,7 +336,7 @@ path =new File(container,s); } else { path =new File(s); - } + } if (log.isDebugEnabled()) { log.debug(path); }