WELD-679, Remove BeanStore from API

weld · Sep 20, 2010 · 5ea0e2a · 5ea0e2a
1 parent e9f8da8
commit 5ea0e2a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 305 deletions.
diff --git a/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Bootstrap.java b/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Bootstrap.java
@@ -28,7 +28,6 @@
 import org.jboss.weld.bootstrap.spi.BeansXml;
 import org.jboss.weld.bootstrap.spi.Deployment;
 import org.jboss.weld.bootstrap.spi.Metadata;
-import org.jboss.weld.context.api.BeanStore;
 import org.jboss.weld.manager.api.WeldManager;
 
 /**
@@ -62,7 +61,6 @@ public interface Bootstrap
     * <li>Creates the manager</li>
     * </ul>
     * 
-    * @param beanStore the bean store to use as backing for the application
     *           context
     * @param environment the environment in use, by default
     *           {@link Environments.EE}
@@ -71,7 +69,7 @@ public interface Bootstrap
     *            given environment are available
     * 
     */
-   public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore);
+   public Bootstrap startContainer(Environment environment, Deployment deployment);
 
    /**
     * Starts the application container initialization process:

diff --git a/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/helpers/ForwardingBootstrap.java b/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/helpers/ForwardingBootstrap.java
@@ -20,7 +20,6 @@
 import org.jboss.weld.bootstrap.api.Environment;
 import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
 import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.weld.context.api.BeanStore;
 import org.jboss.weld.manager.api.WeldManager;
 
 /**
@@ -38,9 +37,9 @@ public WeldManager getManager(BeanDeploymentArchive beanDeploymentArchive)
       return delegate().getManager(beanDeploymentArchive);
    }
 
-   public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore)
+   public Bootstrap startContainer(Environment environment, Deployment deployment)
    {
-      return delegate().startContainer(environment, deployment, beanStore);
+      return delegate().startContainer(environment, deployment);
    }
 
    public void shutdown()

diff --git a/weld-spi/src/main/java/org/jboss/weld/context/api/BeanStore.java b/weld-spi/src/main/java/org/jboss/weld/context/api/BeanStore.java
diff --git a/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/AbstractMapBackedBeanStore.java b/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/AbstractMapBackedBeanStore.java
diff --git a/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/ConcurrentHashMapBeanStore.java b/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/ConcurrentHashMapBeanStore.java
diff --git a/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/ForwardingBeanStore.java b/weld-spi/src/main/java/org/jboss/weld/context/api/helpers/ForwardingBeanStore.java