[jboss-cvs] JBossAS SVN: r58092 - trunk/server/src/main/org/jboss/deployment

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-03 15:43:55 -0500 (Fri, 03 Nov 2006)
New Revision: 58092

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Don't include ear modules with an unknown type

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-03 20:18:11 UTC (rev 58091)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-03 20:43:55 UTC (rev 58092)
@@ -234,8 +234,11 @@
          {
             String module = earRelativePath(earPath, archive.getPathName());
             int type = typeFromSuffix(module, archive);
-            J2eeModuleMetaData mod = new J2eeModuleMetaData(type, module);
-            j2eeMetaData.addModule(mod);
+            if( type >= 0 )
+            {
+               J2eeModuleMetaData mod = new J2eeModuleMetaData(type, module);
+               j2eeMetaData.addModule(mod);
+            }
          }
       }
    }
@@ -243,7 +246,7 @@
    private int typeFromSuffix(String path, VirtualFile archive)
       throws IOException
    {
-      int type = 0;
+      int type = -1;
       if( path.endsWith(".war") )
          type = J2eeModuleMetaData.WEB;
       else if( path.endsWith(".rar") )