diff options
author | Greg Wilkins | 2011-09-06 04:29:33 +0000 |
---|---|---|
committer | Greg Wilkins | 2011-09-06 04:29:33 +0000 |
commit | ba5af45d17638c17cb49376da8184fd27d76ece5 (patch) | |
tree | 88d738787f5b459850c5a6b8962b08c08144d8bf | |
parent | 8e67fd926b2a05373d191d038be9b9e3d8d83a0f (diff) | |
download | org.eclipse.jetty.project-ba5af45d17638c17cb49376da8184fd27d76ece5.tar.gz org.eclipse.jetty.project-ba5af45d17638c17cb49376da8184fd27d76ece5.tar.xz org.eclipse.jetty.project-ba5af45d17638c17cb49376da8184fd27d76ece5.zip |
350634 Added Resource.newResource(File)
-rw-r--r-- | jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java | 4 | ||||
-rw-r--r-- | jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java index 1cf2ce18b4..64e6a4d1ad 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java @@ -114,9 +114,9 @@ public class FileResource extends URLResource if (_urlString.endsWith("/")) _urlString=_urlString.substring(0,_urlString.length()-1); } - + } - + /* -------------------------------------------------------- */ FileResource(URL url, URLConnection connection, File file) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index 4cb78891eb..93be57c774 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -166,8 +166,7 @@ public abstract class Resource implements ResourceFactory URLConnection connection=url.openConnection(); connection.setUseCaches(useCaches); - FileResource fileResource= new FileResource(url,connection,file); - return fileResource; + return new FileResource(url,connection,file); } catch(Exception e2) { @@ -200,6 +199,18 @@ public abstract class Resource implements ResourceFactory } /* ------------------------------------------------------------ */ + public static Resource newResource (File file) + throws MalformedURLException, IOException + { + file = file.getCanonicalFile(); + URL url = Resource.toURL(file); + + URLConnection connection = url.openConnection(); + FileResource fileResource = new FileResource(url, connection, file); + return fileResource; + } + + /* ------------------------------------------------------------ */ /** Construct a system resource from a string. * The resource is tried as classloader resource before being * treated as a normal resource. |