[jboss-cvs] JBossAS SVN: r80697 - in trunk: system/src/main/org/jboss/deployers/plugins/managed and 1 other directory.

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

Author: alesj
Date: 2008-11-07 18:14:06 -0500 (Fri, 07 Nov 2008)
New Revision: 80697

Modified:
   trunk/server/src/etc/conf/default/deployers.xml
   trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
Log:
MOF in KDMOC is mandatory - use constructor injection.

Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml	2008-11-07 22:40:19 UTC (rev 80696)
+++ trunk/server/src/etc/conf/default/deployers.xml	2008-11-07 23:14:06 UTC (rev 80697)
@@ -161,9 +161,8 @@
    <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
       <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
    </bean>
-   <bean name="KernelDeploymentManagedObjectCreator"
-      class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
-      <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+   <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
+      <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
    </bean>
    <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
       <property name="suffix">jboss-beans.xml</property>

Modified: trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
===================================================================
--- trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java	2008-11-07 22:40:19 UTC (rev 80696)
+++ trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java	2008-11-07 23:14:06 UTC (rev 80697)
@@ -32,7 +32,6 @@
 import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.logging.Logger;
 import org.jboss.managed.api.Fields;
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.ManagedProperty;
@@ -47,28 +46,22 @@
 
 /**
  * ManagedObjectCreator for KernelDeployment
+ * 
  * @author Scott.Stark at jboss.org
+ * @author Ales.Justin at jboss.org
  * @version $Revision:$
  */
-public class KernelDeploymentManagedObjectCreator
-   implements ManagedObjectCreator
+public class KernelDeploymentManagedObjectCreator implements ManagedObjectCreator
 {
-   private static Logger log = Logger.getLogger(DefaultManagedObjectCreator.class);
    private ManagedObjectFactory mof;
 
-   
-   public ManagedObjectFactory getMof()
+   public KernelDeploymentManagedObjectCreator(ManagedObjectFactory mof)
    {
-      return mof;
-   }
-
-
-   public void setMof(ManagedObjectFactory mof)
-   {
+      if (mof == null)
+         throw new IllegalArgumentException("Null ManagedObjectFactory.");
       this.mof = mof;
    }
 
-
    /**
     * Build managed object.
     *
@@ -76,9 +69,7 @@
     * @param managedObjects map of managed objects
     * @throws DeploymentException for any deployment exception
     */
-   public void build(DeploymentUnit unit, Set<String> attachments,
-      Map<String, ManagedObject> managedObjects)
-      throws DeploymentException
+   public void build(DeploymentUnit unit, Set<String> attachments, Map<String, ManagedObject> managedObjects) throws DeploymentException
    {
       KernelDeployment deployment = unit.getAttachment(KernelDeployment.class);
       if(deployment == null)
@@ -102,8 +93,10 @@
       {
          for(BeanMetaDataFactory bmdf : beanFactories)
          {
+            // TODO - this is a hack ;-)
             if((bmdf instanceof BeanMetaData) == false)
                continue;
+
             BeanMetaData bmd = (BeanMetaData) bmdf;
             DeploymentUnit compUnit = unit.getComponent(bmd.getName());
             MetaData metaData = compUnit.getMetaData();
@@ -118,8 +111,8 @@
       // This bypasses the write through back to the metadata
       beanFactoriesMP.getFields().setField(Fields.VALUE, values);
    }
-   protected GenericValue getManagedObjectValue(BeanMetaData bmd, MetaData metaData,
-         ManagedObject parentMO)
+
+   protected GenericValue getManagedObjectValue(BeanMetaData bmd, MetaData metaData, ManagedObject parentMO)
    {
       String name = bmd.getName();
       ManagedObject mo = mof.initManagedObject(bmd, null, metaData, name, null);