[jboss-cvs] JBossAS SVN: r94292 - in projects/metadata/trunk: src/main/java/org/jboss/metadata/ear/jboss and 1 other directories.

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

Author: jason.greene at jboss.com
Date: 2009-10-02 15:33:34 -0400 (Fri, 02 Oct 2009)
New Revision: 94292

Modified:
   projects/metadata/trunk/pom.xml
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
Log:
Merge JBMETA-221


Modified: projects/metadata/trunk/pom.xml
===================================================================
--- projects/metadata/trunk/pom.xml	2009-10-02 18:54:22 UTC (rev 94291)
+++ projects/metadata/trunk/pom.xml	2009-10-02 19:33:34 UTC (rev 94292)
@@ -198,9 +198,18 @@
       <groupId>org.jboss</groupId>
       <artifactId>jboss-mdr</artifactId>
       <version>2.0.0.GA</version>
+      <exclusions>
+       <exclusion><groupId>jboss</groupId><artifactId>jboss-common-logging-spi</artifactId></exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-reflect</artifactId>
+      <version>2.0.2.GA</version>
+    </dependency>
+
+    <dependency>
       <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-api</artifactId>
       <version>2.1.4</version>

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2009-10-02 18:54:22 UTC (rev 94291)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2009-10-02 19:33:34 UTC (rev 94292)
@@ -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/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java	2009-10-02 18:54:22 UTC (rev 94291)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java	2009-10-02 19:33:34 UTC (rev 94292)
@@ -85,5 +85,6 @@
    {
       JBossAppMetaData result = unmarshal();
       assertEquals("4.0", result.getVersion());
+      assertEquals(JBossAppMetaData.ModuleOrder.STRICT, result.getModuleOrderEnum());
    }
 }