[webbeans-commits] Webbeans SVN: r737 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean and 14 other directories.

Author: nickarls Date: 2008-12-26 17:51:21 -0500 (Fri, 26 Dec 2008) New Revision: 737 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/CurrentBinding.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/InitializedBinding.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/DependentContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/NormalContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/PassivatingContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanRemoveMethodTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java Log: Part II Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-26 22:51:21 UTC (rev 737) @@ -51,7 +51,7 @@ import org.jboss.webbeans.bean.AbstractBean; import org.jboss.webbeans.bean.proxy.ProxyPool; -import org.jboss.webbeans.contexts.ContextMap; +import org.jboss.webbeans.context.ContextMap; import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.event.EventManager; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -38,7 +38,7 @@ import javax.webbeans.manager.Bean; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem.AnnotationMap; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -37,7 +37,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.spi.EjbDescriptor; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -24,7 +24,7 @@ import javax.webbeans.Event; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.event.EventImpl; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotatedParameter; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -22,7 +22,7 @@ import org.jboss.webbeans.InstanceImpl; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedItem; /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -20,7 +20,7 @@ import java.lang.reflect.Field; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl; import org.jboss.webbeans.util.Names; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -27,7 +27,7 @@ import javax.webbeans.Observes; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-12-26 22:51:21 UTC (rev 737) @@ -28,7 +28,7 @@ import javax.webbeans.manager.Manager; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedMethod; Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding (from rev 734, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings) Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding ___________________________________________________________________ Name: svn:mergeinfo + Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/CurrentBinding.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java 2008-12-26 18:28:04 UTC (rev 734) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/CurrentBinding.java 2008-12-26 22:51:21 UTC (rev 737) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.bindings; +package org.jboss.webbeans.binding; import javax.webbeans.AnnotationLiteral; import javax.webbeans.Current; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/InitializedBinding.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/InitializedBinding.java 2008-12-26 18:28:04 UTC (rev 734) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/binding/InitializedBinding.java 2008-12-26 22:51:21 UTC (rev 737) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.bindings; +package org.jboss.webbeans.binding; import javax.webbeans.AnnotationLiteral; import javax.webbeans.manager.Initialized; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -24,7 +24,7 @@ import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.resources.DefaultNaming; +import org.jboss.webbeans.resource.DefaultNaming; import org.jboss.webbeans.resources.spi.Naming; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.servlet.ServletBootstrap; @@ -73,7 +73,7 @@ * Creates an instance of the type * * @param constructor The constructor to use - * @param parameters The parameters to pass to the contstructor + * @param parameters The parameters to pass to the constructor * @return An instance of the type */ protected static <T> T newInstance(Constructor<T> constructor, Object... parameters) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -50,7 +50,7 @@ import org.jboss.webbeans.bean.ProducerFieldBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.bindings.InitializedBinding; +import org.jboss.webbeans.binding.InitializedBinding; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.ejb.EJBApiAbstraction; import org.jboss.webbeans.event.ObserverImpl; @@ -73,8 +73,7 @@ * @author Pete Muir */ public abstract class WebBeansBootstrap -{ - +{ // The log provider private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2008-12-26 22:51:21 UTC (rev 737) @@ -46,7 +46,12 @@ enterpriseBean.postConstruct(invocationContext.getTarget()); } } - + + /** + * Gets the underlying target and calls the pre-destroy method + * + * @param invocationContext The invocation context + */ @PreDestroy public void preDestroy(InvocationContext invocationContext) { @@ -56,7 +61,13 @@ enterpriseBean.preDestroy(invocationContext.getTarget()); } } - + + /** + * Gets a bean based on the target in the invocation context + * + * @param invocationContext The invocation context + * @return The found bean or null if the bean was not an enterprise bean + */ @SuppressWarnings("unchecked") private static EnterpriseBean<Object> getBean(InvocationContext invocationContext) { @@ -71,5 +82,5 @@ return null; } } - + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2008-12-26 22:51:21 UTC (rev 737) @@ -24,7 +24,7 @@ import javax.el.ELResolver; import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; public class WebBeansELResolver extends ELResolver { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-26 22:51:21 UTC (rev 737) @@ -28,7 +28,7 @@ import javax.webbeans.Observer; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception (from rev 734, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions) Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception ___________________________________________________________________ Name: svn:mergeinfo + Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions/NotAScopeException.java 2008-12-26 18:28:04 UTC (rev 734) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java 2008-12-26 22:51:21 UTC (rev 737) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.exceptions; +package org.jboss.webbeans.exception; import javax.webbeans.DefinitionException; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-26 22:51:21 UTC (rev 737) @@ -32,7 +32,7 @@ import javax.webbeans.BindingType; import javax.webbeans.manager.Manager; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.util.Reflections; Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource (from rev 734, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resources) Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource ___________________________________________________________________ Name: svn:mergeinfo + Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resources/DefaultNaming.java 2008-12-26 18:28:04 UTC (rev 734) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java 2008-12-26 22:51:21 UTC (rev 737) @@ -1,66 +0,0 @@ -package org.jboss.webbeans.resources; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.webbeans.ExecutionException; - -import org.jboss.webbeans.resources.spi.Naming; - -public class DefaultNaming implements Naming -{ - - private transient InitialContext initialContext; - - public DefaultNaming() - { - try - { - this.initialContext = new InitialContext(); - } - catch (NamingException e) - { - throw new ExecutionException("Could not obtain InitialContext", e); - } - } - - - - public InitialContext getInitialContext() - { - return initialContext; - } - - public void bind(String key, Object value) - { - try - { - initialContext.bind(key, value); - } - catch (NamingException e) - { - throw new ExecutionException("Cannot bind " + value + " to " + key, e); - } - } - - public <T> T lookup(String name, Class<? extends T> expectedType) - { - Object instance; - try - { - instance = initialContext.lookup(name); - } - catch (NamingException e) - { - throw new ExecutionException("Cannot lookup " + name, e); - } - try - { - return (T) instance; - } - catch (ClassCastException e) - { - throw new ExecutionException(instance + " not of expected type " + expectedType, e); - } - } - -} Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java (from rev 735, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resources/DefaultNaming.java) =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java 2008-12-26 22:51:21 UTC (rev 737) @@ -0,0 +1,109 @@ +/* + * 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.resource; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.webbeans.ExecutionException; + +import org.jboss.webbeans.resources.spi.Naming; + +/** + * The default naming provider + * + * @author Pete Muir + */ +public class DefaultNaming implements Naming +{ + private static final long serialVersionUID = 1L; + // The initial lookup context + private transient InitialContext initialContext; + + /** + * Constructor + */ + public DefaultNaming() + { + try + { + this.initialContext = new InitialContext(); + } + catch (NamingException e) + { + throw new ExecutionException("Could not obtain InitialContext", e); + } + } + + /** + * Gets the initial context + * + * @return The initial context + */ + public InitialContext getInitialContext() + { + return initialContext; + } + + /** + * Binds in item to JNDI + * + * @param key The key to bind under + * @param value The value to bind + */ + public void bind(String key, Object value) + { + try + { + initialContext.bind(key, value); + } + catch (NamingException e) + { + throw new ExecutionException("Cannot bind " + value + " to " + key, e); + } + } + + /** + * Lookup an item from JNDI + * + * @param name The key + * @param expectedType The expected return type + * @return The found item + */ + @SuppressWarnings("unchecked") + public <T> T lookup(String name, Class<? extends T> expectedType) + { + Object instance; + try + { + instance = initialContext.lookup(name); + } + catch (NamingException e) + { + throw new ExecutionException("Cannot lookup " + name, e); + } + try + { + return (T) instance; + } + catch (ClassCastException e) + { + throw new ExecutionException(instance + " not of expected type " + expectedType, e); + } + } + +} Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -1,96 +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.servlet; - -import java.util.Enumeration; - -import javax.servlet.ServletContext; - -import org.jboss.webbeans.contexts.AbstractBeanMap; -import org.jboss.webbeans.contexts.ApplicationContext; - -/** - * A BeanMap that uses a servlet context as backing map - * - * @author Nicklas Karlsson - * - * @see org.jboss.webbeans.contexts.ApplicationContext - */ -public class ApplicationBeanMap extends AbstractBeanMap -{ - // The servlet context to use as backing map - private ServletContext context; - - /** - * Constructor - * - * @param context The servlet context instance - */ - public ApplicationBeanMap(ServletContext context) - { - super(); - this.context = context; - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getKeyPrefix() - */ - @Override - protected String getKeyPrefix() - { - return ApplicationContext.class.getName(); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getAttribute() - */ - @Override - protected Object getAttribute(String key) - { - return context.getAttribute(key); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getAttributeNames() - */ - @SuppressWarnings("unchecked") - @Override - protected Enumeration<String> getAttributeNames() - { - return context.getAttributeNames(); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#removeAttributes() - */ - @Override - protected void removeAttribute(String key) - { - context.removeAttribute(key); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#setAttribute() - */ - @Override - protected void setAttribute(String key, Object instance) - { - context.setAttribute(key, instance); - } - -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -24,10 +24,11 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.PropertiesBasedBootstrap; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.contexts.ApplicationContext; -import org.jboss.webbeans.contexts.DependentContext; -import org.jboss.webbeans.contexts.RequestContext; -import org.jboss.webbeans.contexts.SessionContext; +import org.jboss.webbeans.context.ApplicationContext; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.context.RequestContext; +import org.jboss.webbeans.context.SessionContext; +import org.jboss.webbeans.context.beanmap.ApplicationBeanMap; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.util.DeploymentProperties; 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 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-12-26 22:51:21 UTC (rev 737) @@ -21,10 +21,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.jboss.webbeans.contexts.ApplicationContext; -import org.jboss.webbeans.contexts.DependentContext; -import org.jboss.webbeans.contexts.RequestContext; -import org.jboss.webbeans.contexts.SessionContext; +import org.jboss.webbeans.context.ApplicationContext; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.context.RequestContext; +import org.jboss.webbeans.context.SessionContext; +import org.jboss.webbeans.context.beanmap.SessionBeanMap; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -1,96 +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.servlet; - -import java.util.Enumeration; - -import javax.servlet.http.HttpSession; - -import org.jboss.webbeans.contexts.AbstractBeanMap; -import org.jboss.webbeans.contexts.ApplicationContext; - -/** - * A BeanMap that uses a HTTP session as backing map - * - * @author Nicklas Karlsson - * - * @see org.jboss.webbeans.contexts.ApplicationContext - */ -public class SessionBeanMap extends AbstractBeanMap -{ - // The HTTP session context to use as backing map - private HttpSession session; - - /** - * Constructor - * - * @param session The HTTP session - */ - public SessionBeanMap(HttpSession session) - { - super(); - this.session = session; - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getKeyPrefix() - */ - @Override - protected String getKeyPrefix() - { - return ApplicationContext.class.getName(); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getAttribute() - */ - @Override - protected Object getAttribute(String key) - { - return session.getAttribute(key); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#getAttributeNames() - */ - @SuppressWarnings("unchecked") - @Override - protected Enumeration<String> getAttributeNames() - { - return session.getAttributeNames(); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#removeAttributes() - */ - @Override - protected void removeAttribute(String key) - { - session.removeAttribute(key); - } - - /** - * @see org.jboss.webbeans.contexts.AbstractBeanMap#setAttribute() - */ - @Override - protected void setAttribute(String key, Object instance) - { - session.setAttribute(key, instance); - } - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/examples/Tests.java 2008-12-26 22:51:21 UTC (rev 737) @@ -9,7 +9,7 @@ import org.jboss.webbeans.bean.BeanFactory; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.AbstractTest; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -9,7 +9,7 @@ import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.test.annotations.Synchronous; import org.jboss.webbeans.test.beans.Barn; import org.jboss.webbeans.test.beans.Cat; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -11,7 +11,7 @@ import javax.webbeans.manager.Bean; import org.jboss.webbeans.bean.BeanFactory; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.beans.Fox; import org.jboss.webbeans.test.beans.Tuna; import org.jboss.webbeans.test.beans.TunedTuna; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -11,7 +11,7 @@ import javax.webbeans.TypeLiteral; import javax.webbeans.manager.Bean; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.beans.AuroraFinch; import org.jboss.webbeans.test.beans.BananaSpider; import org.jboss.webbeans.test.beans.BirdCage; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-26 22:51:21 UTC (rev 737) @@ -12,7 +12,7 @@ import javax.webbeans.manager.Bean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.contexts.RequestContext; +import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.beans.Fox; import org.jboss.webbeans.test.beans.FoxRun; import org.jboss.webbeans.test.beans.SpiderNest; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -5,7 +5,7 @@ import javax.webbeans.AmbiguousDependencyException; import javax.webbeans.manager.Bean; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -10,7 +10,7 @@ import javax.webbeans.UnsatisfiedDependencyException; import javax.webbeans.manager.Bean; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -6,8 +6,8 @@ import javax.webbeans.RequestScoped; import javax.webbeans.manager.Context; -import org.jboss.webbeans.contexts.AbstractBeanMapContext; -import org.jboss.webbeans.contexts.RequestContext; +import org.jboss.webbeans.context.AbstractBeanMapContext; +import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.beans.FishFarmOffice; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -13,7 +13,7 @@ import javax.webbeans.manager.Bean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -14,7 +14,7 @@ import javax.webbeans.NonexistentConstructorException; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.bindings.CurrentBinding; +import org.jboss.webbeans.binding.CurrentBinding; import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.test.annotations.HeavyDuty; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/DependentContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/DependentContextTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/DependentContextTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -11,7 +11,7 @@ import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/NormalContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/NormalContextTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/NormalContextTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -2,7 +2,7 @@ import javax.webbeans.manager.Context; -import org.jboss.webbeans.contexts.RequestContext; +import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/PassivatingContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/PassivatingContextTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/contexts/PassivatingContextTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -5,7 +5,7 @@ import javax.webbeans.UnserializableDependencyException; import javax.webbeans.manager.Context; -import org.jboss.webbeans.contexts.RequestContext; +import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -4,7 +4,7 @@ import org.jboss.webbeans.bean.BeanFactory; import org.jboss.webbeans.bean.EnterpriseBean; -import org.jboss.webbeans.contexts.DependentContext; +import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanRemoveMethodTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanRemoveMethodTest.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanRemoveMethodTest.java 2008-12-26 22:51:21 UTC (rev 737) @@ -6,7 +6,7 @@ import org.jboss.webbeans.bean.BeanFactory; import org.jboss.webbeans.bean.EnterpriseBean; -import org.jboss.webbeans.contexts.RequestContext; +import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2008-12-26 22:46:18 UTC (rev 736) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2008-12-26 22:51:21 UTC (rev 737) @@ -2,11 +2,11 @@ import org.jboss.webbeans.bootstrap.WebBeansBootstrap; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.contexts.ApplicationContext; -import org.jboss.webbeans.contexts.DependentContext; -import org.jboss.webbeans.contexts.RequestContext; -import org.jboss.webbeans.contexts.SessionContext; -import org.jboss.webbeans.contexts.SimpleBeanMap; +import org.jboss.webbeans.context.ApplicationContext; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.context.RequestContext; +import org.jboss.webbeans.context.SessionContext; +import org.jboss.webbeans.context.beanmap.SimpleBeanMap; import org.jboss.webbeans.resources.spi.ResourceLoader; public class MockBootstrap extends WebBeansBootstrap