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

[an...@apache.org]

Author: andygumbrecht
Date: Wed Dec  5 11:42:53 2012
New Revision: 1417367

URL: http://svn.apache.org/viewvc?rev=1417367&view=rev
Log:
Filter out known invalid directories from TOMEE-613

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.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=1417367&r1=1417366&r2=1417367&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 11:42:53 2012
@@ -88,6 +88,7 @@ public class DeploymentLoader implements
     private boolean scanManagedBeans = true;
     private static final Collection<String> KNOWN_DESCRIPTORS = Arrays.asList("app-ctx.xml", "module.properties", "application.properties", "web.xml", "ejb-jar.xml", "openejb-jar.xml", "env-entries.properties", "beans.xml", "ra.xml", "application.xml", "application-client.xml", "persistence-fragment.xml", "persistence.xml", "validation.xml", NewLoaderLogic.EXCLUSION_FILE);
     private static String ALTDD = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
+    private static final String[] ignoreDirs = SystemInstance.get().getProperty("openejb.ignore.directories", ".svn,_svn,cvs").split(",");
 
     public AppModule load(final File jarFile) throws OpenEJBException {
         // verify we have a valid file
@@ -1482,10 +1483,24 @@ public class DeploymentLoader implements
             return PersistenceModule.class;
         }
 
+        //#TOMEE-613
         final File file = URLs.toFile(baseUrl);
-        if (file.isDirectory() && !file.equals(SystemInstance.get().getHome().getDirectory("lib", false))) {
-            if (containsEarAssets(file)) return AppModule.class;
-            if (containsWebAssets(file)) return WebModule.class;
+        if (file.isDirectory() && !file.isHidden() && !file.equals(SystemInstance.get().getHome().getDirectory("lib", false))) {
+
+            final String fn = file.getName();
+            boolean checkEAR = true;
+
+            for (final String dir : ignoreDirs) {
+                if (fn.equalsIgnoreCase(dir)) {
+                    checkEAR = false;
+                    break;
+                }
+            }
+
+            if (checkEAR) {
+                if (containsEarAssets(file)) return AppModule.class;
+                if (containsWebAssets(file)) return WebModule.class;
+            }
         }
 
         final Class<? extends DeploymentModule> defaultType = (Class<? extends DeploymentModule>) SystemInstance.get().getOptions().get("openejb.default.deployment-module", (Class<?>) null);