Move Concurrent bean store

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1708 1c488680-804c-0410-94cd-c6b725194a0e
weld · Feb 25, 2009 · dac2873 · dac2873
1 parent fe64836
commit dac2873
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/...beanstore/ConcurrentHashMapBeanStore.java → ...i/helpers/ConcurrentHashMapBeanStore.java b/...beanstore/ConcurrentHashMapBeanStore.java → ...i/helpers/ConcurrentHashMapBeanStore.java
@@ -15,17 +15,14 @@
  * limitations under the License.
  */
 
-package org.jboss.webbeans.context.beanstore;
+package org.jboss.webbeans.context.api.helpers;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.context.Contextual;
 
 import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.api.helpers.AbstractMapBackedBeanStore;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
 
 /**
  * A BeanStore that uses a HashMap as backing storage
@@ -34,7 +31,6 @@
  */
 public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore
 {
-   private static LogProvider log = Logging.getLogProvider(ConcurrentHashMapBeanStore.class);
 
    // The backing map
    protected Map<Contextual<? extends Object>, Object> delegate;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
@@ -20,7 +20,7 @@
 
 import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
 import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
 import org.jboss.webbeans.ejb.spi.EjbResolver;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.servlet.AbstractLifecycle;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -24,7 +24,7 @@
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.context.SessionContext;
 import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java
@@ -24,7 +24,7 @@
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.context.SessionContext;
 import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
 
 /**
  * Implementation of the Web Beans lifecycle that can react to servlet events.