Merge branch 'master' into javawebsocket-jsr

2013-05-13 10:01:25 -07:00 · 2013-05-13 10:01:25 -07:00 · 6e918927f2
parent ceabca5fbe 79f6121894
commit 6e918927f2
1 changed files with 1 additions and 1 deletions
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
@ -67,7 +67,7 @@ public class MavenAnnotationConfiguration extends AnnotationConfiguration
                //scan the equivalent of the WEB-INF/classes directory that has been synthesised by the plugin
                if (f.isDirectory() && f.exists())
                {
-                    doParse(context, parser, Resource.newResource(f.toURL()));
+                    doParse(context, parser, Resource.newResource(f.toURI()));
                }
            }