[jboss-cvs] JBossAS SVN: r75264 - in projects/jboss-deployers/trunk/deployers-vfs/src: tests/org/jboss/test/deployers/vfs/deployer/bean/test and 1 other directory.

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

Author: alesj
Date: 2008-07-01 09:15:28 -0400 (Tue, 01 Jul 2008)
New Revision: 75264

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/DeploymentAliasMetaDataDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
Log:
Use just Controller in constructor, alias is not kernel based.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/DeploymentAliasMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/DeploymentAliasMetaDataDeployer.java	2008-07-01 12:44:08 UTC (rev 75263)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/DeploymentAliasMetaDataDeployer.java	2008-07-01 13:15:28 UTC (rev 75264)
@@ -21,13 +21,12 @@
 */
 package org.jboss.deployers.vfs.deployer.kernel;
 
-import org.jboss.beans.metadata.spi.NamedAliasMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.NamedAliasMetaData;
+import org.jboss.dependency.spi.Controller;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelController;
 
 /**
  * DeploymentAliasMetaDataDeployer.<p>
@@ -36,22 +35,22 @@
  */
 public class DeploymentAliasMetaDataDeployer extends AbstractSimpleRealDeployer<NamedAliasMetaData>
 {
-   /** The kernel controller */
-   private final KernelController controller;
+   /** The controller */
+   private final Controller controller;
 
    /**
     * Create a new AliasDeployer.
     *
-    * @param kernel the kernel
-    * @throws IllegalArgumentException for a null kernel
+    * @param controller the controller
+    * @throws IllegalArgumentException for a null controller
     */
-   public DeploymentAliasMetaDataDeployer(Kernel kernel)
+   public DeploymentAliasMetaDataDeployer(Controller controller)
    {
       super(NamedAliasMetaData.class);
+      if (controller == null)
+         throw new IllegalArgumentException("Null controller");
+      this.controller = controller;
       addInput(BeanMetaData.class);
-      if (kernel == null)
-         throw new IllegalArgumentException("Null kernel");
-      controller = kernel.getController();
       setComponentsOnly(true);
    }
 

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java	2008-07-01 12:44:08 UTC (rev 75263)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java	2008-07-01 13:15:28 UTC (rev 75264)
@@ -56,7 +56,7 @@
       KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
       AliasDeploymentDeployer aliasDeploymentDeployer = new AliasDeploymentDeployer();
       BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
-      DeploymentAliasMetaDataDeployer aliasMetaDataDeployer = new DeploymentAliasMetaDataDeployer(kernel);
+      DeploymentAliasMetaDataDeployer aliasMetaDataDeployer = new DeploymentAliasMetaDataDeployer(kernel.getController());
       addDeployer(main, beanDeployer);
       addDeployer(main, kernelDeploymentDeployer);
       addDeployer(main, aliasDeploymentDeployer);