[jboss-cvs] JBossAS SVN: r60405 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/deployment/xml/test and 1 other directory.

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

Author: alesj
Date: 2007-02-07 16:30:49 -0500 (Wed, 07 Feb 2007)
New Revision: 60405

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/ValueWildcardHandler.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java
Log:
Fixed binding + value handling.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/ValueWildcardHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/ValueWildcardHandler.java	2007-02-07 21:10:52 UTC (rev 60404)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/ValueWildcardHandler.java	2007-02-07 21:30:49 UTC (rev 60405)
@@ -25,10 +25,8 @@
 
 import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
 import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
-import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
 import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.ValueMetaDataAware;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultWildcardHandler;
 import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding;
@@ -52,31 +50,21 @@
       else
          value = new AbstractValueMetaData(o);
 
-      if (parent instanceof AbstractCollectionMetaData)
+      if (parent instanceof ValueMetaDataAware)
       {
+         ValueMetaDataAware valueMetaDataAware = (ValueMetaDataAware) parent;
+         valueMetaDataAware.setValue(value);
+      }
+      else if (parent instanceof AbstractCollectionMetaData)
+      {
          AbstractCollectionMetaData collection = (AbstractCollectionMetaData) parent;
          collection.add(value);
       }
-      else if (parent instanceof AbstractParameterMetaData)
-      {
-         AbstractParameterMetaData valueMetaData = (AbstractParameterMetaData) parent;
-         valueMetaData.setValue(value);
-      }
-      else if (parent instanceof AbstractPropertyMetaData)
-      {
-         AbstractPropertyMetaData valueMetaData = (AbstractPropertyMetaData) parent;
-         valueMetaData.setValue(value);
-      }
       else if (parent instanceof AbstractClassLoaderMetaData)
       {
          AbstractClassLoaderMetaData valueMetaData = (AbstractClassLoaderMetaData) parent;
          valueMetaData.setClassLoader(value);
       }
-      else if (parent instanceof AbstractConstructorMetaData)
-      {
-         AbstractConstructorMetaData valueMetaData = (AbstractConstructorMetaData) parent;
-         valueMetaData.setValue(value);
-      }
       else
       {
          AbstractValueMetaData valueMetaData = (AbstractValueMetaData) parent;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java	2007-02-07 21:10:52 UTC (rev 60404)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java	2007-02-07 21:30:49 UTC (rev 60405)
@@ -22,6 +22,7 @@
 package org.jboss.test.kernel.deployment.xml.test;
 
 import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.StringValueMetaData;
 import org.jboss.beans.metadata.plugins.policy.AbstractPolicyMetaData;
 import org.jboss.beans.metadata.spi.policy.BindingMetaData;
 import org.jboss.beans.metadata.spi.policy.PolicyMetaData;
@@ -53,22 +54,24 @@
 
    public void testBindingWithPlainValue() throws Throwable
    {
-      PolicyMetaData policy = unmarshal("BindingWithNoName.xml", AbstractPolicyMetaData.class);
+      PolicyMetaData policy = unmarshal("BindingWithPlainValue.xml", AbstractPolicyMetaData.class);
       assertFalse(policy.getBindings().isEmpty());
       assertEquals(1, policy.getBindings().size());
       BindingMetaData binding = policy.getBindings().iterator().next();
       assertNotNull(binding.getName());
       assertNotNull(binding.getValue());
+      assertInstanceOf(binding.getValue(), StringValueMetaData.class);
    }
 
    public void testBindingWithComplexValue() throws Throwable
    {
-      PolicyMetaData policy = unmarshal("BindingWithNoName.xml", AbstractPolicyMetaData.class);
+      PolicyMetaData policy = unmarshal("BindingWithComplexValue.xml", AbstractPolicyMetaData.class);
       assertFalse(policy.getBindings().isEmpty());
       assertEquals(1, policy.getBindings().size());
       BindingMetaData binding = policy.getBindings().iterator().next();
       assertNotNull(binding.getName());
       assertNotNull(binding.getValue());
+      assertInstanceOf(binding.getValue(), StringValueMetaData.class);
    }
 
 }