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

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

Author: scott.stark at jboss.org
Date: 2009-02-16 12:52:55 -0500 (Mon, 16 Feb 2009)
New Revision: 84267

Modified:
   trunk/server/src/etc/conf/default/bootstrap/deployers.xml
   trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
Log:
JBAS-6507, use the default ICF implementation to wrap the bean property values to correctly obtain ManagedObject values


Modified: trunk/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/deployers.xml	2009-02-16 17:18:51 UTC (rev 84266)
+++ trunk/server/src/etc/conf/default/bootstrap/deployers.xml	2009-02-16 17:52:55 UTC (rev 84267)
@@ -179,6 +179,7 @@
    <!-- POJO Deployment -->
    <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
       <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+      <property name="delegateICF"><inject bean="ManagedObjectFactory" property="defaultInstanceFactory"/></property>
    </bean>
    <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
       <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>

Modified: trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
===================================================================
--- trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java	2009-02-16 17:18:51 UTC (rev 84266)
+++ trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java	2009-02-16 17:52:55 UTC (rev 84267)
@@ -53,6 +53,8 @@
    private KernelController controller;
    /** The meta value factory */
    private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance(); 
+   /** */
+   private InstanceClassFactory delegateICF;
 
    public KernelController getController()
    {
@@ -72,6 +74,15 @@
       this.metaValueFactory = metaValueFactory;
    }
 
+   public InstanceClassFactory getDelegateICF()
+   {
+      return delegateICF;
+   }
+   public void setDelegateICF(InstanceClassFactory delegateICF)
+   {
+      this.delegateICF = delegateICF;
+   }
+
    public Object locateBean(String beanName)
    {
       ControllerContext context = getController().getInstalledContext(beanName);
@@ -163,10 +174,9 @@
       {
          String getterClassName = propertyInfo.getGetter().getDeclaringClass().getName();
          if(getterClassName.equals(attachment.getClass().getName()))
-            value = propertyInfo.get(attachment);
+            mvalue = delegateICF.getValue(beanInfo, property, metaData, attachment);
          else
-            value = propertyInfo.get(bean);
-         mvalue = metaValueFactory.create(value, propertyInfo.getType());
+            mvalue = delegateICF.getValue(beanInfo, property, metaData, bean);
       }
       catch(Throwable e)
       {