Author: echatellier Date: 2013-11-23 21:16:43 +0100 (Sat, 23 Nov 2013) New Revision: 309 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/309 Log: fixes #2928: Can't load nuiton-js files from directory Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java 2013-11-23 15:53:07 UTC (rev 308) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java 2013-11-23 20:16:43 UTC (rev 309) @@ -189,15 +189,18 @@ // recuperation du path du jar sans la partie query String jarPath = StringUtils.substringBefore(url.getPath(), "!"); - jarPath = StringUtils.substringAfter(jarPath, "file:"); + if (jarPath.startsWith("file:")) { + jarPath = StringUtils.substringAfter(jarPath, "file:"); + } File jarFile = new File(jarPath); List<String> allFiles = new ArrayList<String>(); // dans le classpath on peut avoir des repertoires ou des fichiers if (jarFile.isDirectory()) { + String filePattern = FilenameUtils.getName(pattern); Collection<File> files = FileUtils.listFiles(jarFile, - new WildcardFileFilter(pattern), + new WildcardFileFilter(filePattern), TrueFileFilter.INSTANCE); for (File f : files) { allFiles.add(f.toURI().toURL().toString());