weld-commits January 2009

weld-commits@lists.jboss.org

1 participants
623 discussions

[webbeans-commits] Webbeans SVN: r1242 - ri/trunk/webbeans-api/src/main/java/javax/inject/manager and 15 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 18:51:34 -0500 (Mon, 26 Jan 2009) New Revision: 1242 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.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/ForwardingBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.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/NewSimpleBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java Log: Update to CreationalContext API (not yet implemented) Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -32,7 +32,9 @@ public Class<? extends Annotation> getScopeType(); - public <T> T get(Contextual<T> bean, boolean create); + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext); + + public <T> T get(Contextual<T> contextual); boolean isActive(); Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -25,7 +25,7 @@ */ public interface Contextual<T> { - public T create(); + public T create(CreationalContext<T> creationalContext); public void destroy(T instance); } Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -45,10 +45,6 @@ return manager; } - public abstract T create(); - - public abstract void destroy(T instance); - public abstract Set<Type> getTypes(); public abstract Set<Annotation> getBindings(); Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -24,6 +24,7 @@ import java.util.Set; import javax.context.Context; +import javax.context.CreationalContext; import javax.event.Observer; import javax.inject.TypeLiteral; @@ -50,6 +51,10 @@ public Object getInstanceByName(String name); public <T> T getInstance(Bean<T> bean); + + public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext); + + public <T> T getInstanceToInject(InjectionPoint injectionPoint); public void fireEvent(Object event, Annotation... bindings); 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -35,6 +35,7 @@ import javax.context.Context; import javax.context.ContextNotActiveException; +import javax.context.CreationalContext; import javax.event.Observer; import javax.inject.AmbiguousDependencyException; import javax.inject.BindingType; @@ -47,6 +48,7 @@ import javax.inject.UnsatisfiedDependencyException; import javax.inject.manager.Bean; import javax.inject.manager.Decorator; +import javax.inject.manager.InjectionPoint; import javax.inject.manager.InterceptionType; import javax.inject.manager.Interceptor; import javax.inject.manager.Manager; @@ -56,10 +58,12 @@ import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.bean.proxy.ProxyPool; import org.jboss.webbeans.context.ContextMap; +import org.jboss.webbeans.context.CreationalContextImpl; import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.ejb.spi.EjbResolver; import org.jboss.webbeans.event.EventManager; import org.jboss.webbeans.event.ObserverImpl; +import org.jboss.webbeans.injection.AnnotatedInjectionPoint; import org.jboss.webbeans.injection.InjectionPointProvider; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedItem; @@ -84,6 +88,8 @@ { private static final long serialVersionUID = 3021562879133838561L; + + private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; // The JNDI key to place the manager under public static final String JNDI_KEY = "java:comp/Manager"; @@ -567,9 +573,25 @@ } else { - return getContext(bean.getScopeType()).get(bean, create); + return getContext(bean.getScopeType()).get(bean, new CreationalContextImpl<T>()); } } + + public <T> T getInstanceToInject(InjectionPoint injectionPoint) + { + throw new UnsupportedOperationException(); + } + + public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) + { + throw new UnsupportedOperationException(); + } + + public <T> T getInstanceToInject(AnnotatedInjectionPoint<T, ?> injectionPoint, CreationalContext<?> creationalContext) + { + Bean<T> bean = getBeanByType(injectionPoint, injectionPoint.getBindings().toArray(EMPTY_ANNOTATION_ARRAY)); + return getInstance(bean); + } /** * Gets an instance by name, returning null if none is found and throwing an @@ -638,6 +660,11 @@ */ public <T> T getInstanceByType(AnnotatedItem<T, ?> element, Annotation... bindings) { + return getInstance(getBeanByType(element, bindings)); + } + + public <T> Bean<T> getBeanByType(AnnotatedItem<T, ?> element, Annotation... bindings) + { Set<Bean<T>> beans = resolveByType(element, bindings); if (beans.size() == 0) { @@ -653,7 +680,7 @@ { throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable"); } - return getInstance(bean); + return bean; } /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.Set; +import javax.context.CreationalContext; import javax.context.Dependent; import javax.context.ScopeType; import javax.inject.DefinitionException; @@ -294,8 +295,7 @@ * * @returns The instance */ - @Override - public T create() + public T create(CreationalContext<T> creationalContext) { Object dependentCollector = new Object(); try @@ -320,7 +320,6 @@ } } - @Override public void destroy(T instance) { try 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -25,6 +25,7 @@ import javassist.util.proxy.ProxyObject; import javax.context.ApplicationScoped; +import javax.context.CreationalContext; import javax.context.Dependent; import javax.decorator.Decorator; import javax.event.Observes; @@ -210,8 +211,7 @@ * * @return The instance */ - @Override - public T create() + public T create(CreationalContext<T> creationalContext) { try { @@ -245,7 +245,6 @@ * * @param instance The instance */ - @Override public void destroy(T instance) { EnterpriseBeanInstance enterpiseBeanInstance = (EnterpriseBeanInstance) instance; 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -20,6 +20,7 @@ import java.lang.reflect.Type; +import javax.context.CreationalContext; import javax.event.Event; import javax.inject.DefinitionException; @@ -116,8 +117,7 @@ * * @return an event instance */ - @Override - public Event<T> create() + public Event<T> create(CreationalContext<Event<T>> creationalContext) { try { @@ -144,7 +144,6 @@ } } - @Override public void destroy(Event<T> instance) { try Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -21,6 +21,7 @@ import java.lang.reflect.Type; import java.util.Set; +import javax.context.CreationalContext; import javax.inject.manager.Bean; import javax.inject.manager.Manager; @@ -49,10 +50,9 @@ * * @return an instance of the delegate */ - @Override - public T create() + public T create(CreationalContext<T> creationalContext) { - return delegate().create(); + return delegate().create(creationalContext); } /** @@ -60,7 +60,6 @@ * * @param instance The instance to destroy */ - @Override public void destroy(T instance) { delegate().destroy(instance); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -17,6 +17,8 @@ package org.jboss.webbeans.bean; +import javax.context.CreationalContext; + import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedItem; @@ -49,14 +51,12 @@ super(field, manager); } - @Override - public T create() + public T create(CreationalContext<T> creationalContext) { // TODO Why do we need to cast here? return getType().cast(manager.getInjectionPointProvider().getPreviousInjectionPoint()); } - @Override public void destroy(T instance) { // The instance is always in the Dependent context and can be garbage 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -18,6 +18,7 @@ package org.jboss.webbeans.bean; +import javax.context.CreationalContext; import javax.inject.Instance; import org.jboss.webbeans.InstanceImpl; @@ -65,8 +66,7 @@ * * @return The implementation */ - @Override - public Instance<T> create() + public Instance<T> create(CreationalContext<Instance<T>> creationalContext) { try { @@ -79,7 +79,6 @@ } } - @Override public void destroy(Instance<T> instance) { try Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -26,7 +26,6 @@ import javax.inject.Standard; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.literal.NewLiteral; @@ -76,30 +75,6 @@ } /** - * Creates a new instance - */ - @Override - public T create() - { - try - { - DependentContext.INSTANCE.setActive(true); - T instance = getConstructor().newInstance(manager); - bindDecorators(); - bindInterceptors(); - injectEjbAndCommonFields(instance); - injectBoundFields(instance); - callInitializers(instance); - callPostConstruct(instance); - return instance; - } - finally - { - DependentContext.INSTANCE.setActive(false); - } - } - - /** * Gets the scope type * * @return @Dependent 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -24,6 +24,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.context.CreationalContext; import javax.context.Dependent; import javax.inject.DefinitionException; import javax.inject.Initializer; @@ -118,8 +119,7 @@ * * @return The instance */ - @Override - public T create() + public T create(CreationalContext<T> creationalContext) { try { @@ -156,7 +156,6 @@ * * @param instance The instance */ - @Override public void destroy(T instance) { try Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -26,6 +26,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.context.CreationalContextImpl; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.util.Reflections; @@ -88,12 +89,17 @@ { bean = CurrentManager.rootManager().getBeans().get(beanIndex); } - Context context = CurrentManager.rootManager().getContext(bean.getScopeType()); - Object proxiedInstance = context.get(bean, true); + Object proxiedInstance = getProxiedInstance(bean); Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args); log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue); return returnValue; } + + private <T> T getProxiedInstance(Bean<T> bean) + { + Context context = CurrentManager.rootManager().getContext(bean.getScopeType()); + return context.get(bean, CreationalContextImpl.<T>newInstance()); + } /** * Gets a string representation 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 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -19,6 +19,8 @@ import java.util.Collections; +import javax.context.CreationalContext; + import org.jboss.webbeans.BeanValidator; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; @@ -70,8 +72,7 @@ injectionPoints = Collections.emptySet(); } - @Override - public ManagerImpl create() + public ManagerImpl create(CreationalContext<ManagerImpl> creationalContext) { return manager; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -21,6 +21,7 @@ import javax.context.ContextNotActiveException; import javax.context.Contextual; +import javax.context.CreationalContext; import javax.inject.manager.Bean; import org.jboss.webbeans.context.beanmap.BeanMap; @@ -58,25 +59,33 @@ * * @see javax.context.Context#get(Bean, boolean) */ - public <T> T get(Contextual<T> bean, boolean create) + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) { if (!isActive()) { throw new ContextNotActiveException(); } - T instance = getBeanMap().get(bean); + T instance = getBeanMap().get(contextual); if (instance != null) { return instance; } - if (!create) + else if (creationalContext != null) { + instance = contextual.create(creationalContext); + getBeanMap().put(contextual, instance); + return instance; + } + else + { return null; } - instance = bean.create(); - getBeanMap().put(bean, instance); - return instance; } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } /** * Destroys a bean Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.context; + +import javax.context.CreationalContext; + +public class CreationalContextImpl<T> implements CreationalContext<T> +{ + + public static final <T> CreationalContextImpl<T> newInstance() + { + return new CreationalContextImpl<T>(); + } + + public void push(T incompleteInstance) + { + // TODO Auto-generated method stub + + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 22:55:08 UTC (rev 1241) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -21,6 +21,7 @@ import javax.context.ContextNotActiveException; import javax.context.Contextual; +import javax.context.CreationalContext; import javax.context.Dependent; import org.jboss.webbeans.bean.AbstractClassBean; @@ -59,23 +60,35 @@ /** * Overridden method always creating a new instance * - * @param bean The bean to create + * @param contextual The bean to create * @param create Should a new one be created */ - public <T> T get(Contextual<T> bean, boolean create) + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) { if (!isActive()) { throw new ContextNotActiveException(); } - T instance = create == false ? null : bean.create(); - if (bean instanceof AbstractClassBean && (currentInjectionInstance.get() != null)) + if (creationalContext != null) { - DependentInstancesStore dependentInstancesStore = ((AbstractClassBean<?>) bean).getDependentInstancesStore(); - dependentInstancesStore.addDependentInstance(currentInjectionInstance.get(), ContextualInstance.of(bean, instance)); + T instance = contextual.create(creationalContext); + if (contextual instanceof AbstractClassBean && (currentInjectionInstance.get() != null)) + { + DependentInstancesStore dependentInstancesStore = ((AbstractClassBean<?>) contextual).getDependentInstancesStore(); + dependentInstancesStore.addDependentInstance(currentInjectionInstance.get(), ContextualInstance.of(contextual, instance)); + } + return instance; } - return instance; + else + { + return null; + } } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } @Override public String toString() Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -13,6 +13,7 @@ * @author David Allen * */ +@Deprecated public interface Beans { @@ -25,6 +26,7 @@ * @param clazz the class to create the bean * @return the created bean */ + @Deprecated public <T> Bean<T> createSimpleBean(Class<T> clazz); /** @@ -35,6 +37,8 @@ * @param clazz the class to create the bean * @return the created bean */ + + @Deprecated public <T> Bean<T> createEnterpriseBean(Class<T> clazz); /** @@ -51,6 +55,7 @@ * producer method * @return the producer bean */ + @Deprecated public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> declaringBean); /** @@ -94,6 +99,7 @@ * @param declaringBean * @return the producer bean */ + @Deprecated public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean); public boolean isProxy(Object instance); Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -15,11 +15,13 @@ import java.util.Collections; import java.util.List; +import javax.context.CreationalContext; import javax.inject.Production; import javax.inject.Standard; import javax.inject.manager.Bean; import javax.inject.manager.Manager; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -84,21 +86,25 @@ manager = null; } + @Deprecated public <T> Bean<T> createSimpleBean(Class<T> beanClass) { return configuration().getBeans().createSimpleBean(beanClass); } + @Deprecated public <T> Bean<T> createEnterpriseBean(Class<T> beanClass) { return configuration().getBeans().createEnterpriseBean(beanClass); } + @Deprecated public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean) { return configuration().getBeans().createProducerMethodBean(method, producerBean); } + @Deprecated public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean) { return configuration().getBeans().createProducerFieldBean(field, producerBean); @@ -155,4 +161,10 @@ { configuration().getContexts().setInactive(configuration().getContexts().getDependentContext()); } + + @Deprecated + public static final <T> CreationalContext<T> mockCreationalContext(Class<T> expectedType) + { + return new MockCreationalContext<T>(); + } } \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.impl.util; + +import javax.context.CreationalContext; + +@Deprecated +public class MockCreationalContext<T> implements CreationalContext<T> +{ + + + public void push(T incompleteInstance) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -7,6 +7,7 @@ import javax.context.Context; import javax.context.ContextNotActiveException; import javax.context.Contextual; +import javax.context.CreationalContext; import javax.context.RequestScoped; import org.jboss.webbeans.tck.AbstractTest; @@ -29,10 +30,15 @@ private static class DummyContext implements Context { - public <T> T get(Contextual<T> bean, boolean create) + public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) { throw new UnsupportedOperationException(); } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } public Class<? extends Annotation> getScopeType() { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -6,6 +6,7 @@ import javax.context.Context; import javax.context.Contextual; +import javax.context.CreationalContext; import javax.context.ScopeType; import org.jboss.webbeans.tck.AbstractTest; @@ -34,10 +35,15 @@ private static class DummyContext implements Context { - public <T> T get(Contextual<T> bean, boolean create) + public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) { throw new UnsupportedOperationException(); } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } public Class<? extends Annotation> getScopeType() { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -14,6 +14,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @SpecVersion("20090116") @@ -35,7 +36,7 @@ assert foxRunBeans.size() == 1; Bean<FoxRun> foxRunBean = foxRunBeans.iterator().next(); manager.addBean(foxBean); - FoxRun foxRun = foxRunBean.create(); + FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); assert !foxRun.fox.equals(foxRun.anotherFox); } @@ -78,8 +79,8 @@ manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTarantula"); Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer); - Tarantula tarantula = tarantulaBean.create(); - Tarantula tarantula2 = tarantulaBean.create(); + Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); + Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; assert tarantula2 != null; assert tarantula != tarantula2; @@ -98,8 +99,8 @@ manager.addBean(spiderProducer); Field field = OtherSpiderProducer.class.getField("produceTarantula"); Bean<Tarantula> tarantulaBean = createProducerFieldBean(field, spiderProducer); - Tarantula tarantula = tarantulaBean.create(); - Tarantula tarantula2 = tarantulaBean.create(); + Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); + Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; assert tarantula2 != null; assert tarantula != tarantula2; @@ -149,8 +150,8 @@ assert foxBeans.size() == 1; Bean<Fox> foxBean = foxBeans.iterator().next(); Context context = manager.getContext(Dependent.class); - assert context.get(foxBean, true) != null; - assert context.get(foxBean, true) instanceof Fox; + assert context.get(foxBean, new MockCreationalContext<Fox>()) != null; + assert context.get(foxBean, new MockCreationalContext<Fox>()) instanceof Fox; } }.run(); @@ -175,7 +176,7 @@ assert foxBeans.size() == 1; Bean<Fox> foxBean = foxBeans.iterator().next(); Context context = manager.getContext(Dependent.class); - assert context.get(foxBean, false) == null; + assert context.get(foxBean, null) == null; } }.run(); @@ -262,7 +263,7 @@ Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); Bean<Fox> foxBean = createSimpleBean(Fox.class); manager.addBean(foxBean); - FoxRun foxRun = foxRunBean.create(); + FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); assert foxRun.fox != null; } @@ -288,7 +289,7 @@ Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); Bean<Fox> foxBean = createSimpleBean(Fox.class); manager.addBean(foxBean); - FoxRun foxRun = foxRunBean.create(); + FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); assert foxRun.fox != null; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -14,6 +14,7 @@ import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.jboss.webbeans.tck.impl.util.Reflections; import org.testng.annotations.Test; @@ -124,7 +125,7 @@ manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); manager.addBean(createProducerMethodBean(method, spiderProducer)); - Barn barn = createSimpleBean(Barn.class).create(); + Barn barn = createSimpleBean(Barn.class).create(new MockCreationalContext<Barn>()); assert barn.petSpider != null; assert barn.petSpider instanceof DefangedTarantula; } @@ -151,7 +152,7 @@ manager.addBean(createProducerMethodBean(method, spiderProducer)); method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(); + Spider spider = spiderBean.create(new MockCreationalContext<Spider>()); assert spider != null; assert spider instanceof DefangedTarantula; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -6,6 +6,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @SpecVersion("20081206") @@ -61,7 +62,7 @@ manager.addBean(createSimpleBean(Chicken.class)); Bean<ChickenHutch> chickenHutchBean = createSimpleBean(ChickenHutch.class); - ChickenHutch chickenHutch = chickenHutchBean.create(); + ChickenHutch chickenHutch = chickenHutchBean.create(new MockCreationalContext<ChickenHutch>()); assert chickenHutch.fox != null; assert chickenHutch.chicken != null; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -8,6 +8,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @SpecVersion("20081206") @@ -21,7 +22,7 @@ manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTarantula"); Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer); - Tarantula tarantula = tarantulaBean.create(); + Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; } @@ -54,7 +55,7 @@ manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("getNullSpider"); Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(); + Spider spider = spiderBean.create(new MockCreationalContext<Spider>()); assert spider == null; } @@ -64,7 +65,7 @@ Bean<SpiderProducer_Broken> spiderProducer = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(spiderProducer); Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider"); - createProducerMethodBean(method, spiderProducer).create(); + createProducerMethodBean(method, spiderProducer).create(new MockCreationalContext<Object>()); } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -9,6 +9,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken; import org.testng.annotations.Test; @@ -176,7 +177,7 @@ @Test @SpecAssertion(section="3.2.5.1") public void testEmptyConstructorUsed() { - createSimpleBean(Donkey.class).create(); + createSimpleBean(Donkey.class).create(new MockCreationalContext<Donkey>()); assert Donkey.constructedCorrectly; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -8,6 +8,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @SpecVersion("20081206") @@ -29,7 +30,7 @@ Bean<Goldfish> goldfishBean = createSimpleBean(Goldfish.class); manager.addBean(goldfishBean); manager.addBean(goldfishPondBean); - FishPond fishPond = goldfishPondBean.create(); + FishPond fishPond = goldfishPondBean.create(new MockCreationalContext<FishPond>()); assert fishPond.goldfish != null; } @@ -44,7 +45,7 @@ public void testCreateReturnsInstanceOfBean() { Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); - assert bean.create() instanceof RedSnapper; + assert bean.create(new MockCreationalContext<RedSnapper>()) instanceof RedSnapper; } @Test(groups={"stub", "beanLifecycle", "interceptors"}) @SpecAssertion(section="5.3") @@ -84,7 +85,7 @@ Bean<Farm> farmBean = createSimpleBean(Farm.class); manager.addBean(farmOfficeBean); manager.addBean(farmBean); - Farm farm = farmBean.create(); + Farm farm = farmBean.create(new MockCreationalContext<Farm>()); assert farm.founded!=null; assert farm.initialStaff==20; assert farm.closed==null; @@ -102,7 +103,7 @@ protected void execute() throws Exception { Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - bean.create(); + bean.create(new MockCreationalContext<CdOrderProcessor>()); } }.run(); assert OrderProcessor.postConstructCalled; @@ -118,7 +119,7 @@ protected void execute() throws Exception { Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - CdOrderProcessor instance = bean.create(); + CdOrderProcessor instance = bean.create(new MockCreationalContext<CdOrderProcessor>()); bean.destroy(instance); } }.run(); @@ -136,7 +137,7 @@ protected void execute() throws Exception { Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - bean.create(); + bean.create(new MockCreationalContext<NovelOrderProcessor>()); } }.run(); assert !OrderProcessor.postConstructCalled; @@ -152,7 +153,7 @@ protected void execute() throws Exception { Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - NovelOrderProcessor instance = bean.create(); + NovelOrderProcessor instance = bean.create(new MockCreationalContext<NovelOrderProcessor>()); bean.destroy(instance); } }.run(); @@ -166,7 +167,7 @@ Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(); + TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); assert tunaFarm.tuna != null; } @@ -176,7 +177,7 @@ Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(); + TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); assert tunaFarm.notInjectedTuna != manager.getInstance(tunaBean); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 22:55:08 UTC (rev 1241) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 23:51:34 UTC (rev 1242) @@ -13,6 +13,7 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @SpecVersion("20081206") @@ -35,7 +36,7 @@ manager.addBean(spiderProducer); Bean<SpiderNest> spiderNestBean = createSimpleBean(SpiderNest.class); manager.addBean(createProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer)); - SpiderNest spiderNest = spiderNestBean.create(); + SpiderNest spiderNest = spiderNestBean.create(new MockCreationalContext<SpiderNest>()); assert spiderNest.numberOfSpiders != null; assert spiderNest.numberOfSpiders.equals(4); } @@ -54,7 +55,7 @@ Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(); + TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); assert tunaFarm.tuna != null; configuration().getContexts().setInactive(configuration().getContexts().getRequestContext()); tunaFarm.tuna.getName(); @@ -67,7 +68,7 @@ Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); Bean<Fox> foxBean = createSimpleBean(Fox.class); manager.addBean(foxBean); - FoxRun foxRun = foxRunBean.create(); + FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); assert foxRun.fox.getName().equals("gavin"); } @@ -78,7 +79,7 @@ Bean<BeanWithStaticBoundField_Broken> bean = createSimpleBean(BeanWithStaticBoundField_Broken.class); Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); - bean.create(); + bean.create(new MockCreationalContext<BeanWithStaticBoundField_Broken>()); } @Test(groups = "injection", expectedExceptions = DefinitionException.class) @@ -88,7 +89,7 @@ Bean<BeanWithFinalBoundField_Broken> bean = createSimpleBean(BeanWithFinalBoundField_Broken.class); Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); - bean.create(); + bean.create(new MockCreationalContext<BeanWithFinalBoundField_Broken>()); } @Test @SpecAssertion(section="4.2")

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1241 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 17:55:08 -0500 (Mon, 26 Jan 2009) New Revision: 1241 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java Log: minor Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 22:53:45 UTC (rev 1240) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 22:55:08 UTC (rev 1241) @@ -95,7 +95,7 @@ protected void injectBoundFields(T instance) { InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider(); - for (FieldInjectionPoint<?> injectableField : getInjectableFields()) + for (FieldInjectionPoint<?> injectableField : injectableFields) { injectionPointProvider.pushInjectionPoint(injectableField); try @@ -304,16 +304,6 @@ } /** - * Gets the injectable fields - * - * @return The set of injectable fields - */ - public Set<FieldInjectionPoint<?>> getInjectableFields() - { - return injectableFields; - } - - /** * Gets the annotated methods * * @return The set of annotated methods

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1240 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 17:53:45 -0500 (Mon, 26 Jan 2009) New Revision: 1240 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/EnterpriseBean.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 Log: minor 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 2009-01-26 22:50:41 UTC (rev 1239) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-26 22:53:45 UTC (rev 1240) @@ -248,9 +248,9 @@ this.primitive = Reflections.isPrimitive(getType()); } - protected boolean injectionPointsAreSerializable() + protected boolean checkInjectionPointsAreSerializable() { - // TODO CACHE THIS!!! + // TODO CACHE THIS and rebuild on addBean // TODO: a bit crude, don't check *all* injectionpoints, only those listed // in the spec for passivation checks for (AnnotatedItem<?, ?> injectionPoint : getInjectionPoints()) 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 2009-01-26 22:50:41 UTC (rev 1239) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 22:53:45 UTC (rev 1240) @@ -340,7 +340,7 @@ @Override public boolean isSerializable() { - return injectionPointsAreSerializable(); + return checkInjectionPointsAreSerializable(); } public InternalEjbDescriptor<T> getEjbDescriptor() 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 2009-01-26 22:50:41 UTC (rev 1239) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-26 22:53:45 UTC (rev 1240) @@ -195,7 +195,7 @@ boolean passivatingScoped = MetaDataCache.instance().getScopeModel(scopeType).isPassivating(); if (passivatingScoped) { - return injectionPointsAreSerializable(); + return checkInjectionPointsAreSerializable(); } return true; } 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 2009-01-26 22:50:41 UTC (rev 1239) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 22:53:45 UTC (rev 1240) @@ -544,7 +544,7 @@ } else { - return injectionPointsAreSerializable(); + return checkInjectionPointsAreSerializable(); } }

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1239 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bootstrap and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 17:50:41 -0500 (Mon, 26 Jan 2009) New Revision: 1239 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java Log: minor Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 22:49:02 UTC (rev 1238) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 22:50:41 UTC (rev 1239) @@ -67,10 +67,10 @@ * @param beans The beans to validate */ @SuppressWarnings("unchecked") - public void validate(List<Bean<?>> beans) + public void validate() { final List<Bean<?>> specializedBeans = new ArrayList<Bean<?>>(); - for (Bean<?> bean : beans) + for (Bean<?> bean : manager.getBeans()) { for (InjectionPoint injectionPoint : bean.getInjectionPoints()) { 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 2009-01-26 22:49:02 UTC (rev 1238) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-26 22:50:41 UTC (rev 1239) @@ -155,7 +155,7 @@ getManager().fireEvent(getManager(), new InitializedLiteral()); log.info("Web Beans initialized. Validating beans."); getManager().getResolver().resolveInjectionPoints(); - new BeanValidator(manager).validate(manager.getBeans()); + new BeanValidator(manager).validate(); getManager().fireEvent(getManager(), new DeployedLiteral()); } }

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1238 - ri/trunk/webbeans-api/src/main/java/javax/inject/manager and 8 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 17:49:02 -0500 (Mon, 26 Jan 2009) New Revision: 1238 Added: ri/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.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/AbstractClassBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.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/bootstrap/BeanDeployer.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.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/introspector/jlr/AnnotatedAnnotationImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java Log: refactor annotated items to allow them to be injection points Added: ri/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -0,0 +1,37 @@ +/* +* 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 javax.context; + +/** + * Allows registration of an incompletely initialized contextual instance with + * the container. The contextual instance is considered incompletely initialized + * until the create() method returns the instance. + * + * @author Pete Muir + * + */ +public interface CreationalContext<T> +{ + + /** + * Push an incomplete instance to the container + * + * @param incompleteInstance + */ + public void push(T incompleteInstance); + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -63,6 +63,6 @@ public abstract boolean isNullable(); - public abstract Set<InjectionPoint> getInjectionPoints(); + public abstract Set<? extends InjectionPoint> getInjectionPoints(); } 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -298,7 +298,7 @@ */ public <T> Set<Bean<T>> resolveByType(AnnotatedItem<T, ?> element, Annotation... bindings) { - for (Annotation annotation : element.getAnnotations()) + for (Annotation annotation : element.getAnnotationsAsSet()) { if (!MetaDataCache.instance().getBindingTypeModel(annotation.annotationType()).isValid()) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -119,7 +119,7 @@ * * @param elements The injection points to add */ - public void addInjectionPoints(Collection<AnnotatedItem<?, ?>> elements) + public void addInjectionPoints(Collection<? extends AnnotatedItem<?, ?>> elements) { injectionPoints.addAll(elements); } 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -33,11 +33,10 @@ import javax.inject.Specializes; import javax.inject.Standard; import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentInstancesStore; -import org.jboss.webbeans.injection.InjectionPointImpl; +import org.jboss.webbeans.injection.AnnotatedInjectionPoint; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotationStore.AnnotationMap; import org.jboss.webbeans.literal.CurrentLiteral; @@ -104,7 +103,7 @@ // The API types protected Set<Type> types; // The injection points - protected Set<AnnotatedItem<?, ?>> annotatedInjectionPoints; + protected Set<AnnotatedInjectionPoint<?, ?>> injectionPoints; // If the type a primitive? private boolean primitive; // The Web Beans manager @@ -119,7 +118,7 @@ { super(manager); this.manager = manager; - annotatedInjectionPoints = new HashSet<AnnotatedItem<?, ?>>(); + injectionPoints = new HashSet<AnnotatedInjectionPoint<?,?>>(); dependentInstancesStore = new DependentInstancesStore(); } @@ -254,7 +253,7 @@ // TODO CACHE THIS!!! // TODO: a bit crude, don't check *all* injectionpoints, only those listed // in the spec for passivation checks - for (AnnotatedItem<?, ?> injectionPoint : getAnnotatedInjectionPoints()) + for (AnnotatedItem<?, ?> injectionPoint : getInjectionPoints()) { Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class); Bean<?> resolvedBean = manager.resolveByType(injectionPoint.getType(), bindings).iterator().next(); @@ -408,26 +407,11 @@ return deploymentType; } - /** - * Gets the injection points of the bean - * - * @return The set of injection points - */ - public Set<AnnotatedItem<?, ?>> getAnnotatedInjectionPoints() + public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints() { - return annotatedInjectionPoints; + return injectionPoints; } - public Set<InjectionPoint> getInjectionPoints() - { - Set<InjectionPoint> injectionsPoints = new HashSet<InjectionPoint>(); - for (AnnotatedItem<?, ?> annotatedInjectionPoint : annotatedInjectionPoints) - { - injectionsPoints.add(InjectionPointImpl.of(annotatedInjectionPoint, this)); - } - return injectionsPoints; - } - /** * Gets the merged stereotypes of the bean * Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -33,6 +33,7 @@ import javax.inject.Production; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.injection.FieldInjectionPoint; import org.jboss.webbeans.injection.InjectionPointProvider; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedField; @@ -57,7 +58,7 @@ // The item representation protected AnnotatedClass<T> annotatedItem; // The injectable fields - private Set<AnnotatedField<?>> injectableFields; + private Set<FieldInjectionPoint<?>> injectableFields; // The initializer methods private Set<AnnotatedMethod<?>> initializerMethods; @@ -94,7 +95,7 @@ protected void injectBoundFields(T instance) { InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider(); - for (AnnotatedField<?> injectableField : getInjectableFields()) + for (FieldInjectionPoint<?> injectableField : getInjectableFields()) { injectionPointProvider.pushInjectionPoint(injectableField); try @@ -122,7 +123,7 @@ */ protected void initInjectionPoints() { - injectableFields = new HashSet<AnnotatedField<?>>(); + injectableFields = new HashSet<FieldInjectionPoint<?>>(); for (AnnotatedField<?> annotatedField : annotatedItem.getMetaAnnotatedFields(BindingType.class)) { if (!annotatedField.isAnnotationPresent(Produces.class)) @@ -135,8 +136,9 @@ { throw new DefinitionException("Don't place binding annotations on final fields " + annotatedField); } - injectableFields.add(annotatedField); - super.annotatedInjectionPoints.add(annotatedField); + FieldInjectionPoint<?> fieldInjectionPoint = FieldInjectionPoint.of(this, annotatedField); + injectableFields.add(fieldInjectionPoint); + super.injectionPoints.add(fieldInjectionPoint); } } } @@ -306,7 +308,7 @@ * * @return The set of injectable fields */ - public Set<AnnotatedField<?>> getInjectableFields() + public Set<FieldInjectionPoint<?>> getInjectableFields() { return injectableFields; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -18,6 +18,8 @@ package org.jboss.webbeans.bean; import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -31,11 +33,11 @@ import javax.inject.IllegalProductException; import javax.inject.Initializer; import javax.inject.Produces; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.injection.InjectionPointImpl; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.util.Beans; @@ -191,21 +193,21 @@ { throw new IllegalProductException("Producers cannot declare passivating scope and return a non-serializable class"); } - InjectionPointImpl injectionPoint = (InjectionPointImpl) manager.getInjectionPointProvider().getCurrentInjectionPoint(); + InjectionPoint injectionPoint = manager.getInjectionPointProvider().getCurrentInjectionPoint(); if (injectionPoint == null) { return; } if (isDependent() && Beans.isPassivatingBean(injectionPoint.getBean())) { - if (injectionPoint.isField()) + if (injectionPoint.getMember() instanceof Field) { if (!Reflections.isTransient(injectionPoint.getMember())) { throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into non-transient fields of passivating beans"); } } - else if (injectionPoint.isMethod()) + else if (injectionPoint.getMember() instanceof Method) { Method method = (Method) injectionPoint.getMember(); if (method.isAnnotationPresent(Initializer.class)) @@ -217,7 +219,7 @@ throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of producer methods declaring passivating scope"); } } - else if (injectionPoint.isConstructor()) + else if (injectionPoint.getMember() instanceof Constructor) { throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of constructors of beans declaring passivating scope"); } 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -27,6 +27,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; +import org.jboss.webbeans.injection.ParameterInjectionPoint; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl; @@ -97,15 +98,8 @@ { for (AnnotatedParameter<?> parameter : method.getParameters()) { - annotatedInjectionPoints.add(parameter); + injectionPoints.add(ParameterInjectionPoint.of(this, parameter)); } - if (disposalMethod != null) - { - for (AnnotatedParameter<?> injectable : disposalMethod.getParameters()) - { - annotatedInjectionPoints.add(injectable); - } - } } /** 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -18,6 +18,7 @@ package org.jboss.webbeans.bean; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -25,17 +26,18 @@ import javax.annotation.PreDestroy; import javax.context.Dependent; import javax.inject.DefinitionException; -import javax.inject.ExecutionException; import javax.inject.Initializer; -import javax.inject.manager.InjectionPoint; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.injection.InjectionPointImpl; +import org.jboss.webbeans.injection.AnnotatedInjectionPoint; +import org.jboss.webbeans.injection.FieldInjectionPoint; import org.jboss.webbeans.injection.InjectionPointProvider; +import org.jboss.webbeans.injection.MethodInjectionPoint; +import org.jboss.webbeans.injection.ParameterInjectionPoint; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedField; @@ -67,6 +69,10 @@ // The pre-destroy method private AnnotatedMethod<?> preDestroy; + private Set<AnnotatedInjectionPoint<?, ?>> ejbInjectionPoints; + private Set<AnnotatedInjectionPoint<?, ?>> persistenceUnitInjectionPoints; + private Set<AnnotatedInjectionPoint<?, ?>> resourceInjectionPoints; + private SimpleBean<?> specializedBean; /** @@ -225,49 +231,74 @@ initializer.invoke(instance, manager); } } - - /** - * Injects EJBs and common fields - */ - protected void injectEjbAndCommonFields(T beanInstance) + + protected void initEjbInjectionPoints() { + this.ejbInjectionPoints = new HashSet<AnnotatedInjectionPoint<?,?>>(); for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getEJBAnnotation())) { - InjectionPoint injectionPoint = InjectionPointImpl.of(field, this); - Object ejbInstance = manager.getEjbResolver().resolveEjb(injectionPoint, manager.getNaming()); - field.inject(beanInstance, ejbInstance); + this.ejbInjectionPoints.add(FieldInjectionPoint.of(this, field)); } - + for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbResolver().getEJBAnnotation())) { - InjectionPoint injectionPoint = InjectionPointImpl.of(method, this); - Object ejbInstance = manager.getEjbResolver().resolveEjb(injectionPoint, manager.getNaming()); - method.invoke(beanInstance, ejbInstance); + this.ejbInjectionPoints.add(MethodInjectionPoint.of(this, method)); } - + } + + protected void initPersistenceUnitInjectionPoints() + { + this.persistenceUnitInjectionPoints = new HashSet<AnnotatedInjectionPoint<?,?>>(); for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getPersistenceContextAnnotation())) { if (field.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED)) { - throw new ExecutionException("Cannot inject an extended persistence context into " + field); + throw new DefinitionException("Cannot inject an extended persistence context into " + field); } - InjectionPoint injectionPoint = InjectionPointImpl.of(field, this); - Object puInstance = manager.getEjbResolver().resolvePersistenceContext(injectionPoint, manager.getNaming()); - field.inject(beanInstance, puInstance); + this.persistenceUnitInjectionPoints.add(FieldInjectionPoint.of(this, field)); } - + for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbResolver().getPersistenceContextAnnotation())) { - InjectionPoint injectionPoint = InjectionPointImpl.of(method, this); + if (method.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED)) + { + throw new DefinitionException("Cannot inject an extended persistence context into " + method); + } + this.persistenceUnitInjectionPoints.add(MethodInjectionPoint.of(this, method)); + } + } + + protected void initResourceInjectionPoints() + { + this.resourceInjectionPoints = new HashSet<AnnotatedInjectionPoint<?,?>>(); + for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getResourceAnnotation())) + { + this.resourceInjectionPoints.add(FieldInjectionPoint.of(this, field)); + } + } + + /** + * Injects EJBs and common fields + */ + protected void injectEjbAndCommonFields(T beanInstance) + { + + for (AnnotatedInjectionPoint<?, ?> injectionPoint : ejbInjectionPoints) + { + Object ejbInstance = manager.getEjbResolver().resolveEjb(injectionPoint, manager.getNaming()); + injectionPoint.inject(beanInstance, ejbInstance); + } + + for (AnnotatedInjectionPoint<?, ?> injectionPoint : persistenceUnitInjectionPoints) + { Object puInstance = manager.getEjbResolver().resolvePersistenceContext(injectionPoint, manager.getNaming()); - method.invoke(beanInstance, puInstance); + injectionPoint.inject(beanInstance, puInstance); } - for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getResourceAnnotation())) + for (AnnotatedInjectionPoint<?, ?> injectionPoint : resourceInjectionPoints) { - InjectionPoint injectionPoint = InjectionPointImpl.of(field, this); Object resourceInstance = manager.getEjbResolver().resolveResource(injectionPoint, manager.getNaming()); - field.inject(beanInstance, resourceInstance); + injectionPoint.inject(beanInstance, resourceInstance); } } @@ -284,6 +315,9 @@ initInjectionPoints(); initPostConstruct(); initPreDestroy(); + initEjbInjectionPoints(); + initPersistenceUnitInjectionPoints(); + initResourceInjectionPoints(); // TODO Interceptors } @@ -296,13 +330,13 @@ super.initInjectionPoints(); for (AnnotatedParameter<?> parameter : constructor.getParameters()) { - annotatedInjectionPoints.add(parameter); + injectionPoints.add(ParameterInjectionPoint.of(this, parameter)); } for (AnnotatedMethod<?> initializer : getInitializerMethods()) { for (AnnotatedParameter<?> parameter : initializer.getParameters()) { - annotatedInjectionPoints.add(parameter); + injectionPoints.add(ParameterInjectionPoint.of(this, parameter)); } } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -109,12 +109,12 @@ beans.add(bean); - manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); + manager.getResolver().addInjectionPoints(bean.getInjectionPoints()); createProducerMethods(bean, annotatedClass); createProducerFields(bean, annotatedClass); createObserverMethods(bean, annotatedClass); - createFacades(bean.getAnnotatedInjectionPoints()); + createFacades(bean.getInjectionPoints()); if (annotatedClass.isAnnotationPresent(Realizes.class)) { @@ -139,8 +139,8 @@ { ProducerMethodBean<?> bean = ProducerMethodBean.of(annotatedMethod, declaringBean, manager); beans.add(bean); - manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); - createFacades(bean.getAnnotatedInjectionPoints()); + manager.getResolver().addInjectionPoints(bean.getInjectionPoints()); + createFacades(bean.getInjectionPoints()); log.info("Web Bean: " + bean); } @@ -210,7 +210,7 @@ beans.add(NewEnterpriseBean.of(annotatedClass, manager)); } - private void createFacades(Set<AnnotatedItem<?, ?>> injectionPoints) + private void createFacades(Set<? extends AnnotatedItem<?, ?>> injectionPoints) { for (AnnotatedItem<?, ?> injectionPoint : injectionPoints) { 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -67,7 +67,7 @@ @Override protected void initInjectionPoints() { - annotatedInjectionPoints = Collections.emptySet(); + injectionPoints = Collections.emptySet(); } @Override Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -0,0 +1,28 @@ +package org.jboss.webbeans.injection; + +import javax.inject.manager.InjectionPoint; +import javax.inject.manager.Manager; + +import org.jboss.webbeans.introspector.AnnotatedItem; + +public interface AnnotatedInjectionPoint<T, S> extends InjectionPoint, AnnotatedItem<T, S> +{ + + /** + * Injects using the value provided by the manager. + * + * @param declaringInstance The instance to inject into + * @param manager The Web Beans manager + */ + public void inject(Object declaringInstance, Manager manager); + + /** + * Injects an instance + * + * + * @param declaringInstance The instance to inject into + * @param value The value to inject + */ + public void inject(Object declaringInstance, Object value); + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -0,0 +1,52 @@ +package org.jboss.webbeans.injection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.Set; + +import javax.inject.manager.Bean; + +import org.jboss.webbeans.introspector.AnnotatedField; +import org.jboss.webbeans.introspector.ForwardingAnnotatedField; + +public class FieldInjectionPoint<T> extends ForwardingAnnotatedField<T> implements AnnotatedInjectionPoint<T, Field> +{ + + private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; + + private final Bean<?> declaringBean; + private final AnnotatedField<T> field; + + public static <T> FieldInjectionPoint<T> of(Bean<?> declaringBean, AnnotatedField<T> field) + { + return new FieldInjectionPoint<T>(declaringBean, field); + } + + protected FieldInjectionPoint(Bean<?> declaringBean, AnnotatedField<T> field) + { + this.declaringBean = declaringBean; + this.field = field; + } + + @Override + protected AnnotatedField<T> delegate() + { + return field; + } + + public Annotation[] getAnnotations() + { + return delegate().getAnnotationStore().getAnnotations().toArray(EMPTY_ANNOTATION_ARRAY); + } + + public Bean<?> getBean() + { + return declaringBean; + } + + public Set<Annotation> getBindings() + { + return delegate().getAnnotationStore().getBindingTypes(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -1,212 +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.injection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Member; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Set; - -import javax.context.Dependent; -import javax.inject.Initializer; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; - -import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.introspector.AnnotatedMember; -import org.jboss.webbeans.introspector.AnnotatedParameter; - -/** - * Represents an injection point - * - * @author David Allen - * @author Nicklas Karlsson - */ -@Standard -@Dependent -public class InjectionPointImpl implements InjectionPoint -{ - // The underlying annotated item - private final AnnotatedItem<?, ?> annotatedItem; - // The containing bean - private final Bean<?> bean; - - /** - * Creates a new injection point from an annotated item and a bean - * - * @param annotatedItem The annotated item - * @param bean The containing bean - */ - protected InjectionPointImpl(AnnotatedItem<?, ?> annotatedItem, Bean<?> bean) - { - this.annotatedItem = annotatedItem; - this.bean = bean; - } - - /** - * Static accessor for construction - * - * @param item The annotated item - * @param bean The containing bean - * @return an InjectionPointImpl instance - */ - public static InjectionPointImpl of(AnnotatedItem<?, ?> item, Bean<?> bean) - { - return new InjectionPointImpl(item, bean); - } - - /** - * Indicates if underlying item is a field - * - * @return True if field, false otherwise - */ - public boolean isField() - { - return getMember() instanceof Field; - } - - /** - * Indicates if underlying item is a method - * - * @return True if method, false otherwise - */ - public boolean isMethod() - { - return getMember() instanceof Method; - } - - /** - * Indicates if underlying item is a constructor - * - * @return True if constructor, false otherwise - */ - public boolean isConstructor() - { - return getMember() instanceof Constructor; - } - - /** - * Indicates if underlying item is an intializer - * - * @return True if intializer, false otherwise - */ - public boolean isInitializer() - { - return isMethod() && isAnnotationPresent(Initializer.class); - } - - /** - * Gets an annotation of a given type from the injection point - * - * @param annotationType The meta-annotation to match - * @return The found annotation - * @see javax.inject.manager.InjectionPoint#getAnnotation(Class) - */ - public <T extends Annotation> T getAnnotation(Class<T> annotationType) - { - return annotatedItem.getAnnotation(annotationType); - } - - /** - * Gets the array of annotations on the injection point - * - * @return The annotations - * @see javax.inject.manager.InjectionPoint#getAnnotations() - */ - public Annotation[] getAnnotations() - { - return annotatedItem.getAnnotations().toArray(new Annotation[0]); - } - - /** - * Gets the containing bean - * - * @return The bean - * @see javax.inject.manager.InjectionPoint#getBean() - */ - public Bean<?> getBean() - { - return this.bean; - } - - /** - * Gets the bindings of the injection point - * - * @return The bindings - * @see javax.inject.manager.InjectionPoint#getBindings() - */ - public Set<Annotation> getBindings() - { - return annotatedItem.getBindingTypes(); - } - - /** - * Gets the member of the injection - * - * @return The underlying member - * @see javax.inject.manager.InjectionPoint#getMember() - */ - public Member getMember() - { - if (annotatedItem instanceof AnnotatedMember) - { - return ((AnnotatedMember<?, ?>) annotatedItem).getMember(); - } - else if (annotatedItem instanceof AnnotatedParameter<?>) - { - return ((AnnotatedParameter<?>) annotatedItem).getDeclaringMember().getMember(); - } - else - { - throw new IllegalArgumentException("Annotated item " + annotatedItem + " is of an unsupported type"); - } - } - - /** - * Gets the type of the injection point - * - * @return The type - * @see javax.inject.manager.InjectionPoint#getType - */ - public Type getType() - { - return annotatedItem.getType(); - } - - /** - * Indicates if an annotation is present on the injection point - * - * @param annotationType The annotation type to match - * @return True if present, false otherwise - * @see javax.inject.manager.InjectionPoint#isAnnotationPresent(Class) - */ - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return annotatedItem.isAnnotationPresent(annotationType); - } - - @Override - public String toString() - { - return annotatedItem.toString(); - } -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -22,7 +22,7 @@ import javax.inject.manager.Bean; import javax.inject.manager.InjectionPoint; -import org.jboss.webbeans.introspector.AnnotatedItem; +import org.jboss.webbeans.introspector.AnnotatedParameter; /** * Provides injection point metadata @@ -65,14 +65,29 @@ * * @param injectionPoint The injection point to push */ - public void pushInjectionPoint(AnnotatedItem<?, ?> injectionPoint) + public void pushInjectionPoint(AnnotatedInjectionPoint<?, ?> injectionPoint) { - injectionPoints.push(InjectionPointImpl.of(injectionPoint, getCurrentBean())); + injectionPoints.push(injectionPoint); if (beans.size() != injectionPoints.size()) { throw new IllegalStateException("Number of beans on stack is inconsistent with number of injection points: " + this); } } + + /** + * Pushes an injection point to the stack + * + * @param injectionPoint The injection point to push + */ + // TODO Not sure if this is right, we should be able to push the current bean in somehow + public void pushInjectionPoint(AnnotatedParameter<?> parameter) + { + injectionPoints.push(ParameterInjectionPoint.of(getCurrentBean(), parameter)); + if (beans.size() != injectionPoints.size()) + { + throw new IllegalStateException("Number of beans on stack is inconsistent with number of injection points: " + this); + } + } /** * Pops an injection point Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -0,0 +1,63 @@ +package org.jboss.webbeans.injection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; + +import org.jboss.webbeans.introspector.AnnotatedMethod; +import org.jboss.webbeans.introspector.ForwardingAnnotatedMethod; + +public class MethodInjectionPoint<T> extends ForwardingAnnotatedMethod<T> implements AnnotatedInjectionPoint<T, Method> +{ + + private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; + + private final Bean<?> declaringBean; + private final AnnotatedMethod<T> method; + + public static <T> MethodInjectionPoint<T> of(Bean<?> declaringBean, AnnotatedMethod<T> method) + { + return new MethodInjectionPoint<T>(declaringBean, method); + } + + protected MethodInjectionPoint(Bean<?> declaringBean, AnnotatedMethod<T> method) + { + this.declaringBean = declaringBean; + this.method = method; + } + + @Override + protected AnnotatedMethod<T> delegate() + { + return method; + } + + public Annotation[] getAnnotations() + { + return delegate().getAnnotationStore().getAnnotations().toArray(EMPTY_ANNOTATION_ARRAY); + } + + public Bean<?> getBean() + { + return declaringBean; + } + + public Set<Annotation> getBindings() + { + return delegate().getBindingTypes(); + } + + public void inject(Object declaringInstance, Manager manager) + { + delegate().invoke(declaringInstance, manager); + } + + public void inject(Object declaringInstance, Object value) + { + delegate().invoke(declaringInstance, value); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -0,0 +1,68 @@ +package org.jboss.webbeans.injection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.util.Set; + +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; + +import org.jboss.webbeans.introspector.AnnotatedParameter; +import org.jboss.webbeans.introspector.ForwardingAnnotatedParameter; + +public class ParameterInjectionPoint<T> extends ForwardingAnnotatedParameter<T> implements AnnotatedInjectionPoint<T, Object> +{ + + private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; + + public static <T> ParameterInjectionPoint<T> of(Bean<?> declaringBean, AnnotatedParameter<T> parameter) + { + return new ParameterInjectionPoint<T>(declaringBean, parameter); + } + + private final Bean<?> declaringBean; + private final AnnotatedParameter<T> parameter; + + private ParameterInjectionPoint(Bean<?> declaringBean, AnnotatedParameter<T> parameter) + { + this.declaringBean = declaringBean; + this.parameter = parameter; + } + + @Override + protected AnnotatedParameter<T> delegate() + { + return parameter; + } + + public Annotation[] getAnnotations() + { + return delegate().getAnnotationStore().getAnnotations().toArray(EMPTY_ANNOTATION_ARRAY); + } + + public Bean<?> getBean() + { + return declaringBean; + } + + public Set<Annotation> getBindings() + { + return delegate().getBindingTypes(); + } + + public Member getMember() + { + return delegate().getDeclaringMember().getMember(); + } + + public void inject(Object declaringInstance, Manager manager) + { + throw new UnsupportedOperationException(); + } + + public void inject(Object declaringInstance, Object value) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -48,7 +48,7 @@ * @return A set of annotations. Returns an empty set if there are no * matches. */ - public <A extends Annotation> Set<A> getAnnotations(); + public <A extends Annotation> Set<A> getAnnotationsAsSet(); /** * Gets all annotations which are annotated with the given meta annotation @@ -102,7 +102,7 @@ * @param annotationType The annotation to match * @return An annotation if found, null if the annotation wasn't present. */ - public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType); + public <A extends Annotation> A getAnnotation(Class<A> annotationType); /** * Indicates if an annotation type specified is present Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -43,7 +43,7 @@ /** * @see org.jboss.webbeans.introspector.AnnotatedItem */ - public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType) + public <A extends Annotation> A getAnnotation(Class<A> annotationType) { return getAnnotationStore().getAnnotation(annotationType); } @@ -51,7 +51,7 @@ /** * @see org.jboss.webbeans.introspector.AnnotatedItem */ - public Set<Annotation> getAnnotations() + public Set<Annotation> getAnnotationsAsSet() { return getAnnotationStore().getAnnotations(); } 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 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -77,7 +77,7 @@ return annotationStore; } - public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType) + public <A extends Annotation> A getAnnotation(Class<A> annotationType) { return getAnnotationStore().getAnnotation(annotationType); } @@ -97,7 +97,7 @@ return getMetaAnnotations(metaAnnotationType).toArray(new Annotation[0]); } - public Set<Annotation> getAnnotations() + public Set<Annotation> getAnnotationsAsSet() { return getAnnotationStore().getAnnotations(); } @@ -127,7 +127,7 @@ if (other instanceof AnnotatedItem) { AnnotatedItem<?, ?> that = (AnnotatedItem<?, ?>) other; - return this.getAnnotations().equals(that.getAnnotations()) && this.getType().equals(that.getType()); + return this.getAnnotationsAsSet().equals(that.getAnnotationsAsSet()) && this.getType().equals(that.getType()); } return false; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -115,7 +115,7 @@ { AnnotatedMethod<?> annotatedMethod = AnnotatedMethodImpl.of(member, this); members.add(annotatedMethod); - for (Annotation annotation : annotatedMethod.getAnnotations()) + for (Annotation annotation : annotatedMethod.getAnnotationsAsSet()) { annotatedMembers.put(annotation.annotationType(), annotatedMethod); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -314,7 +314,7 @@ { this.declaredFields.add(annotatedField); } - for (Annotation annotation : annotatedField.getAnnotations()) + for (Annotation annotation : annotatedField.getAnnotationsAsSet()) { this.annotatedFields.put(annotation.annotationType(), annotatedField); if (c == clazz) @@ -349,7 +349,7 @@ this.constructors.add(annotatedConstructor); this.constructorsByArgumentMap.put(Arrays.asList(constructor.getParameterTypes()), annotatedConstructor); - for (Annotation annotation : annotatedConstructor.getAnnotations()) + for (Annotation annotation : annotatedConstructor.getAnnotationsAsSet()) { if (!annotatedConstructors.containsKey(annotation.annotationType())) { @@ -380,7 +380,7 @@ { this.declaredMethods.add(annotatedMethod); } - for (Annotation annotation : annotatedMethod.getAnnotations()) + for (Annotation annotation : annotatedMethod.getAnnotationsAsSet()) { annotatedMethods.put(annotation.annotationType(), annotatedMethod); if (c == clazz) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -93,7 +93,7 @@ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(constructor.getParameterAnnotations()[i], clazz, this); parameters.add(parameter); - for (Annotation annotation : parameter.getAnnotations()) + for (Annotation annotation : parameter.getAnnotationsAsSet()) { annotatedParameters.put(annotation.annotationType(), parameter); } @@ -104,7 +104,7 @@ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(new Annotation[0], clazz, this); parameters.add(parameter); - for (Annotation annotation : parameter.getAnnotations()) + for (Annotation annotation : parameter.getAnnotationsAsSet()) { annotatedParameters.put(annotation.annotationType(), parameter); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -104,7 +104,7 @@ Class<? extends Object> clazz = method.getParameterTypes()[i]; AnnotatedParameter<Object> parameter = new AnnotatedParameterImpl<Object>(method.getParameterAnnotations()[i], (Class<Object>) clazz, this); this.parameters.add(parameter); - for (Annotation annotation : parameter.getAnnotations()) + for (Annotation annotation : parameter.getAnnotationsAsSet()) { if (MAPPED_PARAMETER_ANNOTATIONS.contains(annotation.annotationType())) { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -19,7 +19,7 @@ public void testDeclaredAnnotations() { AnnotatedClass<Order> annotatedElement = AnnotatedClassImpl.of(Order.class); - assert annotatedElement.getAnnotations().size() == 1; + assert annotatedElement.getAnnotationsAsSet().size() == 1; assert annotatedElement.getAnnotation(Production.class) != null; assert annotatedElement.getType().equals(Order.class); } @@ -42,7 +42,7 @@ assert annotatedElement.getAnnotation(Stereotype.class) == null; assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0; AnnotatedClass<Antelope> classWithNoAnnotations = AnnotatedClassImpl.of(Antelope.class); - assert classWithNoAnnotations.getAnnotations().size() == 0; + assert classWithNoAnnotations.getAnnotationsAsSet().size() == 0; } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -46,8 +46,8 @@ @Test(groups = { "new" }) public void testNewBeanHasSameInjectedFieldsAsWrappedBean() { - Set<AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints(); - Set<AnnotatedItem<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints(); + Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getInjectionPoints(); + Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getInjectionPoints(); assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-26 21:58:50 UTC (rev 1237) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -49,8 +49,8 @@ @Test(groups = { "new" }) public void testNewBeanHasSameInjectedFieldsAsWrappedBean() { - Set<AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getAnnotatedInjectionPoints(); - Set<AnnotatedItem<?, ?>> newBeanInjectionPoints = newSimpleBean.getAnnotatedInjectionPoints(); + Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getInjectionPoints(); + Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newSimpleBean.getInjectionPoints(); assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-26 21:58:50 UTC (rev 1237) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-26 22:49:02 UTC (rev 1238) @@ -232,7 +232,7 @@ } } - @Test(groups = { "injectionPoint" }) + @Test(groups = { "injectionPoint", "broken" }) @SpecAssertion(section = "5.11") public void testStandardDeployment() { @@ -253,7 +253,7 @@ } } - @Test(groups = { "injectionPoint" }) + @Test(groups = { "injectionPoint", "broken" }) @SpecAssertion(section = "5.11") public void testDependentScope() {

15 years, 4 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-01-26 16:58:50 -0500 (Mon, 26 Jan 2009) New Revision: 1237 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java Log: Fixed a few broken producer field tests. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 20:19:11 UTC (rev 1236) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 21:58:50 UTC (rev 1237) @@ -22,8 +22,10 @@ import java.util.List; import java.util.Set; +import javax.context.Dependent; import javax.inject.AmbiguousDependencyException; import javax.inject.DefinitionException; +import javax.inject.IllegalProductException; import javax.inject.InconsistentSpecializationException; import javax.inject.New; import javax.inject.NullableDependencyException; @@ -34,8 +36,10 @@ import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.bean.AbstractBean; +import org.jboss.webbeans.bean.AbstractProducerBean; import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.bean.NewSimpleBean; +import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.ListComparator; import org.jboss.webbeans.util.Proxies; @@ -45,13 +49,13 @@ * Checks a list of beans for DeploymentExceptions and their subclasses * * @author Nicklas Karlsson - * + * */ public class BeanValidator { - + private final ManagerImpl manager; - + public BeanValidator(ManagerImpl manager) { this.manager = manager; @@ -62,6 +66,7 @@ * * @param beans The beans to validate */ + @SuppressWarnings("unchecked") public void validate(List<Bean<?>> beans) { final List<Bean<?>> specializedBeans = new ArrayList<Bean<?>>(); @@ -95,6 +100,17 @@ { throw new NullableDependencyException("The injection point " + injectionPoint + " has nullable dependencies"); } + if (bean instanceof ProducerMethodBean) + { + if (resolvedBean instanceof AbstractProducerBean) + { + AbstractProducerBean producerBean = (AbstractProducerBean) resolvedBean; + if (producerBean.getScopeType().equals(Dependent.class) && !Reflections.isSerializable(producerBean.getType())) + { + throw new IllegalProductException("Cannot inject @Depedent non-serializable type into " + injectionPoint); + } + } + } } else { @@ -116,7 +132,7 @@ } specializedBeans.add(abstractBean.getSpecializedBean()); } - } + } if (Beans.isPassivatingBean(bean) && !bean.isSerializable()) { throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scopes but has non-serializable dependencies"); @@ -129,12 +145,11 @@ } } - + private boolean hasHigherPrecedence(Class<? extends Annotation> deploymentType, Class<? extends Annotation> otherDeploymentType) { Comparator<Class<? extends Annotation>> comparator = new ListComparator<Class<? extends Annotation>>(manager.getEnabledDeploymentTypes()); return comparator.compare(deploymentType, otherDeploymentType) > 0; } - } 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 2009-01-26 20:19:11 UTC (rev 1236) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 21:58:50 UTC (rev 1237) @@ -52,7 +52,7 @@ * * @author Pete Muir * - * @param <T> + * @param <T> The type (class) of the bean */ public class SimpleBean<T> extends AbstractClassBean<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java 2009-01-26 20:19:11 UTC (rev 1236) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java 2009-01-26 21:58:50 UTC (rev 1237) @@ -17,8 +17,8 @@ @Produces @SessionScoped - public Violation create(@Current Violation violation) + public Violation2 create(@Current Violation violation) { - return violation; + return new Violation2(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-01-26 20:19:11 UTC (rev 1236) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-01-26 21:58:50 UTC (rev 1237) @@ -15,10 +15,11 @@ /** * - * @author Nicklas Karlsson + * @author Nicklas Karlsson + * @author David Allen * */ -@SpecVersion("20081206") +@SpecVersion("PRD2") public class PassivatingContextTest extends AbstractTest { @@ -29,7 +30,7 @@ * initialization time. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleWebBeanWithNonSerializableImplementationClassFails() { deployBeans(Hamina_Broken.class); @@ -41,8 +42,8 @@ * serializable, a DefinitionException is thrown by the Web Bean manager at * initialization time. */ - @Test(groups = {"contexts", "passivation" }) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4") public void testSimpleWebBeanWithSerializableImplementationClassOK() { createSimpleBean(Jyvaskyla.class); @@ -55,8 +56,8 @@ * @throws IOException * @throws ClassNotFoundException */ - @Test(groups = { "contexts", "passivation" , "stub" }) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation", "stub" }) + @SpecAssertion(section = "8.4") public void testSimpleWebBeanDeclaringPassivatingScopeIsSerializedWhenContextIsPassivated() throws IOException, ClassNotFoundException { assert false; @@ -81,7 +82,7 @@ */ // TODO requires an EJB instance @Test(groups = { "contexts", "passivation", "broken", "stub" }) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws IOException, ClassNotFoundException { assert false; @@ -94,7 +95,7 @@ * with their owner */ @Test(groups = { "stub", "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentInterceptorsOfStatefulEnterpriseBeanMustBeSerializable() { deployBeans(Kaarina_Broken.class); @@ -107,7 +108,7 @@ * with their owner */ @Test(groups = { "stub", "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentDecoratorsOfStatefulEnterpriseBeanMustBeSerializable() { deployBeans(Porvoo_Broken.class); @@ -120,7 +121,7 @@ * with their owner */ @Test(groups = { "stub", "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentInterceptorsOfWebBeanWithPassivatingScopeMustBeSerializable() { deployBeans(Kotka_Broken.class); @@ -133,7 +134,7 @@ * with their owner */ @Test(groups = { "stub", "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentDecoratorsOfWebBeansWithPassivatingScopeMustBeSerializable() { deployBeans(Raisio_Broken.class); @@ -147,7 +148,7 @@ * @throws IOException */ @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException { deployBeans(Vaasa.class, Helsinki.class); @@ -166,7 +167,7 @@ * at initialization time. */ @Test(groups = { "stub", "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() { deployBeans(Violation.class, Espoo_Broken.class); @@ -183,7 +184,7 @@ * at initialization time. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() { deployBeans(Vantaa_Broken.class, Violation.class); @@ -199,7 +200,7 @@ * at initialization time. */ @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK() { createSimpleBean(Joensuu.class); @@ -215,7 +216,7 @@ * at initialization time. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(Loviisa_Broken.class, Violation.class); @@ -231,7 +232,7 @@ * at initialization time. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(Forssa_Broken.class, Violation.class); @@ -247,10 +248,10 @@ * at initialization time. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails() { - deployBeans(Peraseinajoki.class, Violation.class, Violation2.class); + deployBeans(Peraseinajoki.class, Violation.class, Violation2.class); } /** @@ -265,7 +266,7 @@ * @throws SecurityException */ @Test(groups = { "contexts", "passivation", "integration", "broken" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException { deployBeans(CityProducer2.class, Maarianhamina_Broken.class); @@ -281,7 +282,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer2.class, Nokia_Broken.class); @@ -297,7 +298,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() { createSimpleBean(CityProducer2.class); @@ -313,7 +314,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer2.class, Loviisa_Broken.class); @@ -329,7 +330,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer2.class, Kuopio_Broken.class); @@ -344,14 +345,12 @@ * parameter of a producer method which declares a passivating scope type, an * IllegalProductException is thrown by the Web Bean manager. */ - @Test(groups = { "contexts", "passivation" , "broken"}, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() { - // TODO Not quite sure what this test is doing - //deployBeans(CityProducer3.class, Jamsa_Broken.class); - //manager.getInstanceByType(Jamsa_Broken.class).ping(); - assert false; + deployBeans(CityProducer2.class, Jamsa_Broken.class); + manager.getInstanceByType(Jamsa_Broken.class).ping(); } /** @@ -363,13 +362,13 @@ * IllegalProductException is thrown by the Web Bean manager. * */ - @Test(groups = { "contexts", "passivation", "stub"}, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation", "stub" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws Exception { // TODO This doesn't test injction in a SFSB, but into a Enterprise bean - //deployBeans(CityProducer.class, Pietarsaari_Broken.class); - //manager.getInstanceByType(Pietarsaari_Broken.class); + // deployBeans(CityProducer.class, Pietarsaari_Broken.class); + // manager.getInstanceByType(Pietarsaari_Broken.class); assert false; } @@ -382,7 +381,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer.class, Uusikaupunki_Broken.class); @@ -397,8 +396,8 @@ * parameter of a producer method which declares a passivating scope type, an * IllegalProductException is thrown by the Web Bean manager. */ - @Test(groups = { "contexts", "passivation"}) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() { deployBeans(CityProducer.class, Salo_Broken.class); @@ -414,7 +413,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer.class, Loviisa_Broken.class); @@ -430,7 +429,7 @@ * IllegalProductException is thrown by the Web Bean manager. */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() { deployBeans(CityProducer.class, Mikkeli_Broken.class); @@ -445,13 +444,12 @@ * parameter of a producer method which declares a passivating scope type, an * IllegalProductException is thrown by the Web Bean manager. */ - @Test(groups = { "contexts", "passivation", "broken" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "9.5") + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() { // TODO Not quite sure what this test is doing deployBeans(CityProducer.class, Jamsa_Broken.class); manager.getInstanceByType(Jamsa_Broken.class).ping(); - assert false; } }

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1236 - doc/trunk/reference/de-DE.

by webbeans-commits＠lists.jboss.org

Author: jdimanos Date: 2009-01-26 15:19:11 -0500 (Mon, 26 Jan 2009) New Revision: 1236 Modified: doc/trunk/reference/de-DE/intro.po Log: update Modified: doc/trunk/reference/de-DE/intro.po =================================================================== --- doc/trunk/reference/de-DE/intro.po 2009-01-26 15:07:53 UTC (rev 1235) +++ doc/trunk/reference/de-DE/intro.po 2009-01-26 20:19:11 UTC (rev 1236) @@ -7,7 +7,7 @@ "Project-Id-Version: intro\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-10 14:18+0000\n" -"PO-Revision-Date: 2009-01-19 09:14+1100\n" +"PO-Revision-Date: 2009-01-27 07:18+1100\n" "Last-Translator: \n" "Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" @@ -303,6 +303,11 @@ "different states. The client-visible state depends upon which instance of " "the Web Bean the client has a reference to." msgstr "" +"Erinnern wir uns. Was genau bedeutet es, \"kontextuell\" zu sein? Da " +"Web Beans \"stateful\" sein können, ist es relevant <emphasis>welche</emphasis> Bean-Instanz ich besitze. Anders als ein Komponentenmodell, das \"stateless\" ist (etwas \"stateless\" " +"Session Beans) oder ein Singleton Komponentenmodell (wie Servlets oder " +"Singleton Beans), sehen verschiedene Clients eines Web Beans das Web Bean in " +"unterschiedlichen Stati. Der Client-sichtbare Status ist abhängig davon, auf welche Instanz des Web Beans der Client verweist (eine Referenz besitzt)." #. Tag: para #: intro.xml:98 @@ -337,6 +342,10 @@ "example, if the Web Bean is session scoped) or even all other threads (if it " "is application scoped)." msgstr "" +"Für einen bestimmten Thread in einer Web Beans Anwendung kann ein " +"<emphasis>aktiver Kontext</emphasis> mit dem Geltungsbereich des Web " +"Beans assoziiert sein. Dieser Kontext kann eindeutig für den Thread sein (etwa wenn für die Web Bean " +"Anfrage ein Geltungsbereich gilt) oder aber kann mit anderen Threads (etwa wenn für die Web Bean ein Session-Geltungsbereich gilt) oder gar allen Threads (falls ein Anwendungs-Geltungsbereich gilt) geteilt werden." #. Tag: para #: intro.xml:119 @@ -380,7 +389,7 @@ "the other Web Bean implementation. In fact, Web Beans defines a " "sophisticated facility for overriding Web Bean implementations at deployment " "time, as we will see in <xref linkend=\"deploymenttypes\"/>." -msgstr "" +msgstr "Wir können ein Web Bean durch ein anderes Web Bean ersetzen, das dasselbe API und einen anderen Lebenszyklus (einen anderen Geltungsbereich) besitzt, ohne dass die übrige Web Bean Implementierung hiervon betroffen ist. Genau genommen definieren Web Beans eine raffinierte Einrichtung zur Außerkraftsetzung von Web Bean Implementierungen zum Zeitpunkt des Deployment wie wir in <xref linkend=\"deploymenttypes\"/> noch sehen werden." #. Tag: para #: intro.xml:145 @@ -395,7 +404,7 @@ #: intro.xml:149 #, no-c-format msgid "Enough hand-waving. More formally, according to the spec:" -msgstr "" +msgstr "Formeller gilt, gemäß der Spezifikation:" #. Tag: para #: intro.xml:153 @@ -598,6 +607,8 @@ "In a testing environment, we might want to replace the " "<literal>SentenceTranslator</literal> Web Bean with a \"mock object\":" msgstr "" +"In einer Testumgebung können wir das " +"<literal>SentenceTranslator</literal> Web Bean durch ein \"mock object\" ersetzen:" #. Tag: programlisting #: intro.xml:233 @@ -824,6 +835,8 @@ "We'll discuss Web Beans interceptors and decorators in <xref linkend=" "\"interceptors\"/> and <xref linkend=\"decorators\"/>." msgstr "" +"Wir gehen in <xref linkend=" +"\"interceptors\"/> and <xref linkend=\"decorators\"/> näher auf Web Beans Interzeptoren und Dekoratoren ein." #. Tag: title #: intro.xml:321

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1235 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 10:07:53 -0500 (Mon, 26 Jan 2009) New Revision: 1235 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java Log: minor 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 2009-01-26 15:05:01 UTC (rev 1234) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 15:07:53 UTC (rev 1235) @@ -27,10 +27,10 @@ import javax.context.ApplicationScoped; import javax.context.Dependent; import javax.decorator.Decorator; +import javax.event.Observes; import javax.inject.CreationException; import javax.inject.DefinitionException; import javax.interceptor.Interceptor; -import javax.webbeans.Observes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance;

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1234 - in tck/trunk: impl/src/main/java/org/jboss/webbeans/tck and 31 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 10:05:01 -0500 (Mon, 26 Jan 2009) New Revision: 1234 Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java Log: WBRI-117, update to packaging to PRD2 Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,7 +3,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; /** * Provides Bean related operations. Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; /** * Container related operations Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,8 @@ package org.jboss.webbeans.tck.api; -import javax.webbeans.manager.Context; +import javax.context.Context; + /** * Context related operations * Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; /** * This interface provides operations relating to a Web Beans Manager. Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,8 @@ package org.jboss.webbeans.tck.api; -import javax.webbeans.manager.Context; +import javax.context.Context; + public class TCKConfiguration { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -15,10 +15,10 @@ import java.util.Collections; import java.util.List; -import javax.webbeans.Production; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; +import javax.inject.Production; +import javax.inject.Standard; +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.impl.literals; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; /** * Annotation literal for @Current Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.impl.literals; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.New; +import javax.inject.AnnotationLiteral; +import javax.inject.New; public class NewLiteral extends AnnotationLiteral<New> implements New { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.impl.util; -import javax.webbeans.ExecutionException; +import javax.inject.ExecutionException; /** * Exception thrown when errors occur while loading resource Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Dependent; -import javax.webbeans.InterceptorBindingType; +import javax.context.Dependent; +import javax.interceptor.InterceptorBindingType; @InterceptorBindingType @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Dependent; -import javax.webbeans.Produces; +import javax.context.Dependent; +import javax.inject.Produces; class CityProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Dependent; -import javax.webbeans.Produces; +import javax.context.Dependent; +import javax.inject.Produces; class CityProducer2 { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Current; -import javax.webbeans.Dependent; -import javax.webbeans.Produces; +import javax.context.Dependent; +import javax.inject.Current; +import javax.inject.Produces; class CityProducer3 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Forssa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Hamina_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.Dependent; import javax.ejb.Stateful; -import javax.webbeans.Dependent; @Dependent @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Produces; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; @SessionScoped class Jamsa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Kotka_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Kuopio_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Loviisa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Mikkeli_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Nokia_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Current; -import javax.webbeans.Produces; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; class Peraseinajoki extends City { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,10 +2,10 @@ import java.io.Serializable; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Raisio_Broken implements CityInterface, Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Salo_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Uusikaupunki_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Vantaa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.integration.context.passivating; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Violation2 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -19,9 +19,9 @@ import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Observer; -import javax.webbeans.manager.Bean; +import javax.event.Observer; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.integration.event; +import javax.annotation.Named; import javax.ejb.Stateful; -import javax.webbeans.Named; -import javax.webbeans.Observes; +import javax.event.Observes; @Stateful @Tame Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.event; import javax.ejb.Stateless; -import javax.webbeans.Observes; +import javax.event.Observes; @Stateless class TibetanTerrier implements Terrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,10 +4,10 @@ import java.lang.annotation.Annotation; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Context; -import javax.webbeans.manager.Contextual; +import javax.context.Context; +import javax.context.ContextNotActiveException; +import javax.context.Contextual; +import javax.context.RequestScoped; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,9 +4,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.webbeans.ScopeType; -import javax.webbeans.manager.Context; -import javax.webbeans.manager.Contextual; +import javax.context.Context; +import javax.context.Contextual; +import javax.context.ScopeType; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,10 +6,10 @@ import java.lang.reflect.Method; import java.util.Set; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.Dependent; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Context; +import javax.context.Context; +import javax.context.ContextNotActiveException; +import javax.context.Dependent; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.context.dependent; -import javax.webbeans.Dependent; -import javax.webbeans.Named; +import javax.annotation.Named; +import javax.context.Dependent; @Dependent @Named class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.context.dependent; -import javax.webbeans.Current; +import javax.inject.Current; class FoxRun { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.context.dependent; -import javax.webbeans.Produces; +import javax.inject.Produces; @AnotherDeploymentType public class OtherSpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.context.dependent; -import javax.webbeans.Disposes; -import javax.webbeans.Produces; +import javax.inject.Disposes; +import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Dependent; -import javax.webbeans.InterceptorBindingType; +import javax.context.Dependent; +import javax.interceptor.InterceptorBindingType; @InterceptorBindingType @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.Dependent; -import javax.webbeans.Produces; +import javax.context.Dependent; +import javax.inject.Produces; class CityProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.Dependent; -import javax.webbeans.Produces; +import javax.context.Dependent; +import javax.inject.Produces; class CityProducer2 { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Forssa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Hamina_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.context.passivating; +import javax.context.Dependent; import javax.ejb.Stateful; -import javax.webbeans.Dependent; @Dependent @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Produces; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; @SessionScoped class Jamsa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Kotka_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Kuopio_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Loviisa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.Initializer; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; @SessionScoped class Mikkeli_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Nokia_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,40 +3,14 @@ import java.io.IOException; import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.IllegalProductException; -import javax.webbeans.UnserializableDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.IllegalProductException; +import javax.inject.UnserializableDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.unit.context.passivating.CityProducer; -import org.jboss.webbeans.tck.unit.context.passivating.CityProducer2; -import org.jboss.webbeans.tck.unit.context.passivating.Espoo_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Forssa_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Hamina_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Helsinki; -import org.jboss.webbeans.tck.unit.context.passivating.Hyvinkaa; -import org.jboss.webbeans.tck.unit.context.passivating.Jamsa_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Joensuu; -import org.jboss.webbeans.tck.unit.context.passivating.Jyvaskyla; -import org.jboss.webbeans.tck.unit.context.passivating.Kaarina_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Kotka_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Kuopio_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Loviisa_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Maarianhamina_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Mikkeli_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Nokia_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Peraseinajoki; -import org.jboss.webbeans.tck.unit.context.passivating.Porvoo_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Raisio_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Salo_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Uusikaupunki_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Vaasa; -import org.jboss.webbeans.tck.unit.context.passivating.Vantaa_Broken; -import org.jboss.webbeans.tck.unit.context.passivating.Violation; -import org.jboss.webbeans.tck.unit.context.passivating.Violation2; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.Current; -import javax.webbeans.Produces; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; class Peraseinajoki extends City { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.context.passivating; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; @SessionScoped class Raisio_Broken implements CityInterface, Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Salo_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Uusikaupunki_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Current; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; +import javax.inject.Current; @SessionScoped class Vantaa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.context.passivating; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Violation2 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,9 +2,9 @@ import java.lang.reflect.Method; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; +import javax.context.RequestScoped; +import javax.inject.Production; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.bean; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.bean; -import javax.webbeans.Produces; +import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.util.List; import java.util.Set; -import javax.webbeans.Current; -import javax.webbeans.Production; -import javax.webbeans.manager.Bean; +import javax.inject.Current; +import javax.inject.Production; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.binding; -import javax.webbeans.Production; +import javax.inject.Production; @Production Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.binding; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.binding; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Order Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.binding; -import javax.webbeans.Produces; +import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.binding; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import javax.webbeans.Production; +import javax.inject.Production; @Production @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,7 +4,7 @@ import java.util.Arrays; -import javax.webbeans.DeploymentException; +import javax.inject.DeploymentException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; -import javax.webbeans.Standard; +import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; -import javax.webbeans.Production; -import javax.webbeans.Standard; +import javax.inject.Production; +import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,11 +4,11 @@ import java.lang.reflect.Method; import java.util.List; -import javax.webbeans.DefinitionException; -import javax.webbeans.DeploymentException; -import javax.webbeans.Production; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.DeploymentException; +import javax.inject.Production; +import javax.inject.UnsatisfiedDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import javax.webbeans.Standard; +import javax.inject.Standard; @Standard class Gazelle_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import javax.webbeans.Production; +import javax.inject.Production; @HornedMammalStereotype @Production Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import javax.webbeans.Named; -import javax.webbeans.Produces; +import javax.annotation.Named; +import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.name; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.name; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @RiverFishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.name; -import javax.webbeans.Named; +import javax.annotation.Named; @MammalStereotype @Named("aMoose") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,8 +3,8 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.DefinitionException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.name; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.name; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ScopeType; +import javax.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ScopeType; +import javax.context.ScopeType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; +import javax.context.ConversationScoped; +import javax.context.RequestScoped; @RequestScoped @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @RequestScoped class Dog Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @RiverFishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ScopeType; +import javax.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Order Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.Dependent; +import javax.context.Dependent; @AnimalStereotype @FishStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScoped class Retriever extends Dog Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; +import javax.context.ApplicationScoped; +import javax.context.Dependent; +import javax.context.RequestScoped; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.scope; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,8 +9,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(supportedScopes=ApplicationScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype(requiredTypes=Mammal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.stereotype; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @RequestScopedAnimalStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.stereotype; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @HornedMammalStereotype @RequestScopedAnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.stereotype; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScopedHornedMammalStereotype @RequestScopedAnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,12 +3,12 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; +import javax.context.ApplicationScoped; +import javax.context.Dependent; +import javax.context.RequestScoped; +import javax.inject.DefinitionException; +import javax.inject.Production; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Production; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.inject.Production; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; +import javax.context.RequestScoped; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.type; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.definition.type; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Initializer; +import javax.event.Event; +import javax.event.Fires; +import javax.inject.Initializer; import org.jboss.webbeans.tck.unit.event.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.event; import javax.ejb.Stateless; -import javax.webbeans.Initializer; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.Initializer; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; @Stateless class AustralianTerrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,10 +2,10 @@ import java.util.Set; -import javax.webbeans.Current; -import javax.webbeans.Observer; -import javax.webbeans.Observes; -import javax.webbeans.manager.Manager; +import javax.event.Observer; +import javax.event.Observes; +import javax.inject.Current; +import javax.inject.manager.Manager; /** * Simple bean with observer method and another injectable parameter. Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Current; -import javax.webbeans.Named; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.inject.Current; import org.jboss.webbeans.tck.unit.event.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; +import javax.event.Event; +import javax.event.Fires; class BlackRumpedWaxbill_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Observer; +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; class BlueFacedParrotFinch { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.event; import javax.ejb.Stateless; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.Produces; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; @Stateless class BorderTerrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,7 +3,7 @@ import java.util.List; import javax.ejb.Stateless; -import javax.webbeans.Observes; +import javax.event.Observes; @Stateless class BostonTerrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; +import javax.context.ConversationScoped; import javax.ejb.Stateless; -import javax.webbeans.ConversationScoped; @Stateless @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; import javax.ejb.Stateless; -import javax.webbeans.Observes; +import javax.event.Observes; @Stateless class BullTerrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,7 +2,7 @@ import java.util.ArrayList; -import javax.webbeans.Fires; +import javax.event.Fires; class CommonWaxbill_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -5,15 +5,15 @@ import java.util.List; import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.Event; -import javax.webbeans.Observer; -import javax.webbeans.ObserverException; -import javax.webbeans.Standard; -import javax.webbeans.TypeLiteral; -import javax.webbeans.manager.Bean; +import javax.context.Dependent; +import javax.event.Event; +import javax.event.Observer; +import javax.event.ObserverException; +import javax.inject.DefinitionException; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.Standard; +import javax.inject.TypeLiteral; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType class FarmShop extends Shop Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Observes; +import javax.event.Observes; class Farmer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Named; -import javax.webbeans.Observes; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.event.Observes; import org.jboss.webbeans.tck.unit.event.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Fires; +import javax.event.Fires; +import javax.inject.AnnotationLiteral; public class FiresBinding extends AnnotationLiteral<Fires> implements Fires { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.event; import javax.ejb.Stateless; -import javax.webbeans.Disposes; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.Disposes; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; @Stateless class FoxTerrier Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; +import javax.event.Event; +import javax.event.Fires; class GoldbreastWaxbill_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.util.ArrayList; -import javax.webbeans.Event; -import javax.webbeans.Fires; +import javax.event.Event; +import javax.event.Fires; class JavaSparrow_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Initializer; +import javax.event.Event; +import javax.event.Fires; +import javax.inject.Initializer; import org.jboss.webbeans.tck.unit.event.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Observer; +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; class OwlFinch_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Named; -import javax.webbeans.Observes; +import javax.annotation.Named; +import javax.event.Observes; @Named("Teddy") class Pomeranian Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.IfExists; -import javax.webbeans.Observes; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.event.IfExists; +import javax.event.Observes; /** * Simple web bean that conditionally listens to events. Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,7 +4,7 @@ import java.lang.annotation.Retention; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @BindingType @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class RoleBinding extends AnnotationLiteral<Role> implements Role Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Observes; +import javax.event.Observes; class Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.event.Event; +import javax.event.Fires; +import javax.inject.Produces; @RequestScoped @Named("StarFinch") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Observer; +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; class SweeWaxbill_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Named; -import javax.webbeans.Observes; +import javax.annotation.Named; +import javax.event.Observes; @Tame @Named("Teddy") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.event; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; class YorkshireTerrier_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.Initializer; -import javax.webbeans.New; +import javax.inject.Initializer; +import javax.inject.New; class AnnotatedConstructorParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.New; +import javax.inject.New; class AnnotatedField Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.Initializer; -import javax.webbeans.New; +import javax.inject.Initializer; +import javax.inject.New; class AnnotatedInitializerParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.New; -import javax.webbeans.Produces; +import javax.inject.New; +import javax.inject.Produces; class AnnotatedProducerParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Stateless; -import javax.webbeans.RequestScoped; @Stateless @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.ConversationScoped; import javax.ejb.Stateless; -import javax.webbeans.ConversationScoped; @Stateless @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.SessionScoped; import javax.ejb.Stateless; -import javax.webbeans.SessionScoped; @Stateless @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.ApplicationScoped; import javax.ejb.Stateless; -import javax.webbeans.ApplicationScoped; @Stateless @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.DefinitionException; +import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,7 @@ import java.util.Set; -import javax.webbeans.UnremovedException; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; @@ -75,17 +74,6 @@ } /** - * If the enterprise Web Bean has no Web Bean remove method, the Web Bean - * manager throws an UnremovedException. - */ - @Test(groups = { "enterpriseBeans", "lifecycle", "removeMethod", "stub" }, expectedExceptions = UnremovedException.class) - @SpecAssertion(section = "6.4") - public void testNoRemoveMethodFails() - { - assert false; - } - - /** * If the underlying EJB was already destroyed by direct invocation of a * remove method by the application, the Web Bean manager ignores the * instance, and is not required to call any remove method Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Disposes; -import javax.webbeans.RequestScoped; +import javax.inject.Disposes; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import javax.ejb.Stateless; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @Stateless Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Singleton; -import javax.webbeans.RequestScoped; @Singleton @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Named; @Stateful @Tame Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.ConversationScoped; +import javax.context.ConversationScoped; //@Singleton Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; //@Singleton @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Observes; -import javax.webbeans.RequestScoped; +import javax.event.Observes; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.Dependent; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Dependent; @Stateful @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.Dependent; import javax.ejb.Singleton; -import javax.webbeans.Dependent; @Singleton @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.ApplicationScoped; import javax.ejb.Remove; -import javax.webbeans.ApplicationScoped; //@Singleton @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import javax.ejb.MessageDriven; -import javax.webbeans.Production; +import javax.inject.Production; @Production @MessageDriven Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; -import javax.webbeans.Current; -import javax.webbeans.New; +import javax.inject.Current; +import javax.inject.New; class NewAndOtherBindingType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,13 +3,13 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.New; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; +import javax.context.Dependent; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.DefinitionException; +import javax.inject.New; +import javax.inject.Standard; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Production; +import javax.inject.Production; @Production @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.decorator.Decorator; import javax.ejb.Stateless; -import javax.webbeans.Decorator; @Stateless @Decorator Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.annotation.Named; +import javax.context.ApplicationScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; @Stateful @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import javax.ejb.Stateless; -import javax.webbeans.Interceptor; +import javax.interceptor.Interceptor; @Stateless @Interceptor Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Initializer; -import javax.webbeans.RequestScoped; +import javax.inject.Initializer; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.inject.Produces; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.context.Dependent; import javax.ejb.Stateful; -import javax.webbeans.Dependent; @Stateful @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.annotation.Named; +import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Named; -import javax.webbeans.SessionScoped; @SessionScoped @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Disposes; -import javax.webbeans.Initializer; +import javax.inject.Disposes; +import javax.inject.Initializer; class Capercaillie { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Chicken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Initializer; +import javax.inject.Initializer; class ChickenHutch { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Production; +import javax.inject.Production; @Production class DangerCall Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Initializer; +import javax.inject.Initializer; class Dottrel { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Initializer; -import javax.webbeans.Observes; +import javax.event.Observes; +import javax.inject.Initializer; class Grouse { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.DefinitionException; -import javax.webbeans.NonexistentMethodException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; @@ -97,7 +96,7 @@ assert false; } - @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=NonexistentMethodException.class) @SpecAssertion(section="3.8.2") + @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.2") public void testInitializerMethodDeclaredInXmlDoesNotExist() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Initializer; -import javax.webbeans.Produces; +import javax.inject.Initializer; +import javax.inject.Produces; class Pheasant { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.initializer; -import javax.webbeans.Initializer; +import javax.inject.Initializer; class Shrike { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.jms; -import javax.webbeans.DefinitionException; +import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Current; +import javax.inject.Current; /** * This simple bean contains an injection point to receive the value of a Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Named; -import javax.webbeans.Produces; +import javax.annotation.Named; +import javax.inject.Produces; public class BlackWidowProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; class Chicken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Current; +import javax.inject.Current; public class FunnelWeaverSpiderConsumer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; public class FunnelWeaverSpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -19,7 +19,7 @@ import java.io.Serializable; -import javax.webbeans.Current; +import javax.inject.Current; /** * Simple bean that has an injection point for a spider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,8 +17,8 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Named; -import javax.webbeans.Produces; +import javax.annotation.Named; +import javax.inject.Produces; /** * Contains producer for Spider which always is a null value and Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,9 +17,9 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.inject.Produces; /** * Bean with a producer field that always returns null and is not Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Produces; +import javax.inject.Production; @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,11 +6,11 @@ import java.util.List; import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; +import javax.context.RequestScoped; +import javax.inject.DefinitionException; +import javax.inject.Production; +import javax.inject.Standard; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -5,9 +5,9 @@ import java.util.Collections; import java.util.List; -import javax.webbeans.IllegalProductException; -import javax.webbeans.Production; -import javax.webbeans.Standard; +import javax.inject.IllegalProductException; +import javax.inject.Production; +import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,8 +17,8 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; /** * This bean contains a producer field and specializes another bean Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; public class SpiderAsAnimalProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; public class SpiderProducerWildCardType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -25,10 +25,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Named; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; +import javax.inject.Production; /** * Test stereotype used to change the scope type and deployment type Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; public class StaticTarantulaProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Produces; +import javax.inject.Production; public class TameTarantulaProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Current; +import javax.inject.Current; /** * This bean contains an injection point for a Tarantula that must be provided Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; -import javax.webbeans.Produces; +import javax.inject.Produces; @AnotherDeploymentType public class TarantulaProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; import javax.ejb.Local; -import javax.webbeans.Produces; +import javax.inject.Produces; @Local public interface VibratingSpider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; import javax.ejb.Stateless; -import javax.webbeans.Produces; +import javax.inject.Produces; @Stateless public class VibratingSpiderImpl_Broken implements VibratingSpider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Production; +import javax.inject.Produces; +import javax.inject.Production; @Production class BeanWithStaticProducerMethod Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import javax.webbeans.Produces; +import javax.inject.Produces; class Chicken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,11 +2,11 @@ import java.lang.reflect.Method; -import javax.webbeans.Current; -import javax.webbeans.DefinitionException; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; +import javax.context.RequestScoped; +import javax.inject.Current; +import javax.inject.DefinitionException; +import javax.inject.Production; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.webbeans.IllegalProductException; -import javax.webbeans.manager.Bean; +import javax.inject.IllegalProductException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,9 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.inject.Produces; +import javax.inject.Production; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,10 +1,10 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import javax.webbeans.Disposes; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.event.Observes; +import javax.inject.Disposes; +import javax.inject.Produces; +import javax.inject.Production; @Production class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.New; +import javax.inject.Initializer; +import javax.inject.New; class AnnotatedConstructorParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.New; +import javax.inject.New; class AnnotatedField Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.New; +import javax.inject.Initializer; +import javax.inject.New; class AnnotatedInitializerParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.New; -import javax.webbeans.Produces; +import javax.inject.New; +import javax.inject.Produces; class AnnotatedProducerParameter Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Production; +import javax.inject.Production; @Production abstract class Cow_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Donkey Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.Produces; -import javax.webbeans.Production; +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; @Production Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -4,7 +4,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.webbeans.Current; +import javax.inject.Current; class Farm { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; +import javax.inject.Initializer; class FishPond { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Named; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @RequestScopedAnimalStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.Production; +import javax.inject.Initializer; +import javax.inject.Production; @Production class Goose_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @RequestScoped class Leopard_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Current; -import javax.webbeans.New; +import javax.inject.Current; +import javax.inject.New; class NewAndOtherBindingType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,13 +3,13 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.New; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; +import javax.context.Dependent; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.DefinitionException; +import javax.inject.New; +import javax.inject.Standard; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Order Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Production; +import javax.inject.Production; class OuterBean_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.Produces; -import javax.webbeans.Production; +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; @Production class Sheep Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,9 +3,8 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.DefinitionException; -import javax.webbeans.NonexistentConstructorException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; @@ -226,7 +225,7 @@ assert false; } - @Test(expectedExceptions=NonexistentConstructorException.class, groups={"stub", "webbeansxml"}) @SpecAssertion(section="3.2.5.2") + @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) @SpecAssertion(section="3.2.5.2") public void testConstructorDeclaredInXmlDoesNotExist() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class SynchronousAnnotationLiteral extends AnnotationLiteral<Synchronous> implements Synchronous { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Tiger Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Current; -import javax.webbeans.Production; +import javax.inject.Current; +import javax.inject.Production; @Production class TunaFarm Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.implementation.simple; -import javax.webbeans.Initializer; -import javax.webbeans.Produces; -import javax.webbeans.Production; +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; @Production class Turkey Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Named; -import javax.webbeans.SessionScoped; +import javax.annotation.Named; +import javax.context.SessionScoped; @SessionScoped @Named("Fred") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Produces; abstract class AbstractCow { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Observes; +import javax.event.Observes; abstract class AbstractFarmHouse { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Produces; abstract class AbstractHorse { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Produces; +import javax.inject.Produces; class AbstractKennel { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Produces; -import javax.webbeans.RequestScoped; +import javax.inject.Produces; abstract class AbstractStable { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Realizes @AnotherDeploymentType class Cow extends AbstractCow Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Smelly @Realizes class FarmHouse extends AbstractFarmHouse Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @AnotherDeploymentType @Realizes class Horse extends AbstractHorse Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Realizes class LabradorKennel extends AbstractKennel Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.AnnotationLiteral; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Realizes class Stable extends AbstractStable Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Realizes @Tame class TameCow extends AbstractCow Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.realization; -import javax.webbeans.Realizes; +import javax.inject.Realizes; @Realizes @Tame class TameHorse extends AbstractHorse Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Produces; +import javax.inject.Produces; @Stateful class Building implements BuildingInterface Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.DefinitionException; -import javax.webbeans.InconsistentSpecializationException; +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; -import javax.webbeans.Named; +import javax.annotation.Named; @Named("plough") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; +import javax.annotation.Named; import javax.ejb.Stateful; -import javax.webbeans.Named; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; +import javax.annotation.Named; import javax.ejb.Stateful; -import javax.webbeans.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @Lazy Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise; +import javax.annotation.Named; import javax.ejb.Stateful; -import javax.webbeans.Named; @Named("backyard") @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class Bookshop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class ClothesShop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class FurnitureShop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.annotation.Named; +import javax.inject.Produces; +import javax.inject.Specializes; class HighSchool_Broken extends School { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class JewelryShop extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class PictureShop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.DefinitionException; -import javax.webbeans.InconsistentSpecializationException; +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Named; -import javax.webbeans.Produces; +import javax.annotation.Named; +import javax.inject.Produces; class School { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Produces; -import javax.webbeans.Specializes; +import javax.inject.Produces; +import javax.inject.Specializes; class ShoeShop_Broken extends MallShop { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method; -import javax.webbeans.Named; -import javax.webbeans.Produces; +import javax.annotation.Named; +import javax.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Produces; +import javax.inject.Produces; class Building { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; +import javax.annotation.Named; import javax.ejb.Stateful; -import javax.webbeans.Named; @Named("plough") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Named; -import javax.webbeans.Specializes; +import javax.annotation.Named; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Named; +import javax.annotation.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @Lazy Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes class OrganicFarmer_Broken extends Farmer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType class SheepFarmer_Broken extends Farmer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.DefinitionException; -import javax.webbeans.InconsistentSpecializationException; +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Specializes; +import javax.inject.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.inheritance.specialization.simple; -import javax.webbeans.Named; +import javax.annotation.Named; @Named("backyard") class Yard Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.AmbiguousDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Named; +import javax.annotation.Named; @AnotherDeploymentType @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,8 +3,8 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.AmbiguousDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.byname; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -6,9 +6,9 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.DefinitionException; -import javax.webbeans.UnproxyableDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.UnproxyableDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.clientProxy; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.clientProxy; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.clientProxy; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.clientProxy; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; +import javax.inject.Current; class BeanWithFinalBoundField_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; +import javax.inject.Current; class BeanWithStaticBoundField_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Produces; +import javax.inject.Produces; class FarmHouseProducer_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; +import javax.inject.Current; class FarmHouse_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Dependent; +import javax.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; +import javax.inject.Current; class FoxRun { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; +import javax.inject.Current; public class HenHouse { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -5,11 +5,10 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.DefinitionException; -import javax.webbeans.NonexistentFieldException; -import javax.webbeans.NullableDependencyException; -import javax.webbeans.manager.Bean; +import javax.context.ContextNotActiveException; +import javax.inject.DefinitionException; +import javax.inject.NullableDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; @@ -130,7 +129,7 @@ assert false; } - @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = NonexistentFieldException.class) + @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.7.2") public void testNonexistentFieldDefinedInXml() { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Initializer; +import javax.inject.Initializer; class SpiderNest { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Produces; +import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.injection; -import javax.webbeans.Current; -import javax.webbeans.Production; +import javax.inject.Current; +import javax.inject.Production; @Production class TunaFarm Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.injectionpoint; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.tck.unit.lookup.injectionpoint; -import javax.webbeans.Current; -import javax.webbeans.InjectionPoint; +import javax.inject.Current; +import javax.inject.manager.InjectionPoint; /** * Test bean with injection point on the constructor of the bean Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.tck.unit.lookup.injectionpoint; -import javax.webbeans.Current; -import javax.webbeans.Initializer; +import javax.inject.Current; +import javax.inject.Initializer; /** * Test bean to inject a bean using injection point metadata into a constructor Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,8 +17,8 @@ package org.jboss.webbeans.tck.unit.lookup.injectionpoint; -import javax.webbeans.Current; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Current; /** * Test bean to inject another bean which uses injection point metadata in a Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -24,11 +24,11 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.Current; -import javax.webbeans.Dependent; -import javax.webbeans.InjectionPoint; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; +import javax.context.Dependent; +import javax.inject.Current; +import javax.inject.Standard; +import javax.inject.manager.Bean; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -17,8 +17,8 @@ package org.jboss.webbeans.tck.unit.lookup.injectionpoint; -import javax.webbeans.Current; -import javax.webbeans.Initializer; +import javax.inject.Current; +import javax.inject.Initializer; /** * Test bean to inject a bean using injection point metadata into a constructor Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.manager; -import javax.webbeans.Current; -import javax.webbeans.manager.Manager; +import javax.inject.Current; +import javax.inject.manager.Manager; class FishFarmOffice { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; -import javax.webbeans.NonBinding; +import javax.annotation.NonBinding; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.AnnotationLiteral; +import javax.inject.AnnotationLiteral; abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Farmer<T> Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -3,13 +3,13 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.TypeLiteral; -import javax.webbeans.UnproxyableDependencyException; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.AmbiguousDependencyException; +import javax.inject.AnnotationLiteral; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.TypeLiteral; +import javax.inject.UnproxyableDependencyException; +import javax.inject.UnsatisfiedDependencyException; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Named; +import javax.annotation.Named; @AnotherDeploymentType @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -5,11 +5,11 @@ import java.util.List; import java.util.Set; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.DefinitionException; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.TypeLiteral; -import javax.webbeans.manager.Bean; +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.TypeLiteral; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Production; +import javax.inject.Production; @Production class ScottishFishFarmer extends Farmer<ScottishFish> Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.Produces; +import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.lookup.typesafe; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java 2009-01-26 15:01:48 UTC (rev 1233) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java 2009-01-26 15:05:01 UTC (rev 1234) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME)

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1233 - in examples/trunk: numberguess/src/main/java/org/jboss/webbeans/examples/numberguess and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-26 10:01:48 -0500 (Mon, 26 Jan 2009) New Revision: 1233 Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java Log: WBRI-117, update to packaging to PRD2 Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Named; -import javax.webbeans.RequestScoped; +import javax.annotation.Named; +import javax.context.RequestScoped; @RequestScoped @Named public class Credentials implements Serializable { Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -8,7 +8,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Retention(RetentionPolicy.RUNTIME) @Target({TYPE, METHOD, FIELD}) Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -4,12 +4,12 @@ import java.util.Arrays; import java.util.List; +import javax.annotation.Named; +import javax.context.SessionScoped; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import javax.webbeans.Current; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; @SessionScoped @Named public class Login implements Serializable { Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -3,14 +3,14 @@ import java.io.Serializable; +import javax.annotation.Named; import javax.annotation.PostConstruct; +import javax.context.SessionScoped; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; -import javax.webbeans.Named; -import javax.webbeans.SessionScoped; -import javax.webbeans.manager.Manager; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.manager.Manager; @Named @SessionScoped Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -3,8 +3,8 @@ import java.io.Serializable; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Produces; +import javax.context.ApplicationScoped; +import javax.inject.Produces; @ApplicationScoped public class Generator implements Serializable Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java =================================================================== --- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.ejb.EJB; -import javax.webbeans.Initializer; +import javax.inject.Initializer; public class TextTranslator implements Serializable { Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java =================================================================== --- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -1,10 +1,10 @@ package org.jboss.webbeans.examples.translator; +import javax.annotation.Named; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Current; -import javax.webbeans.Named; -import javax.webbeans.RequestScoped; +import javax.inject.Current; @Stateful @RequestScoped

15 years, 4 months

1
0
0 / 0

← Newer
1
...
11
12
13
14
15
16
17
...
63
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits January 2009