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

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

Author: scott.stark at jboss.org
Date: 2007-10-08 10:51:54 -0400 (Mon, 08 Oct 2007)
New Revision: 65914

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
Log:
Add the alt-dd element

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	2007-10-08 13:49:29 UTC (rev 65913)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-08 14:51:54 UTC (rev 65914)
@@ -162,7 +162,8 @@
       if (modulesMap == null)
       {
          modulesMap = new HashMap<String, ModuleMetaData>();
-         for (ModuleMetaData module : modules)
+         List<ModuleMetaData> merged = getMergedModules();
+         for (ModuleMetaData module : merged)
          {
             String file = module.getValue().getFileName();
             modulesMap.put(file, module);

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java	2007-10-08 13:49:29 UTC (rev 65913)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java	2007-10-08 14:51:54 UTC (rev 65914)
@@ -21,6 +21,7 @@
  */
 package org.jboss.metadata.ear.spec;
 
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
@@ -48,6 +49,7 @@
 {
    private static final long serialVersionUID = 1;
    private AbstractModule module;
+   private String altDD;
 
    public enum ModuleType {Connector, Client, Ejb, Service, Web};
 
@@ -59,6 +61,15 @@
    {
       this.module = value;
    }
+   public String getAlternativeDD()
+   {
+      return altDD;
+   }
+   @XmlElement(name="alt-dd")
+   public void setAlternativeDD(String altDD)
+   {
+      this.altDD = altDD;
+   }
 
    @XmlTransient
    public String getFileName()

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java	2007-10-08 13:49:29 UTC (rev 65913)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java	2007-10-08 14:51:54 UTC (rev 65914)
@@ -181,27 +181,33 @@
       assertEquals(6, modules.size());
       ModuleMetaData connector = modules.get(0);
       assertEquals("connector0", connector.getId());
+      assertEquals("META-INF/alt-ra.xml", connector.getAlternativeDD());
       ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
       assertEquals("rar0.rar", connectorMD.getConnector());
       ModuleMetaData java = modules.get(1);
       assertEquals("java0", java.getId());
+      assertEquals("META-INF/alt-application-client.xml", java.getAlternativeDD());
       JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
       assertEquals("client0.jar", javaMD.getClientJar());
       ModuleMetaData ejb0 = modules.get(2);
       assertEquals("ejb0", ejb0.getId());
+      assertEquals("META-INF/alt-ejb-jar.xml", ejb0.getAlternativeDD());
       EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
       assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
       ModuleMetaData ejb1 = modules.get(3);
       assertEquals("ejb1", ejb1.getId());
+      assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
       EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
       assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
       ModuleMetaData web0 = modules.get(4);
       assertEquals("web0", web0.getId());
+      assertEquals("WEB-INF/alt-web.xml", web0.getAlternativeDD());
       WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
       assertEquals("/web0", web0MD.getContextRoot());
       assertEquals("web-app0.war", web0MD.getWebURI());
       ModuleMetaData web1 = modules.get(5);
       assertEquals("web1", web1.getId());
+      assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
       WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
       assertEquals("/web1", web1MD.getContextRoot());
       assertEquals("web-app1.war", web1MD.getWebURI());

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml	2007-10-08 13:49:29 UTC (rev 65913)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml	2007-10-08 14:51:54 UTC (rev 65914)
@@ -26,27 +26,33 @@
 
     <module id="connector0">
         <connector>rar0.rar</connector>
+        <alt-dd>META-INF/alt-ra.xml</alt-dd>
     </module>
     <module id="java0">
         <java>client0.jar</java>
+        <alt-dd>META-INF/alt-application-client.xml</alt-dd>
     </module>
     <module id="ejb0">
         <ejb>ejb-jar0.jar</ejb>
+        <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
     </module>
     <module id="ejb1">
         <ejb>ejb-jar1.jar</ejb>
+        <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
     </module>
     <module id="web0">
         <web>
             <web-uri>web-app0.war</web-uri>
             <context-root>/web0</context-root>
         </web>
+        <alt-dd>WEB-INF/alt-web.xml</alt-dd>
     </module>
     <module id="web1">
         <web>
             <web-uri>web-app1.war</web-uri>
             <context-root>/web1</context-root>
         </web>
+        <alt-dd>WEB-INF/alt-web.xml</alt-dd>
     </module>
     <security-role id="security-role0">
         <description>The 0 security role</description>