[jboss-cvs] JBossAS SVN: r97385 - in projects/kernel/trunk/kernel/src: test/java/org/jboss/test/kernel/inject/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 3 10:26:59 EST 2009
Author: alesj
Date: 2009-12-03 10:26:57 -0500 (Thu, 03 Dec 2009)
New Revision: 97385
Modified:
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/inject/test/MultipleContextualInjectionTestCase.java
projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/inject/test/MultipleContextualInjection.xml
Log:
[JBKERNEL-66]; fix whenRequired default setting in PropertyMetaData.
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2009-12-03 15:25:36 UTC (rev 97384)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2009-12-03 15:26:57 UTC (rev 97385)
@@ -175,12 +175,12 @@
*/
protected abstract void addCallback(MetaDataVisitor visitor, CallbackItem<?> callback);
- public void describeVisit(MetaDataVisitor vistor)
+ public void describeVisit(MetaDataVisitor visitor)
{
ControllerState whenRequired = getState();
try
{
- KernelControllerContext context = vistor.getControllerContext();
+ KernelControllerContext context = visitor.getControllerContext();
CallbackItem<?> callback;
if (property != null)
{
@@ -201,19 +201,19 @@
throw new IllegalArgumentException("Illegal usage - not property or method:" + this);
// add callback
- addCallback(vistor, callback);
+ addCallback(visitor, callback);
// demand name is Class in this case
if (cardinality != null)
{
- vistor.addDependency(new CallbackDependencyItem(context.getName(), (Class<?>)callback.getIDependOn(), whenRequired, dependentState, cardinality));
+ visitor.addDependency(new CallbackDependencyItem(context.getName(), (Class<?>)callback.getIDependOn(), whenRequired, dependentState, cardinality));
}
}
catch (Throwable t)
{
throw new Error(t);
}
- super.describeVisit(vistor);
+ super.describeVisit(visitor);
}
public void toString(JBossStringBuilder buffer)
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2009-12-03 15:25:36 UTC (rev 97384)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2009-12-03 15:26:57 UTC (rev 97385)
@@ -101,9 +101,9 @@
visitor.initialVisit(this);
}
- public void describeVisit(MetaDataVisitor vistor)
+ public void describeVisit(MetaDataVisitor visitor)
{
- vistor.describeVisit(this);
+ visitor.describeVisit(this);
}
protected TypeInfo applyCollectionOrMapCheck(TypeInfo typeInfo) throws Throwable
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2009-12-03 15:25:36 UTC (rev 97384)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2009-12-03 15:26:57 UTC (rev 97385)
@@ -287,6 +287,13 @@
super.initialVisit(visitor);
}
+ @Override
+ public void describeVisit(MetaDataVisitor visitor)
+ {
+ visitor.setContextState(ControllerState.CONFIGURED);
+ super.describeVisit(visitor);
+ }
+
public void addChildren(Set<MetaDataVisitorNode> children)
{
if (value != null)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/inject/test/MultipleContextualInjectionTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/inject/test/MultipleContextualInjectionTestCase.java 2009-12-03 15:25:36 UTC (rev 97384)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/inject/test/MultipleContextualInjectionTestCase.java 2009-12-03 15:26:57 UTC (rev 97385)
@@ -22,8 +22,9 @@
package org.jboss.test.kernel.inject.test;
import junit.framework.Test;
+
+import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.test.kernel.inject.support.PropertyInjectTestObject;
/**
* Multiple injection - should 'fail'.
@@ -49,8 +50,8 @@
protected void checkInjection()
{
- PropertyInjectTestObject test = (PropertyInjectTestObject) getBean("testObject", ControllerState.DESCRIBED);
- assertNull(test);
+ ControllerContext context = getControllerContext("testObject", null);
+ assertEquals(ControllerState.INSTANTIATED, context.getState());
}
protected void validate() throws Exception
Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/inject/test/MultipleContextualInjection.xml
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/inject/test/MultipleContextualInjection.xml 2009-12-03 15:25:36 UTC (rev 97384)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/inject/test/MultipleContextualInjection.xml 2009-12-03 15:26:57 UTC (rev 97385)
@@ -12,5 +12,4 @@
<property name="testerInterface"><inject/></property>
</bean>
-
</deployment>
More information about the jboss-cvs-commits
mailing list