[jboss-cvs] JBossAS SVN: r100846 - in trunk: server/src/main/java/org/jboss/deployment and 1 other directory.

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

Author: jason.greene at jboss.com
Date: 2010-02-10 20:51:28 -0500 (Wed, 10 Feb 2010)
New Revision: 100846

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
Log:
JBAS-7514


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-02-11 01:08:56 UTC (rev 100845)
+++ trunk/component-matrix/pom.xml	2010-02-11 01:51:28 UTC (rev 100846)
@@ -112,7 +112,7 @@
     <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
     <version.org.jboss.metadata.client>2.0.0.Alpha</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0-alpha-10</version.org.jboss.metadata.common>
-    <version.org.jboss.metadata.ear>2.0.0.Alpha</version.org.jboss.metadata.ear>
+    <version.org.jboss.metadata.ear>2.0.0.Alpha2</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0-alpha-6</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
     <version.org.jboss.metadata.war>2.0.0.Alpha13</version.org.jboss.metadata.war>

Modified: trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2010-02-11 01:08:56 UTC (rev 100845)
+++ trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2010-02-11 01:51:28 UTC (rev 100846)
@@ -29,10 +29,12 @@
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.structure.spi.helpers.RelativeDeploymentContextComparator;
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
 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;
@@ -82,7 +84,7 @@
 
    /**
     * Set the relative order to 1000 by default
-    */   
+    */
    public EARStructure()
    {
       setRelativeOrder(1000);
@@ -190,7 +192,7 @@
          {
             if (libDir == null)
                libDir = "lib";
-            
+
             // Add the ear lib contents to the classpath
             if(trace)
                log.trace("Checking for ear lib directory: "+libDir);
@@ -278,6 +280,7 @@
                               + " module listed in application.xml is not a recognized deployment, .ear: "
                               + file.getName());
                      }
+
                   }
                   catch (IOException e)
                   {
@@ -285,12 +288,23 @@
                   }
                }
             }
+
+            if (appMetaData.getModuleOrderEnum() == ModuleOrder.STRICT)
+            {
+               context.setComparatorClassName(RelativeDeploymentContextComparator.class.getName());
+               int i = 0;
+               for (ContextInfo ctx : structureContext.getMetaData().getContexts())
+               {
+                  ctx.setRelativeOrder(i++);
+               }
+            }
          }
+
          valid = true;
       }
       catch(Exception e)
       {
-         throw new RuntimeException("Error determining structure: " + file.getName(), e);         
+         throw new RuntimeException("Error determining structure: " + file.getName(), e);
       }
 
       return valid;
@@ -332,7 +346,7 @@
          for (VirtualFile vfArchive : archives)
          {
             String filename = earRelativePath(earPath, vfArchive.getPathName());
-            // Check if the module already exists, i.e. it is declared in jboss-app.xml 
+            // Check if the module already exists, i.e. it is declared in jboss-app.xml
             ModuleMetaData moduleMetaData = appMetaData.getModule(filename);
             int type = typeFromSuffix(filename, vfArchive);
             if (type >= 0 && moduleMetaData == null)
@@ -414,7 +428,7 @@
             type = J2eeModuleMetaData.EJB;
          }
       }
-      
+
       return type;
    }
 
@@ -447,12 +461,12 @@
    {
       this.comparatorClassName = comparatorClassName;
    }
-   
+
    public void setUseValidation(boolean validateXml)
    {
       this.useValidation = validateXml;
    }
-   
+
    public boolean isUseValidation()
    {
       return useValidation;