[webbeans-commits] Webbeans SVN: r1708 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/mock and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-25 10:53:04 -0500 (Wed, 25 Feb 2009) New Revision: 1708 Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java Log: Move Concurrent bean store Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java 2009-02-25 15:40:48 UTC (rev 1707) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.context.beanstore; - -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 - * - * @author Nicklas Karlsson - */ -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; - - /** - * Constructor - */ - public ConcurrentHashMapBeanStore() - { - delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>(); - } - - /** - * Gets the delegate for the store - * - * @return The delegate - */ - @Override - public Map<Contextual<? extends Object>, Object> delegate() - { - return delegate; - } - -} \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 15:40:48 UTC (rev 1707) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 15:53:04 UTC (rev 1708) @@ -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; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 15:40:48 UTC (rev 1707) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 15:53:04 UTC (rev 1708) @@ -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; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 15:40:48 UTC (rev 1707) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 15:53:04 UTC (rev 1708) @@ -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. Copied: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java (from rev 1705, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java) =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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; + +/** + * A BeanStore that uses a HashMap as backing storage + * + * @author Nicklas Karlsson + */ +public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore +{ + + // The backing map + protected Map<Contextual<? extends Object>, Object> delegate; + + /** + * Constructor + */ + public ConcurrentHashMapBeanStore() + { + delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>(); + } + + /** + * Gets the delegate for the store + * + * @return The delegate + */ + @Override + public Map<Contextual<? extends Object>, Object> delegate() + { + return delegate; + } + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java ___________________________________________________________________ Name: svn:mergeinfo +