[jboss-cvs] JBossAS SVN: r68641 - in projects/microcontainer/trunk: container/src/resources/tests/org/jboss/test/javabean/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jan 5 17:01:08 EST 2008
Author: alesj
Date: 2008-01-05 17:01:08 -0500 (Sat, 05 Jan 2008)
New Revision: 68641
Modified:
projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/jaxb/JavaBean.java
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/ParameterInstantiate.xml
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/Property.xml
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/PropertyWildcard.xml
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/SimpleInstantiate.xml
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticClassMethodInstantiate.xml
projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticMethodInstantiate.xml
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
Log:
JavaBean namespace change.
GenericBeanFactory MD fix.
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/jaxb/JavaBean.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/jaxb/JavaBean.java 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/jaxb/JavaBean.java 2008-01-05 22:01:08 UTC (rev 68641)
@@ -38,11 +38,11 @@
import org.jboss.reflect.spi.ConstructorInfo;
import org.jboss.reflect.spi.MethodInfo;
import org.jboss.reflect.spi.TypeInfo;
+import org.jboss.util.propertyeditor.PropertyEditors;
import org.jboss.xb.annotations.JBossXmlSchema;
import org.jboss.xb.annotations.JBossXmlType;
import org.jboss.xb.spi.BeanAdapter;
import org.jboss.xb.spi.BeanAdapterFactory;
-import org.jboss.util.propertyeditor.PropertyEditors;
/**
* JavaBean.
@@ -50,7 +50,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at JBossXmlSchema(namespace="test:javabean", elementFormDefault=XmlNsForm.QUALIFIED)
+ at JBossXmlSchema(namespace="urn:jboss:javabean:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name="javabean")
@XmlType(name="javabean")
@JBossXmlType(beanAdapterBuilder=JavaBeanBuilder.class)
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/ParameterInstantiate.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/ParameterInstantiate.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/ParameterInstantiate.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean"
+<javabean xmlns="urn:jboss:javabean:1.0"
class="org.jboss.test.javabean.support.TestParameterInstantiate">
<constructor>
<parameter>Hello</parameter>
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/Property.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/Property.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/Property.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean"
+<javabean xmlns="urn:jboss:javabean:1.0"
class="org.jboss.test.javabean.support.TestProperty">
<property name="AString">StringValue</property>
<property name="AByte">12</property>
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/PropertyWildcard.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/PropertyWildcard.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/PropertyWildcard.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean"
+<javabean xmlns="urn:jboss:javabean:1.0"
class="org.jboss.test.javabean.support.TestPropertyWildcard">
<property name="bean">
<javabean class="org.jboss.test.javabean.support.TestWildcard"/>
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/SimpleInstantiate.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/SimpleInstantiate.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/SimpleInstantiate.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean"
+<javabean xmlns="urn:jboss:javabean:1.0"
class="org.jboss.test.javabean.support.TestSimpleInstantiate">
</javabean>
\ No newline at end of file
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticClassMethodInstantiate.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticClassMethodInstantiate.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticClassMethodInstantiate.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean">
+<javabean xmlns="urn:jboss:javabean:1.0">
<constructor factoryClass="org.jboss.test.javabean.support.TestStaticClassMethodInstantiator" factoryMethod="instantiate"/>
</javabean>
\ No newline at end of file
Modified: projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticMethodInstantiate.xml
===================================================================
--- projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticMethodInstantiate.xml 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/container/src/resources/tests/org/jboss/test/javabean/test/StaticMethodInstantiate.xml 2008-01-05 22:01:08 UTC (rev 68641)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javabean xmlns="test:javabean"
+<javabean xmlns="urn:jboss:javabean:1.0"
class="org.jboss.test.javabean.support.TestStaticMethodInstantiate">
<constructor factoryMethod="instantiate"/>
</javabean>
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-01-05 22:01:08 UTC (rev 68641)
@@ -26,6 +26,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -106,7 +107,6 @@
*
* @return the class
*/
- @XmlTransient
public String getBeanClass()
{
AbstractPropertyMetaData prop = (AbstractPropertyMetaData) getProperty("bean");
@@ -124,12 +124,19 @@
*
* @param beanClass the class
*/
+ @XmlAttribute(name="class")
public void setBeanClass(String beanClass)
{
Set<PropertyMetaData> properties = getProperties();
properties.add(new AbstractPropertyMetaData("bean", new AbstractValueMetaData(beanClass)));
}
-
+
+ @XmlTransient
+ public void setBean(String bean)
+ {
+ super.setBean(bean);
+ }
+
@XmlElement(name="classloader", type=AbstractClassLoaderMetaData.class)
public void setClassLoader(ClassLoaderMetaData classLoader)
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2008-01-05 21:40:47 UTC (rev 68640)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2008-01-05 22:01:08 UTC (rev 68641)
@@ -24,6 +24,7 @@
import java.util.List;
import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
@@ -110,7 +111,7 @@
BeanMetaData bean = (BeanMetaData) beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
}
public void testDeploymentWithMultipleBeanFactorys() throws Exception
@@ -124,15 +125,15 @@
BeanMetaData bean = (BeanMetaData) beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
bean = (BeanMetaData) beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
bean = (BeanMetaData) beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
}
public void testDeploymentWithMultipleBeanMetaDataFactorys() throws Exception
@@ -208,7 +209,7 @@
bean = (BeanMetaData) beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
bean = (BeanMetaData) beans.get(2);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
@@ -222,7 +223,7 @@
bean = (BeanMetaData) beans.get(5);
assertNotNull(bean);
assertEquals("Bean4", bean.getName());
- assertEquals("GenericBeanFactory", bean.getBean());
+ assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
bean = (BeanMetaData) beans.get(6);
assertNotNull(bean);
assertEquals("Bean3", bean.getBean());
More information about the jboss-cvs-commits
mailing list