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

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

Author: scott.stark at jboss.org
Date: 2007-10-27 01:33:30 -0400 (Sat, 27 Oct 2007)
New Revision: 66510

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Create the merge view even if there is no jboss.xml and validate the modules

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-10-27 03:49:43 UTC (rev 66509)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-10-27 05:33:30 UTC (rev 66510)
@@ -162,8 +162,6 @@
             try
             {
                appMetaData = (JBossAppMetaData) unmarshaller.unmarshal(in, resolver);
-               // Create the merged view
-               appMetaData.merge(appMetaData, specMetaData);
             }
             finally
             {
@@ -176,6 +174,9 @@
             appMetaData = new JBossAppMetaData();
             specMetaData = new EarMetaData();
          }
+         // Create the merged view
+         appMetaData.merge(appMetaData, specMetaData);
+
          // Add the ear lib contents to the classpath
          String libDir = appMetaData.getLibraryDirectory() == null ? "lib" : appMetaData.getLibraryDirectory();
          try
@@ -217,6 +218,7 @@
 
          // Create subdeployments for the ear modules
          ModulesMetaData modules = appMetaData.getModules();
+         if(modules != null)
          for (ModuleMetaData mod : modules)
          {
             String fileName = mod.getFileName();