svn commit: r1182491 - in /myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad: resource/ResourceLoader.java webapp/ResourceServlet.java

[gc...@apache.org]

Author: gcrawford
Date: Wed Oct 12 17:43:20 2011
New Revision: 1182491

URL: http://svn.apache.org/viewvc?rev=1182491&view=rev
Log:
TRINIDAD-2142 Nothing written to the server log when the ResourceServlet fails to load a resource.

Thanks to Marky

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/ResourceLoader.java
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/ResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/ResourceLoader.java?rev=1182491&r1=1182490&r2=1182491&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/ResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/ResourceLoader.java Wed Oct 12 17:43:20 2011
@@ -83,6 +83,18 @@ public class ResourceLoader
     return _parent == null || _parent.isCachable();
   }
 
+  @Override public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    result.append(super.toString());
+    
+    if (_parent != null)
+    {
+      result.append("("+_parent.toString()+")");
+    }
+    return result.toString();
+  }
+
   /**
    * Finds the resource with the given name. Resource loader implementations
    * should override this method to specify where to find resources.  </p>

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java?rev=1182491&r1=1182490&r2=1182491&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Wed Oct 12 17:43:20 2011
@@ -199,6 +199,12 @@ public class ResourceServlet extends Htt
     // Make sure the resource is available
     if (url == null)
     {
+      // log some details on the failure
+      _LOG.warning("URL for resource not found.\n  resourcePath: {0}\n  loader class name: {1}\n  request.pathTranslated: {2}\n  request.requestURL: {3}",
+                   new Object[] { resourcePath, 
+                                  loader, 
+                                  request.getPathTranslated(), 
+                                  request.getRequestURL() });
       response.sendError(HttpServletResponse.SC_NOT_FOUND);
       return;
     }