[jboss-cvs] JBossAS SVN: r70501 - in projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata: spi and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 6 12:53:28 EST 2008
Author: adrian at jboss.org
Date: 2008-03-06 12:53:28 -0500 (Thu, 06 Mar 2008)
New Revision: 70501
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LifecycleMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ParameterMetaData.java
Log:
[JBMICROCONT-219] - Move code from xml parsing to where it belongs
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -608,6 +608,14 @@
DependencyItem di = new AbstractDependencyItem(name, iDependOn, whenRequired, ControllerState.INSTALLED);
visitor.addDependency(di);
}
+ if (create != null && create.getMethodName() == null)
+ create.setMethodName("create");
+ if (start != null && start.getMethodName() == null)
+ start.setMethodName("start");
+ if (stop != null && stop.getMethodName() == null)
+ stop.setMethodName("stop");
+ if (destroy != null && destroy.getMethodName() == null)
+ destroy.setMethodName("destroy");
super.initialVisit(visitor);
}
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-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -211,6 +211,17 @@
return factoryMethod;
}
+ @Override
+ public void initialVisit(MetaDataVisitor visitor)
+ {
+ if (parameters != null)
+ {
+ for (int i = 0; i < parameters.size(); ++i)
+ parameters.get(i).setIndex(i);
+ }
+ super.initialVisit(visitor);
+ }
+
protected void addChildren(Set<MetaDataVisitorNode> children)
{
super.addChildren(children);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -291,7 +291,7 @@
{
TypeProvider typeProvider = (TypeProvider)node;
Class<?> injectionClass = typeProvider.getType(visitor, this).getType();
- log.debug("Contextual injection usage (class -> classloader): " + injectionClass + " -> " + injectionClass.getClassLoader());
+ log.debug(context.getName() + ": Contextual injection usage (class -> classloader): " + injectionClass + " -> " + injectionClass.getClassLoader() + " defined by " + node);
// set when required
ControllerState whenRequired = whenRequiredState;
if (whenRequired == null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -160,8 +160,14 @@
this.type = type;
}
+ @Override
public void initialVisit(MetaDataVisitor visitor)
{
+ if (parameters != null)
+ {
+ for (int i = 0; i < parameters.size(); ++i)
+ parameters.get(i).setIndex(i);
+ }
visitor.setContextState(state);
super.initialVisit(visitor);
}
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-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -271,6 +271,10 @@
public void initialVisit(MetaDataVisitor visitor)
{
+ ValueMetaData vmd = getValue();
+ if (vmd != null && vmd instanceof AbstractInjectionValueMetaData)
+ ((AbstractInjectionValueMetaData) vmd).setPropertyMetaData(this);
+
visitor.setContextState(ControllerState.CONFIGURED);
super.initialVisit(visitor);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -266,6 +266,7 @@
this.parameters = parameters;
}
+ @Override
public void initialVisit(MetaDataVisitor visitor)
{
if (getParameter() != null && getParameters() != null)
@@ -278,6 +279,12 @@
setParameter(null);
}
+ if (parameters != null)
+ {
+ for (int i = 0; i < parameters.size(); ++i)
+ parameters.get(i).setIndex(i);
+ }
+
context = visitor.getControllerContext();
Object name = context.getName();
Object iDependOn = getUnderlyingValue();
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LifecycleMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LifecycleMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LifecycleMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -53,6 +53,13 @@
String getMethodName();
/**
+ * Set the method name
+ *
+ * @param methodName the method name
+ */
+ void setMethodName(String methodName);
+
+ /**
* Is default ignored.
*
* @return should we ignore default
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ParameterMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ParameterMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ParameterMetaData.java 2008-03-06 17:53:28 UTC (rev 70501)
@@ -50,4 +50,10 @@
*/
int getIndex();
+ /**
+ * Set the index
+ *
+ * @param index the index
+ */
+ void setIndex(int index);
}
More information about the jboss-cvs-commits
mailing list