[jboss-cvs] JBossAS SVN: r58285 - trunk/server/src/main/org/jboss/deployment

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

Author: scott.stark at jboss.org
Date: 2006-11-12 17:36:39 -0500 (Sun, 12 Nov 2006)
New Revision: 58285

Modified:
   trunk/server/src/main/org/jboss/deployment/J2eeApplicationObjectFactory.java
   trunk/server/src/main/org/jboss/deployment/WebModuleMetaData.java
Log:
Correct the association of web modules with the ear

Modified: trunk/server/src/main/org/jboss/deployment/J2eeApplicationObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/J2eeApplicationObjectFactory.java	2006-11-12 22:35:57 UTC (rev 58284)
+++ trunk/server/src/main/org/jboss/deployment/J2eeApplicationObjectFactory.java	2006-11-12 22:36:39 UTC (rev 58285)
@@ -107,7 +107,7 @@
       Object child = null;
       if (localName.equals("web"))
       {
-         child = new WebModuleMetaData();
+         child = new WebModuleMetaData(module);
       }
       else if (localName.equals("security-role-ref"))
       {
@@ -196,7 +196,7 @@
       {
          module.setFileName(value);
       }
-      else if( localName.equals("web-context") )
+      else if( localName.equals("context-root") )
       {
          module.setWebContext(value);
       }

Modified: trunk/server/src/main/org/jboss/deployment/WebModuleMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/WebModuleMetaData.java	2006-11-12 22:35:57 UTC (rev 58284)
+++ trunk/server/src/main/org/jboss/deployment/WebModuleMetaData.java	2006-11-12 22:36:39 UTC (rev 58285)
@@ -27,11 +27,29 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision:$
  */
-public class WebModuleMetaData extends J2eeModuleMetaData
+public class WebModuleMetaData
 {
-   public WebModuleMetaData()
+   J2eeModuleMetaData module;
+
+   public WebModuleMetaData(J2eeModuleMetaData module)
    {
-      super.setType(J2eeModuleMetaData.WEB);
+      this.module = module;
+      module.setType(J2eeModuleMetaData.WEB);
    }
 
+   public void setFileName(String name)
+   {
+      module.setFileName(name);
+   }
+
+   public void setWebContext(String value)
+   {
+      module.setWebContext(value);
+   }
+
+   public void setAlternativeDD(String value)
+   {
+      module.setAlternativeDD(value);
+   }
+
 }