svn commit: r1626046 - in /tomee/tomee/trunk: server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java

[rmannibucau]

Author: rmannibucau
Date: Thu Sep 18 18:51:13 2014
New Revision: 1626046

URL: http://svn.apache.org/r1626046
Log:
support static resource config even in tomee for cxf-rs

Modified:
    
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
    
tomee/tomee/trunk/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java

Modified: 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1626046&r1=1626045&r2=1626046&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Thu Sep 18 18:51:13 2014
@@ -204,13 +204,13 @@ public class CxfRsHttpListener implement
         }
     }
 
-    private boolean matchPath(final HttpServletRequest request) {
+    public boolean matchPath(final HttpServletRequest request) {
         if (staticResourcesList.isEmpty()) {
             return false;
         }
 
-        String path = request.getPathInfo();
-        if (path == null) {
+        String path = 
request.getRequestURI().substring(request.getContextPath().length());
+        if (path == null || path.isEmpty()) {
             path = "/";
         }
         for (final Pattern pattern : staticResourcesList) {

Modified: 
tomee/tomee/trunk/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java?rev=1626046&r1=1626045&r2=1626046&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
 Thu Sep 18 18:51:13 2014
@@ -59,7 +59,7 @@ public class CXFJAXRSFilter implements F
         final HttpServletRequest httpServletRequest = 
HttpServletRequest.class.cast(request);
         final HttpServletResponse httpServletResponse = 
HttpServletResponse.class.cast(response);
 
-        if (CxfRsHttpListener.TRY_STATIC_RESOURCES) {
+        if (CxfRsHttpListener.TRY_STATIC_RESOURCES || 
delegate.matchPath(httpServletRequest)) {
             final InputStream staticContent = 
delegate.findStaticContent(httpServletRequest, welcomeFiles);
             if (staticContent != null) {
                 chain.doFilter(request, response);