[jboss-cvs] JBossAS SVN: r75279 - in projects/jboss-deployers/trunk/deployers-vfs/src: resources/tests/bootstrap and 1 other directory.

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

Author: alesj
Date: 2008-07-01 17:23:24 -0400 (Tue, 01 Jul 2008)
New Revision: 75279

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml
Log:
Add Controller as constructor single param, as it's enough to create useful instance.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2008-07-01 20:41:44 UTC (rev 75278)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2008-07-01 21:23:24 UTC (rev 75279)
@@ -26,12 +26,12 @@
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
+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.plugins.dependency.AbstractKernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 
 /**
@@ -45,21 +45,46 @@
  */
 public class BeanMetaDataDeployer extends AbstractSimpleRealDeployer<BeanMetaData>
 {
-   /** The kernel controller */
-   private final KernelController controller;
+   /** The controller */
+   private Controller controller;
    
    /**
     * Create a new BeanDeployer.
     * 
     * @param kernel the kernel
     * @throws IllegalArgumentException for a null kernel
+    * @deprecated use other constructor
     */
    public BeanMetaDataDeployer(Kernel kernel)
    {
       super(BeanMetaData.class);
       if (kernel == null)
          throw new IllegalArgumentException("Null kernel");
-      controller = kernel.getController();
+      init(kernel.getController());
+   }
+
+   /**
+    * Create a new BeanDeployer.
+    *
+    * @param controller the controller
+    * @throws IllegalArgumentException for a null controller
+    */
+   public BeanMetaDataDeployer(Controller controller)
+   {
+      super(BeanMetaData.class);
+      init(controller);
+   }
+
+   /**
+    * Simple init.
+    *
+    * @param controller the controller
+    */
+   private void init(Controller controller)
+   {
+      if (controller == null)
+         throw new IllegalArgumentException("Null controller");
+      this.controller = controller;
       setComponentsOnly(true);
       setUseUnitName(true);
    }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml	2008-07-01 20:41:44 UTC (rev 75278)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml	2008-07-01 21:23:24 UTC (rev 75279)
@@ -30,7 +30,7 @@
    </bean>
 
    <!-- A declared structure descriptor deployer -->
-   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean>
+   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
 
     <!-- JAR Structure -->
     <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
@@ -75,7 +75,7 @@
       <property name="type">beans</property>
    </bean>
    <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
-      <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+      <constructor><parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
       <property name="type">beans</property>
    </bean>