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

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

Author: alex.loubyansky at jboss.com
Date: 2008-09-16 09:02:59 -0400 (Tue, 16 Sep 2008)
New Revision: 78586

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml
Modified:
   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:
JBMETA-108

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	2008-09-16 12:51:17 UTC (rev 78585)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2008-09-16 13:02:59 UTC (rev 78586)
@@ -70,14 +70,28 @@
       // Set the version based on
       if (dtdPublicId != null && dtdPublicId.contains("3.0"))
          setVersion("3.0");
-      if (dtdPublicId != null && dtdPublicId.contains("3.2"))
+      else if (dtdPublicId != null && dtdPublicId.contains("3.2"))
          setVersion("3.2");
-      if (dtdPublicId != null && dtdPublicId.contains("4.0"))
+      else if (dtdPublicId != null && dtdPublicId.contains("4.0"))
          setVersion("4.0");
-      if (dtdPublicId != null && dtdPublicId.contains("4.2"))
+      else if (dtdPublicId != null && dtdPublicId.contains("4.2"))
          setVersion("4.2");
-      if (dtdPublicId != null && dtdPublicId.contains("5.0"))
+      else if (dtdPublicId != null && dtdPublicId.contains("5.0"))
          setVersion("5.0");
+      
+      if(getVersion() == null)
+      {
+         if(dtdSystemId != null && dtdSystemId.contains("jboss-app_3_0.dtd"))
+            setVersion("3.0");
+         else if(dtdSystemId != null && dtdSystemId.contains("jboss-app_3_2.dtd"))
+            setVersion("3.2");
+         else if(dtdSystemId != null && dtdSystemId.contains("jboss-app_4_0.dtd"))
+            setVersion("4.0");
+         else if(dtdSystemId != null && dtdSystemId.contains("jboss-app_4_2.dtd"))
+            setVersion("4.2");
+         else if(dtdSystemId != null && dtdSystemId.contains("jboss-app_5_0.dtd"))
+            setVersion("5.0");
+      }
    }
    /**
     * Get the DTD public id if one was seen
@@ -176,6 +190,15 @@
       this.modules = modules;
    }
 
+   /**
+    * This element is from 4.x versions of jboss-app which is now not used in jboss-5
+    * @param moduleOrder
+    */
+   @XmlElement
+   public void setModuleOrder(String moduleOrder)
+   {
+   }
+   
    @XmlTransient
    public synchronized ModuleMetaData getModule(String 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	2008-09-16 12:51:17 UTC (rev 78585)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java	2008-09-16 13:02:59 UTC (rev 78586)
@@ -72,11 +72,13 @@
       JBossAppMetaData result = unmarshal();
       assertEquals("4.0", result.getVersion());
    }
+   
    public void testVersion42() throws Exception
    {
       JBossAppMetaData result = unmarshal();
       assertEquals("4.2", result.getVersion());
    }
+   
    public void testVersion50() throws Exception
    {
       JBossAppMetaData result = unmarshal();
@@ -92,4 +94,10 @@
       ModuleMetaData module = appMetaData.getModule("something");
       assertNull(module);
    }
+
+   public void testModuleOrder() throws Exception
+   {
+      JBossAppMetaData result = unmarshal();
+      assertEquals("4.0", result.getVersion());
+   }
 }

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml	2008-09-16 13:02:59 UTC (rev 78586)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-app
+   PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+      
+<jboss-app>
+   <module-order>strict</module-order>
+</jboss-app>