svn commit: r1606668 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources: AdditionalDocBase.java EmptyDirContext.java

[rmannibucau]

Author: rmannibucau
Date: Mon Jun 30 10:16:18 2014
New Revision: 1606668

URL: http://svn.apache.org/r1606668
Log:
more generic regex to know which resources we should read from webapp and which 
ones from target/classes. Can still be refined

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java?rev=1606668&r1=1606667&r2=1606668&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
 Mon Jun 30 10:16:18 2014
@@ -27,12 +27,16 @@ import java.io.File;
 public class AdditionalDocBase extends FileDirContext {
     private static final String PREFIX = "/META-INF/resources";
     private static final int PREFIX_LENGTH = PREFIX.length();
+    private static final String WEB_INF_CLASSES = "/WEB-INF/classes";
 
     @Override
     protected File file(final String name) {
         if (name.startsWith(PREFIX)) {
             return super.file(name.substring(PREFIX_LENGTH));
         }
+        if (WEB_INF_CLASSES.equals(name)) {
+            return super.file("/");
+        }
         return super.file(name);
     }
 }

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java?rev=1606668&r1=1606667&r2=1606668&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java
 Mon Jun 30 10:16:18 2014
@@ -54,9 +54,8 @@ public class EmptyDirContext extends Fil
     }
 
     private static boolean shouldLookup(final String name) {
-        return name != null
-                && (
-                name.startsWith("/WEB-INF/classes") || 
name.startsWith("WEB-INF/classes")
+        return name != null && !name.equals("/WEB-INF/classes")
+                && (name.matches("/?WEB-INF/[^/]*\\.?[^/]")
                 || name.startsWith("/WEB-INF/lib") || 
name.startsWith("WEB-INF/lib")
                 || name.startsWith("/META-INF/"));
     }