Author: dblevins
Date: Tue May  1 00:05:33 2012
New Revision: 1332477

URL: http://svn.apache.org/viewvc?rev=1332477&view=rev
Log:
Fix for TOMEE_23 -- trying to deploy .DS_Store files on OSX

Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1332477&r1=1332476&r2=1332477&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Tue May  1 00:05:33 2012
@@ -969,6 +969,10 @@ public class TomcatWebAppBuilder impleme
                     if (name.toLowerCase().endsWith(".war") || 
name.equals("ROOT") || name.equalsIgnoreCase("META-INF") || 
name.equalsIgnoreCase("WEB-INF")) {
                         continue;
                     }
+                    // Simple fix for TOMEE-23
+                    if (name.toLowerCase().equals(".ds_store")) {
+                        continue;
+                    }
                     // ignore unpacked web apps
                     if (file.isDirectory() && new File(file, 
"WEB-INF").exists()) {
                         continue;


Reply via email to