[jboss-cvs] JBossAS SVN: r62444 - in projects/microcontainer/trunk: container/src/main/org/jboss/beans/info/plugins and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 20 10:51:57 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-04-20 10:51:57 -0400 (Fri, 20 Apr 2007)
New Revision: 62444
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
Log:
Make ClassAdapter.getDependencies() and BeanInfo.getDependencies() return List<DependencyBuilderListItem> instead of List<Object>
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -43,6 +43,7 @@
import org.jboss.classadapter.plugins.dependency.AbstractDependencyBuilder;
import org.jboss.classadapter.spi.ClassAdapter;
import org.jboss.classadapter.spi.Dependency;
+import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.signature.MethodSignature;
@@ -72,7 +73,7 @@
private static final String DEPENDENCY_NAME_ATTRIBUTE = "name";
private static final IntrospectionTypeInfoFactoryImpl typeInfoFactory = new IntrospectionTypeInfoFactoryImpl();
- public List<Object> getDependencies(ClassAdapter classAdapter, MetaData metaData)
+ public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)
{
AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
try
@@ -97,7 +98,7 @@
ReflectiveAspectBinder binder = new ReflectiveAspectBinder(clazz, advisor);
Set aspects = binder.getAspects();
- ArrayList<Object> depends = new ArrayList<Object>();
+ ArrayList<DependencyBuilderListItem> depends = new ArrayList<DependencyBuilderListItem>();
if (aspects != null && aspects.size() > 0)
{
Iterator it = aspects.iterator();
@@ -124,10 +125,10 @@
}
}
- HashSet<Object> annotationDependencies = getAnnotationDependencies(classInfo, metaData);
- for (Object dependency : annotationDependencies)
+ HashSet<String> annotationDependencies = getAnnotationDependencies(classInfo, metaData);
+ for (String dependency : annotationDependencies)
{
- depends.add(new AnnotationDependencyBuilderListItem((String)dependency));
+ depends.add(new AnnotationDependencyBuilderListItem(dependency));
}
return depends;
}
@@ -140,11 +141,11 @@
}
}
- private HashSet<Object> getAnnotationDependencies(ClassInfo classInfo, MetaData metaData)
+ private HashSet<String> getAnnotationDependencies(ClassInfo classInfo, MetaData metaData)
{
try
{
- HashSet<Object> dependencies = new HashSet<Object>();
+ HashSet<String> dependencies = new HashSet<String>();
getClassAnnotationDependencies(classInfo, metaData, dependencies);
getMethodAnnotationDependencies(classInfo, metaData, dependencies);
return dependencies;
@@ -159,7 +160,7 @@
}
}
- private void getClassAnnotationDependencies(ClassInfo classInfo, MetaData metaData, HashSet<Object> dependencies) throws Exception
+ private void getClassAnnotationDependencies(ClassInfo classInfo, MetaData metaData, HashSet<String> dependencies) throws Exception
{
HashMap<String, ArrayList<String>> realMap = new HashMap<String, ArrayList<String>>();
getRealClassAnnotationDependencies(classInfo, realMap);
@@ -189,7 +190,7 @@
}
}
- private void getMethodAnnotationDependencies(ClassInfo classInfo, MetaData metaData, HashSet<Object> dependencies) throws Exception
+ private void getMethodAnnotationDependencies(ClassInfo classInfo, MetaData metaData, HashSet<String> dependencies) throws Exception
{
Map methodMap = ClassInfoMethodHashing.getMethodMap(classInfo);
if (methodMap != null)
@@ -318,7 +319,7 @@
list.add(dependency.getValue());
}
- private void addAllDependenciesToSet(HashSet<Object> dependencies, HashMap<String, ArrayList<String>> classMap, HashMap<String, ArrayList<String>> overrideMap)
+ private void addAllDependenciesToSet(HashSet<String> dependencies, HashMap<String, ArrayList<String>> classMap, HashMap<String, ArrayList<String>> overrideMap)
{
HashMap<String, ArrayList<String>> dependencyMap = mergeClassAndOverrideMaps(classMap, overrideMap);
if (dependencyMap.size() > 0)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -33,6 +33,7 @@
import org.jboss.beans.info.spi.EventInfo;
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.classadapter.spi.ClassAdapter;
+import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.plugins.Config;
import org.jboss.joinpoint.spi.ConstructorJoinpoint;
import org.jboss.joinpoint.spi.JoinpointFactory;
@@ -205,7 +206,7 @@
return beanInfoFactory;
}
- public List<Object> getDependencies(MetaData metaData)
+ public List<DependencyBuilderListItem> getDependencies(MetaData metaData)
{
return classAdapter.getDependencies(metaData);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Set;
+import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.spi.JoinpointFactory;
import org.jboss.metadata.spi.MetaData;
import org.jboss.reflect.spi.ClassInfo;
@@ -140,7 +141,7 @@
* @param metaData the metadata
* @return the list of dependencies
*/
- List<Object> getDependencies(MetaData metaData);
+ List<DependencyBuilderListItem> getDependencies(MetaData metaData);
/**
* Create a new instance
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -26,6 +26,7 @@
import org.jboss.classadapter.spi.ClassAdapter;
import org.jboss.classadapter.spi.ClassAdapterFactory;
import org.jboss.classadapter.spi.DependencyBuilder;
+import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.spi.JoinpointFactory;
import org.jboss.joinpoint.spi.JoinpointFactoryBuilder;
import org.jboss.metadata.spi.MetaData;
@@ -73,7 +74,7 @@
return classInfo.getType().getClassLoader();
}
- public List<Object> getDependencies(MetaData metaData)
+ public List<DependencyBuilderListItem> getDependencies(MetaData metaData)
{
DependencyBuilder builder = classAdapterFactory.getConfiguration().getDependencyBuilder();
return builder.getDependencies(this, metaData);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -25,6 +25,7 @@
import org.jboss.classadapter.spi.ClassAdapter;
import org.jboss.classadapter.spi.DependencyBuilder;
+import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.metadata.spi.MetaData;
/**
@@ -35,7 +36,7 @@
*/
public class AbstractDependencyBuilder implements DependencyBuilder
{
- public List<Object> getDependencies(ClassAdapter classAdapter, MetaData metaData)
+ public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)
{
return null;
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -80,5 +80,5 @@
* @param metaData the metadata
* @return the list of dependencies
*/
- List<Object> getDependencies(MetaData metaData);
+ List<DependencyBuilderListItem> getDependencies(MetaData metaData);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -40,5 +40,5 @@
* @param metaData the metadata
* @return the dependencies
*/
- List<Object> getDependencies(ClassAdapter classAdapter, MetaData metaData);
+ List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2007-04-20 13:38:36 UTC (rev 62443)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2007-04-20 14:51:57 UTC (rev 62444)
@@ -48,13 +48,13 @@
KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
MetaData md = repository.getMetaData(context);
// add custom dependencies (e.g. AOP layer).
- List<Object> dependencies = info.getDependencies(md);
+ List<DependencyBuilderListItem> dependencies = info.getDependencies(md);
log.trace("Extra dependencies for " + context.getName() + " " + dependencies);
if (dependencies != null)
{
- for (Object dependencyItem : dependencies)
+ for (DependencyBuilderListItem dependencyItem : dependencies)
{
- ((DependencyBuilderListItem)dependencyItem).addDependency(context);
+ dependencyItem.addDependency(context);
}
}
}
More information about the jboss-cvs-commits
mailing list