[jboss-cvs] JBossAS SVN: r62525 - branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi.

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

Author: dimitris at jboss.org
Date: 2007-04-24 18:00:56 -0400 (Tue, 24 Apr 2007)
New Revision: 62525

Modified:
   branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/DeploymentManagerImpl.java
Log:
JBCTS-557, when constructing the TargetModuleIDImpl for a deployment, children TargetModuleIDImpl's need to be added for compliance reasons, even though they are not used by our implementation at deployment time.

Modified: branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/DeploymentManagerImpl.java
===================================================================
--- branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/DeploymentManagerImpl.java	2007-04-24 20:48:51 UTC (rev 62524)
+++ branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/DeploymentManagerImpl.java	2007-04-24 22:00:56 UTC (rev 62525)
@@ -355,7 +355,15 @@
          {
             JBossTarget target = (JBossTarget)targets[i];
             String moduleID = deployment.toExternalForm();
-            targetModuleIDs[i] = new TargetModuleIDImpl(target, moduleID, null, false, moduleInfo.getModuleType());
+            TargetModuleIDImpl tmid = new TargetModuleIDImpl(target, moduleID, null, false, moduleInfo.getModuleType());
+            // The children modules are only added for compliance
+            // since they are not used by our implementation.
+            for (Iterator it = moduleInfo.getChildren().iterator(); it.hasNext(); )
+            {
+               String childModule = (String)it.next();
+               tmid.addChildTargetModuleID(new TargetModuleIDImpl(target, childModule, tmid, false, ModuleType.EJB));
+            }
+            targetModuleIDs[i] = tmid;
          }
 
          // delete all temp files, except the depoyment
@@ -461,6 +469,7 @@
             // process a sub module
             if (entryName.endsWith(".jar") || entryName.endsWith(".war"))
             {
+               moduleInfo.addChild(entryName);
                File tmpSubModule = processSubModule(entryName, jis);
                FileInputStream fis = new FileInputStream(tmpSubModule);
                JarUtils.addJarEntry(jos, entryName, fis);
@@ -842,7 +851,8 @@
    {
       URL moduleID = null;
       ModuleType moduleType = null;
-
+      List children = new ArrayList();
+      
       public URL getModuleID()
       {
          return moduleID;
@@ -862,5 +872,15 @@
       {
          moduleType = type;
       }
+      
+      public void addChild(String childName)
+      {
+         children.add(childName);
+      }
+      
+      public List getChildren()
+      {
+         return children;
+      }
    }
 }