svn commit: r778615 - /myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java

[lo...@apache.org]

Author: lofwyr
Date: Tue May 26 08:29:48 2009
New Revision: 778615

URL: http://svn.apache.org/viewvc?rev=778615&view=rev
Log:
TOBAGO-758: ResourceServlet should be able to load data from JAR files (META-INF/resources)

Modified:
    myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java

Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=778615&r1=778614&r2=778615&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Tue May 26 08:29:48 2009
@@ -22,8 +22,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.util.MimeTypeUtils;
 
-import javax.servlet.ServletException;
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -62,6 +62,7 @@
 
   private Long expires;
 
+  @Override
   public void init(ServletConfig servletConfig) throws ServletException {
     super.init(servletConfig);
     String expiresString = servletConfig.getInitParameter("expires");
@@ -101,7 +102,15 @@
     InputStream inputStream = null;
     try {
       ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-      inputStream = classLoader.getResourceAsStream(resource);
+
+      // meta inf (like in servlet 3.0)
+      inputStream = classLoader.getResourceAsStream("META-INF/resources/" + resource);
+
+      // "normal" classpath
+      if (inputStream == null) {
+        inputStream = classLoader.getResourceAsStream(resource);
+      }
+
       if (inputStream != null) {
         IOUtils.copy(inputStream, response.getOutputStream());
       } else {