svn commit: r1417504 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config: DeploymentLoader.java DeploymentsResolver.java

[andygumbrecht]

Author: andygumbrecht
Date: Wed Dec  5 16:18:01 2012
New Revision: 1417504

URL: http://svn.apache.org/viewvc?rev=1417504&view=rev
Log:
Case insensitive.
Filter out empty dir.

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1417504&r1=1417503&r2=1417504&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Wed Dec  5 16:18:01 2012
@@ -1516,8 +1516,9 @@ public class DeploymentLoader implements
     private static boolean containsWebAssets(final File[] files) {
         if (files != null) {
             for (final File file : files) {
-                if (file.getName().endsWith(".jsp")) return true;
-                if (file.getName().endsWith(".html")) return true;
+                final String fn = file.getName().toLowerCase();
+                if (fn.endsWith(".jsp")) return true;
+                if (fn.endsWith(".html")) return true;
             }
         }
         return false;
@@ -1526,9 +1527,10 @@ public class DeploymentLoader implements
     private static boolean containsEarAssets(final File[] files) {
         if (files != null) {
             for (final File file : files) {
-                if (file.getName().endsWith(".jar")) return true;
-                if (file.getName().endsWith(".war")) return true;
-                if (file.getName().endsWith(".rar")) return true;
+                final String fn = file.getName().toLowerCase();
+                if (fn.endsWith(".jar")) return true;
+                if (fn.endsWith(".war")) return true;
+                if (fn.endsWith(".rar")) return true;
             }
         }
         return false;

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1417504&r1=1417503&r2=1417504&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
 Wed Dec  5 16:18:01 2012
@@ -62,7 +62,7 @@ public class DeploymentsResolver impleme
         }
     }
 
-    public static boolean isValidDirectory(final File file) {
+    protected static boolean isValidDirectory(final File file) {
 
         if (file.isDirectory() && !file.isHidden() && !file.equals(lib)) {
 
@@ -74,7 +74,9 @@ public class DeploymentsResolver impleme
                 }
             }
 
-            return true;
+            final String[] files = file.list();
+
+            return (null != files && files.length > 0);
         }
 
         return false;