svn commit: r615877 - /incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

[fm...@apache.org]

Author: fmeschbe
Date: Mon Jan 28 05:41:35 2008
New Revision: 615877

URL: http://svn.apache.org/viewvc?rev=615877&view=rev
Log:
If the request resource adapts to a Servlet and the request extension is not null
use the requested resource as the Servlet to handle the request.

Modified:
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=615877&r1=615876&r2=615877&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Mon Jan 28 05:41:35 2008
@@ -122,6 +122,18 @@
      * @see org.apache.sling.api.servlets.ServletResolver#resolveServlet(org.apache.sling.api.SlingHttpServletRequest)
      */
     public Servlet resolveServlet(SlingHttpServletRequest request) {
+
+        // TODO: tentative implementation
+        // if the request extension is not null and the request resource adapts
+        // to a servlet, use that directly
+        // check whether the resource adapts to servlet (maybe script)
+        if (request.getRequestPathInfo().getExtension() != null) {
+            Servlet resourceServlet = request.getResource().adaptTo(Servlet.class);
+            if (resourceServlet != null) {
+                return resourceServlet;
+            }
+        }
+        
         ResourceResolver resolver = request.getResourceResolver();
         String baseName = PathSupport.getScriptBaseName(request);