[jboss-cvs] JBossAS SVN: r81771 - in projects/jboss-deployers/trunk/deployers-vfs/src: test/java/org/jboss/test/deployers/vfs/dependency/test and 5 other directories.

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

Author: alesj
Date: 2008-11-28 10:28:50 -0500 (Fri, 28 Nov 2008)
New Revision: 81771

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/META-INF/MANIFEST.MF
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/META-INF/jboss-dependency.xml
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
Log:
[JBDEPLOY-136]; fix hierarchy handling.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java	2008-11-28 15:21:17 UTC (rev 81770)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java	2008-11-28 15:28:50 UTC (rev 81771)
@@ -43,6 +43,7 @@
    {
       super(DeploymentAliases.class);
       setName("aliases.txt");
+      setTopLevelOnly(true);
    }
 
    protected DeploymentAliases parse(VFSDeploymentUnit unit, VirtualFile file, DeploymentAliases root) throws Exception

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java	2008-11-28 15:21:17 UTC (rev 81770)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java	2008-11-28 15:28:50 UTC (rev 81771)
@@ -45,8 +45,18 @@
    {
       ControllerContext context = unit.getAttachment(ControllerContext.class);
       if (context == null)
-         throw new DeploymentException("Missing deployment controller context: " + unit.getName());
+      {
+         DeploymentUnit parent = unit.getParent();
+         while (context == null)
+         {
+            if (parent == null)
+               throw new DeploymentException("Missing deployment controller context: " + unit.getName());
 
+            context = parent.getAttachment(ControllerContext.class);
+            parent = parent.getParent();
+         }
+      }
+
       Object contextName = context.getName();
       unit.addAttachment(DeploymentDependencies.class, new DeploymentDependenciesImpl(contextName, deployment));
    }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-28 15:21:17 UTC (rev 81770)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-28 15:28:50 UTC (rev 81771)
@@ -49,6 +49,7 @@
       this.controller = controller;
       setStage(DeploymentStages.POST_PARSE);
       setDeploymentVisitor(new DeploymentAliasDeploymentVisitor());
+      setTopLevelOnly(true);
    }
 
    private class DeploymentAliasDeploymentVisitor extends AbstractDeploymentVisitor<Object, DeploymentAliases>

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java	2008-11-28 15:21:17 UTC (rev 81770)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java	2008-11-28 15:28:50 UTC (rev 81771)
@@ -95,4 +95,26 @@
          undeploy(du);
       }
    }
+
+   public void testNestedDependency() throws Throwable
+   {
+      DeploymentUnit du = addDeployment("/dependency", "nested");
+      try
+      {
+         assertDeployment(du, new ControllerState("PreReal"));
+         DeploymentUnit tmDU = assertDeploy("/dependency", "support");
+         try
+         {
+            assertDeployment(du, ControllerState.INSTALLED);
+         }
+         finally
+         {
+            undeploy(tmDU);
+         }
+      }
+      finally
+      {
+         undeploy(du);
+      }
+   }
 }

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/META-INF/MANIFEST.MF	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/META-INF/MANIFEST.MF	2008-11-28 15:28:50 UTC (rev 81771)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/META-INF/jboss-dependency.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/META-INF/jboss-dependency.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/nested/child/META-INF/jboss-dependency.xml	2008-11-28 15:28:50 UTC (rev 81771)
@@ -0,0 +1,4 @@
+<dependency xmlns="urn:jboss:dependency:1.0">
+  <item whenRequired="Real" dependentState="Create">TM</item>
+  <item>Barrier</item>
+</dependency>
\ No newline at end of file