[jboss-cvs] JBossAS SVN: r80707 - in projects/microcontainer/trunk/kernel/src: test/java/org/jboss/test/kernel/config/test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-11-08 04:36:54 -0500 (Sat, 08 Nov 2008)
New Revision: 80707

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/ScopingDependencyTestCase.java
Log:
Deprecate AbstractKernelDeployment::setBeans.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java	2008-11-08 08:10:47 UTC (rev 80706)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java	2008-11-08 09:36:54 UTC (rev 80707)
@@ -133,6 +133,7 @@
     * @param beans a List<BeanMetaData>.
     */
    @SuppressWarnings("unchecked")
+   @Deprecated
    public void setBeans(List beans)
    {
       this.beanFactories = beans;

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2008-11-08 08:10:47 UTC (rev 80706)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2008-11-08 09:36:54 UTC (rev 80707)
@@ -161,14 +161,14 @@
    {
       BeanMetaDataBuilder demand = BeanMetaDataBuilderFactory.createBuilder("DemandBean", SimpleBean.class.getName());
       demand.addDemand("Barrier");
-      BeanMetaData demandBean = demand.getBeanMetaData();
+      BeanMetaDataFactory demandBean = demand.getBeanMetaDataFactory();
 
       BeanMetaDataBuilder supply = BeanMetaDataBuilderFactory.createBuilder("SupplyBean", SimpleLifecycleBean.class.getName());
       supply.addSupply("Barrier");
-      BeanMetaData supplyBean = supply.getBeanMetaData();
+      BeanMetaDataFactory supplyBean = supply.getBeanMetaDataFactory();
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();
-      deployment.setBeans(Arrays.asList(demandBean, supplyBean));
+      deployment.setBeanFactories(Arrays.asList(demandBean, supplyBean));
 
       Kernel kernel = bootstrap();
       KernelController controller = kernel.getController();
@@ -193,13 +193,13 @@
    {
       BeanMetaDataBuilder dependOn = BeanMetaDataBuilderFactory.createBuilder("DependOnBean", SimpleBean.class.getName());
       dependOn.addDependency("DependencyResolver");
-      BeanMetaData dependOnBean = dependOn.getBeanMetaData();
+      BeanMetaDataFactory dependOnBean = dependOn.getBeanMetaDataFactory();
 
       BeanMetaDataBuilder resolver = BeanMetaDataBuilderFactory.createBuilder("DependencyResolver", SimpleLifecycleBean.class.getName());
-      BeanMetaData resolverBean = resolver.getBeanMetaData();
+      BeanMetaDataFactory resolverBean = resolver.getBeanMetaDataFactory();
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();
-      deployment.setBeans(Arrays.asList(dependOnBean, resolverBean));
+      deployment.setBeanFactories(Arrays.asList(dependOnBean, resolverBean));
 
       Kernel kernel = bootstrap();
       KernelController controller = kernel.getController();
@@ -250,7 +250,7 @@
       builder.addPropertyMetaData("map", map);
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();
-      deployment.setBeans(Arrays.asList(builder.getBeanMetaData()));
+      deployment.setBeanFactories(Arrays.asList(builder.getBeanMetaDataFactory()));
 
       Kernel kernel = bootstrap();
       KernelController controller = kernel.getController();
@@ -328,7 +328,7 @@
       builder.addPropertyMetaData("map", map);
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();
-      deployment.setBeans(Arrays.asList(builder.getBeanMetaData()));
+      deployment.setBeanFactories(Arrays.asList(builder.getBeanMetaDataFactory()));
 
       Kernel kernel = bootstrap();
       KernelController controller = kernel.getController();

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/ScopingDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/ScopingDependencyTestCase.java	2008-11-08 08:10:47 UTC (rev 80706)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/ScopingDependencyTestCase.java	2008-11-08 09:36:54 UTC (rev 80707)
@@ -26,7 +26,7 @@
 
 import junit.framework.Test;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
-import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.dependency.spi.ControllerContext;
@@ -305,8 +305,8 @@
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();
       deployment.setName(deploymentName);
-      List<BeanMetaData> beans = Collections.singletonList(builder.getBeanMetaData());
-      deployment.setBeans(beans);
+      List<BeanMetaDataFactory> beans = Collections.singletonList(builder.getBeanMetaDataFactory());
+      deployment.setBeanFactories(beans);
       return deployment;
    }