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

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

Author: alesj
Date: 2011-01-26 23:51:02 -0500 (Wed, 26 Jan 2011)
New Revision: 110467

Modified:
   trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
Log:
[JBAS-8839]; add initialize-in-order support.

Modified: trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2011-01-27 02:37:30 UTC (rev 110466)
+++ trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2011-01-27 04:51:02 UTC (rev 110467)
@@ -33,16 +33,9 @@
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSArchiveStructureDeployer;
 import org.jboss.deployers.vfs.spi.structure.StructureContext;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData.ModuleOrder;
-import org.jboss.metadata.ear.spec.AbstractModule;
-import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
-import org.jboss.metadata.ear.spec.EjbModuleMetaData;
-import org.jboss.metadata.ear.spec.JavaModuleMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
+import org.jboss.metadata.ear.spec.*;
 import org.jboss.vfs.VFSUtils;
 import org.jboss.vfs.VirtualFile;
 import org.jboss.vfs.VirtualFileFilter;
@@ -59,6 +52,7 @@
  * @author Bill Burke
  * @author Scott.Stark at jboss.org
  * @author adrian at jboss.org
+ * @author ales.justin at jboss.org
  * @version $Revision$
  */
 public class EARStructure extends AbstractVFSArchiveStructureDeployer
@@ -282,7 +276,7 @@
                }
             }
 
-            if (appMetaData.getModuleOrderEnum() == ModuleOrder.STRICT)
+            if (appMetaData.getModuleOrderEnum() == ModuleOrder.STRICT || (specMetaData instanceof Ear6xMetaData && ((Ear6xMetaData)specMetaData).getInitializeInOrder()))
             {
                context.setComparatorClassName(RelativeDeploymentContextComparator.class.getName());
                int i = 0;