[Jboss-cvs] JBossAS SVN: r56909 - in projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers: plugins/deployer plugins/structure spi/structure

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

Author: adrian at jboss.org
Date: 2006-09-16 07:36:27 -0400 (Sat, 16 Sep 2006)
New Revision: 56909

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/ComponentDeploymentContext.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java
Log:
[JBMICROCONT-5] - We only want the parent metadata when it is a component.

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java	2006-09-16 10:58:00 UTC (rev 56908)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java	2006-09-16 11:36:27 UTC (rev 56909)
@@ -116,6 +116,8 @@
    public Map<String, Object> getAttachments()
    {
       DeploymentContext parent = deploymentContext.getParent();
+      if (deploymentContext.isComponent() == false)
+         parent = null;
       HashMap<String, Object> result = new HashMap<String, Object>();
       if (parent != null)
          result.putAll(parent.getTransientAttachments().getAttachments());

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-16 10:58:00 UTC (rev 56908)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-16 11:36:27 UTC (rev 56909)
@@ -417,6 +417,11 @@
       return children.remove(child);
    }
 
+   public boolean isComponent()
+   {
+      return false;
+   }
+   
    public Set<DeploymentContext> getComponents()
    {
       return Collections.unmodifiableSet(components);

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/ComponentDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/ComponentDeploymentContext.java	2006-09-16 10:58:00 UTC (rev 56908)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/ComponentDeploymentContext.java	2006-09-16 11:36:27 UTC (rev 56909)
@@ -220,6 +220,11 @@
       throw new UnsupportedOperationException("Not supported for components");
    }
 
+   public boolean isComponent()
+   {
+      return true;
+   }
+
    public Set<DeploymentContext> getComponents()
    {
       return Collections.unmodifiableSet(components);

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java	2006-09-16 10:58:00 UTC (rev 56908)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java	2006-09-16 11:36:27 UTC (rev 56909)
@@ -234,6 +234,13 @@
    boolean removeChild(DeploymentContext child);
    
    /**
+    * Whether this is a component
+    * 
+    * @return true when a component
+    */
+   boolean isComponent();
+   
+   /**
     * The components
     * 
     * @return the components