[jboss-cvs] JBossAS SVN: r70437 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/kernel/plugins/deployment/xml and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 5 12:13:04 EST 2008
Author: alesj
Date: 2008-03-05 12:13:04 -0500 (Wed, 05 Mar 2008)
New Revision: 70437
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithInject.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithLazy.xml
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
Log:
Add support for property.null and constructor.bean|lazy|inject.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -113,12 +113,15 @@
*/
@XmlElements
({
+ @XmlElement(name="bean", type=AbstractBeanMetaData.class),
+ @XmlElement(name="lazy", type=AbstractLazyMetaData.class),
@XmlElement(name="array", type=AbstractArrayMetaData.class),
@XmlElement(name="collection", type=AbstractCollectionMetaData.class),
@XmlElement(name="list", type=AbstractListMetaData.class),
@XmlElement(name="map", type=AbstractMapMetaData.class),
@XmlElement(name="set", type=AbstractSetMetaData.class),
@XmlElement(name="value", type=StringValueMetaData.class),
+ @XmlElement(name="inject", type=AbstractInjectionValueMetaData.class),
@XmlElement(name="value-factory", type=AbstractValueFactoryMetaData.class)
})
public void setValue(ValueMetaData value)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -179,6 +179,7 @@
@XmlElement(name="list", type=AbstractListMetaData.class),
@XmlElement(name="map", type=AbstractMapMetaData.class),
@XmlElement(name="set", type=AbstractSetMetaData.class),
+ @XmlElement(name="null", type=AbstractValueMetaData.class),
@XmlElement(name="this", type=ThisValueMetaData.class),
@XmlElement(name="value", type=StringValueMetaData.class),
@XmlElement(name="value-factory", type=AbstractValueFactoryMetaData.class)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -531,6 +531,9 @@
// type has bean
typeBinding.pushInterceptor(BeanSchemaBinding20.beanQName, ValueMetaDataElementInterceptor.VALUES);
+ // type has lazy
+ typeBinding.pushInterceptor(BeanSchemaBinding20.lazyQName, ValueMetaDataElementInterceptor.VALUES);
+
// type has values
typeBinding.pushInterceptor(BeanSchemaBinding20.valueQName, ValueMetaDataElementInterceptor.VALUES);
Modified: projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2008-03-05 17:13:04 UTC (rev 70437)
@@ -203,7 +203,7 @@
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- Wrap the exisgin bean into lazy proxy.
+ Wrap the existing bean into lazy proxy.
Expose the full class or just interfaces.
Name is optional, and if no name is provided bean+'Proxy' will be used.
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithInject.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithInject.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithInject.xml 2008-03-05 17:13:04 UTC (rev 70437)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0">
+ <constructor>
+ <inject bean="Dummy"/>
+ </constructor>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithLazy.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithLazy.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorWithLazy.xml 2008-03-05 17:13:04 UTC (rev 70437)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0">
+ <constructor>
+ <lazy bean="Dummy"/>
+ </constructor>
+</bean>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -47,6 +47,7 @@
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.LazyMetaData;
import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.javabean.plugins.jaxb.JavaBean10;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
@@ -266,6 +267,12 @@
assertTrue(value instanceof BeanMetaData);
}
+ protected void assertLazy(ValueMetaData value)
+ {
+ assertNotNull(value);
+ assertTrue(value instanceof LazyMetaData);
+ }
+
protected void checkJBossXBException(Class<? extends Throwable> expected, Throwable throwable)
{
checkThrowable(JBossXBException.class, throwable);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -49,6 +49,7 @@
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.LazyMetaData;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
@@ -355,6 +356,12 @@
assertTrue(value instanceof BeanMetaData);
}
+ protected void assertLazy(ValueMetaData value)
+ {
+ assertNotNull(value);
+ assertTrue(value instanceof LazyMetaData);
+ }
+
protected void checkJBossXBException(Class<? extends Throwable> expected, Throwable throwable)
{
checkThrowable(JBossXBException.class, throwable);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -69,6 +69,17 @@
assertBean(constructor.getValue());
}
+ public void testConstructorWithLazy() throws Exception
+ {
+ ConstructorMetaData constructor = getConstructor();
+ assertNull(constructor.getFactoryClass());
+ assertNull(constructor.getFactoryMethod());
+ assertNull(constructor.getAnnotations());
+ assertNull(constructor.getFactory());
+ assertNull(constructor.getParameters());
+ assertLazy(constructor.getValue());
+ }
+
public void testConstructorWithFactoryClass() throws Exception
{
ConstructorMetaData constructor = getConstructor();
@@ -169,6 +180,17 @@
assertValue("Value", constructor.getValue());
}
+ public void testConstructorWithInject() throws Exception
+ {
+ ConstructorMetaData constructor = getConstructor();
+ assertNull(constructor.getFactoryClass());
+ assertNull(constructor.getFactoryMethod());
+ assertNull(constructor.getAnnotations());
+ assertNull(constructor.getFactory());
+ assertNull(constructor.getParameters());
+ assertInjection(constructor.getValue());
+ }
+
public void testConstructorWithCollection() throws Exception
{
ConstructorMetaData constructor = getConstructor();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -66,6 +66,17 @@
assertBean(constructor.getValue());
}
+ public void testConstructorWithLazy() throws Exception
+ {
+ ConstructorMetaData constructor = getConstructor("ConstructorWithLazy.xml");
+ assertNull(constructor.getFactoryClass());
+ assertNull(constructor.getFactoryMethod());
+ assertNull(constructor.getAnnotations());
+ assertNull(constructor.getFactory());
+ assertNull(constructor.getParameters());
+ assertLazy(constructor.getValue());
+ }
+
public void testConstructorWithFactoryClass() throws Exception
{
ConstructorMetaData constructor = getConstructor("ConstructorWithFactoryClass.xml");
@@ -166,6 +177,17 @@
assertValue("Value", constructor.getValue());
}
+ public void testConstructorWithInject() throws Exception
+ {
+ ConstructorMetaData constructor = getConstructor("ConstructorWithInject.xml");
+ assertNull(constructor.getFactoryClass());
+ assertNull(constructor.getFactoryMethod());
+ assertNull(constructor.getAnnotations());
+ assertNull(constructor.getFactory());
+ assertNull(constructor.getParameters());
+ assertInjection(constructor.getValue());
+ }
+
public void testConstructorWithCollection() throws Exception
{
ConstructorMetaData constructor = getConstructor("ConstructorWithCollection.xml");
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -175,6 +175,14 @@
assertThis(property.getValue());
}
+ public void testPropertyWithNull() throws Exception
+ {
+ PropertyMetaData property = getProperty();
+ assertNotNull("PropertyName", property.getName());
+ assertNull(property.getAnnotations());
+ assertNullValue(property.getValue());
+ }
+
public void testPropertyWithWildcard() throws Exception
{
PropertyMetaData property = getProperty();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-03-05 16:59:03 UTC (rev 70436)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-03-05 17:13:04 UTC (rev 70437)
@@ -181,6 +181,14 @@
assertThis(property.getValue());
}
+ public void testPropertyWithNull() throws Exception
+ {
+ PropertyMetaData property = getProperty("PropertyWithNull.xml");
+ assertNotNull("PropertyName", property.getName());
+ assertNull(property.getAnnotations());
+ assertNullValue(property.getValue());
+ }
+
public void testPropertyWithWildcard() throws Exception
{
PropertyMetaData property = getProperty("PropertyWithWildcard.xml");
More information about the jboss-cvs-commits
mailing list