Changeset 74:e5ff09208c28 in AnnotationManagerN4J for src

Timestamp:

Mar 12, 2014, 11:42:28 AM (10 years ago)

Author:

casties

Branch:

default

Message:

search files in webapp in WEB-INF folder.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (4 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

@@ -337 +337 @@
 
     /**
-     * returns resource from path (in webapp) as InputStream.
+     * returns resource from path as InputStream.
+     * 
+     * Tries path in webapp first, then uses classpath loader.
+     * Relative paths in webapp start in /WEB-INF/.
      * 
      * @param sc
@@ -348 +351 @@
             // no servlet context -> use class loader
             ps = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
-            /* Request request = new Request(Method.GET, "riap://component/ping");
-               Response response = getContext().getClientDispatcher().handle(request);
-               Representation repr = response.getEntity(); */
         } else {
             // try path in webapp first
-            ps = sc.getResourceAsStream(path);
+            String webPath = path;
+            if (!webPath.startsWith("/")) {
+                // relative path in webapp starts in WEB-INF
+                webPath = "WEB-INF/" + webPath;
+            }
+            ps = sc.getResourceAsStream(webPath);
             if (ps == null) {
                 // try as file
-                File pf = new File(sc.getRealPath(path));
+                File pf = new File(sc.getRealPath(webPath));
                 if (pf.canRead()) {
                     logger.debug("trying file for: " + pf);
@@ -377 +382 @@
      * 
      * If filename starts with "/" its treated as absolute else the path is
-     * appended to the base directory of the web-app.
+     * appended to the /WEB-INF/ directory in the web-app.
      * 
      * @param filename
@@ -388 +393 @@
         if (!f.isAbsolute() && sc != null) {
             // relative path -> use getRealPath to resolve in webapp
-            filename = sc.getRealPath(filename);
+            filename = sc.getRealPath("WEB-INF/" + filename);
         }
         return filename;