[jboss-cvs] JBossAS SVN: r84227 - in branches/Branch_5_x: system/src/main/org/jboss/deployers/plugins/managed and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 15 21:28:39 EST 2009
Author: scott.stark at jboss.org
Date: 2009-02-15 21:28:38 -0500 (Sun, 15 Feb 2009)
New Revision: 84227
Modified:
branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml
branches/Branch_5_x/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: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml 2009-02-16 01:19:29 UTC (rev 84226)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml 2009-02-16 02:28:38 UTC (rev 84227)
@@ -171,6 +171,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: branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2009-02-16 01:19:29 UTC (rev 84226)
+++ branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2009-02-16 02:28:38 UTC (rev 84227)
@@ -43,7 +43,7 @@
* An InstanceClassFactory for BeanMetaData
*
* @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
*/
public class BeanMetaDataICF
implements InstanceClassFactory<BeanMetaData>
@@ -52,6 +52,8 @@
private KernelController controller;
/** The meta value factory */
private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
+ /** */
+ private InstanceClassFactory delegateICF;
public KernelController getController()
{
@@ -71,6 +73,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);
@@ -159,10 +170,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)
{
More information about the jboss-cvs-commits
mailing list