[jboss-cvs] JBossAS SVN: r100828 - in projects/metadata/ear/trunk/src: test/java/org/jboss/test/metadata/ear and 1 other directory.

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

Author: jason.greene at jboss.com
Date: 2010-02-10 17:32:56 -0500 (Wed, 10 Feb 2010)
New Revision: 100828

Modified:
   projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
   projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
Log:
Merge 94189


Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2010-02-10 22:28:37 UTC (rev 100827)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2010-02-10 22:32:56 UTC (rev 100828)
@@ -39,7 +39,7 @@
  */
 public class JBossAppMetaData extends IdMetaDataImplWithDescriptionGroup
 {
-   private static final long serialVersionUID = 1;
+   private static final long serialVersionUID = 2;
    private String dtdPublicId;
    private String dtdSystemId;
    /** jboss application version */
@@ -55,6 +55,12 @@
    private SecurityRolesMetaData securityRoles;
    private String libraryDirectory;
    private String jmxName;
+   private ModuleOrder moduleOrder = ModuleOrder.IMPLICIT;
+   
+   public enum ModuleOrder
+   {
+      STRICT, IMPLICIT;
+   }
 
    /**
     * Callback for the DTD information
@@ -191,15 +197,31 @@
    }
 
    /**
-    * This element is from 4.x versions of jboss-app which is now not used in jboss-5
-    * @param moduleOrder
+    * The order to deploy modules of an EARi in.
+    * If "strict" deploy in application.xml order.
+    * If "implicit" deploy according to the deployment sorter.
+    * 
+    * @param moduleOrder how to order modules
     */
-   @XmlElement
+   @XmlElement(name="module-order")
    public void setModuleOrder(String moduleOrder)
    {
+      if ("strict".equalsIgnoreCase(moduleOrder))
+         this.moduleOrder = ModuleOrder.STRICT;
    }
+
+   public String getModuleOrder()
+   {
+      return moduleOrder.toString();
+   }
    
    @XmlTransient
+   public ModuleOrder getModuleOrderEnum()
+   {
+      return this.moduleOrder;
+   }
+   
+   @XmlTransient
    public synchronized ModuleMetaData getModule(String name)
    {
       return modules.get(name);

Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java	2010-02-10 22:28:37 UTC (rev 100827)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java	2010-02-10 22:32:56 UTC (rev 100828)
@@ -85,5 +85,6 @@
    {
       JBossAppMetaData result = unmarshal();
       assertEquals("4.0", result.getVersion());
+      assertEquals(JBossAppMetaData.ModuleOrder.STRICT, result.getModuleOrderEnum());
    }
 }