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

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

Author: scott.stark at jboss.org
Date: 2008-11-04 19:54:28 -0500 (Tue, 04 Nov 2008)
New Revision: 80536

Modified:
   projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
Log:
JBDEPLOY-79, allow the DefaultManagedObjectCreator impl to revert to the ManagedObjectFactoryBuild if no ManagedObjectFactory has been injected.

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java	2008-11-05 00:39:51 UTC (rev 80535)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java	2008-11-05 00:54:28 UTC (rev 80536)
@@ -30,6 +30,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
 import org.jboss.metadata.spi.MetaData;
 
 /**
@@ -70,13 +71,16 @@
       throws DeploymentException
    {
       MetaData metaData = unit.getMetaData();
+      ManagedObjectFactory factory = mof;
+      if(factory == null )
+         factory = ManagedObjectFactoryBuilder.create();
 
       for(String name : attachments)
       {
          Object instance = unit.getAttachment(name);
          if (instance != null)
          {
-            ManagedObject mo = mof.initManagedObject(instance, metaData);
+            ManagedObject mo = factory.initManagedObject(instance, metaData);
             if (mo != null)
                managedObjects.put(mo.getName(), mo);
          }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml	2008-11-05 00:39:51 UTC (rev 80535)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml	2008-11-05 00:54:28 UTC (rev 80536)
@@ -1,5 +1,13 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <!-- The ManagedObjectFactory -->
+   <bean name="ManagedObjectFactory">
+      <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+      <!-- Accept any implementor of InstanceClassFactory -->
+      <incallback method="addInstanceClassFactory"/>
+      <uncallback method="removeInstanceClassFactory"/>
+   </bean>
+
    <!-- The MainDeployer -->
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
       <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
@@ -10,7 +18,9 @@
    <!-- The ManagedDeploymentCreator implementation -->
    <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
    <!-- The ManagedObjectCreator implementation -->
-   <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator" />
+   <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+      <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+   </bean>
    
    <!-- The holder for deployers that determine structure -->
    <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">